Updated Grunt workflow and JS/CSS folder scructures