Grunt implemented, better structured assets