Restructured app layout
This restructuring allows for individual modules to be imported for
organizations sake.