Now Gulp instead Grunt, some changes