Restructured controllers.