Refactor controller to model and add Utilities module
Merge branch 'controllerRefactor' into develop
Merge branch 'develop'