added more structure
changed configuration of Grunt tasks