Reorganize files & Grunt tasks