Remove gulp-watch
Add directive and refactors services