Move submodules into app/
Move files into app/