Implemented new layout

Broke out application into individual modules for easier management in
the future