refactor angular modules and gruntfile