Changes in structure and Gruntfile.js (concat configurations)