reorganizing controllers