moving files into app folder, and modifying build process