Finished re-organizing the project to clean it up