integrated Grunt and re-structured CSS