Adding ViewModel classes to Controller calls. Refactoring and reorganizing files.
Removing old files.