moved everything out of the app subdirectory