Moved mixins
Made a refactor in the controller module