Change in directory structure to combine many controllers.