Renamed controllers, organized some more.