Cleanup modulize and controllerize.