Further improved and fixed Grunt tasks, split controllers into separate file