Cleaned up and simplified class definitions
Began definition of view controller and preliminary templates