Updates controller
Reorganizes module classes