Grunt refactoring - serve