Refactor Grunt tasks and folder structure