commit before doing some refactoring
separate and create grunt build