Restructuring controllers, models. WIP
Updating controllers and models