module restructuring done, now modules used instead of controllers