Change Modules to Controllers