Cleaning up and reorganizing controllers