Watch support for grunt
More directive use, some refactors