Broke up namespaces into MVC
Changed the names of some source files and fixed references