Reorganize controllers.