moved app to subdirectory and misc changes to app