Large restructure of the application file structure to make a first pass at cleaning up