Added Grunt, reorganized folder structure