Basic Refactoring Complete

Organized all the classes to make more sense and changed certain
workflows to abide by MVC standards