Reshuffle app structure

As per earlier discussion.

I additionally made `develop` the default branch for this repo, and this PR is to develop.