Cleaned up and reorganized a few controllers.