reorganize app into more sensible structure
Merge branch 'reorg', rework app structure