Reorganized the project. Renamed. Finally beginning to link the drawing portion to the controllers