Split up app into modules, and minor formatting/cleanups
Tiny fix from restructuring