changed dir str, added collection package
restructured views and app