Renamed controllers, added a few models, and removed old views.