Migrated over to MVC architecture
additional MVC changes