refactor file locations to clean up the app/ directory

A totally semantic free refactoring - moving files around in the `app/` directory to clean it up a bit.

Also, fixes #671.

@umop @ussuri