Updated structure

Updated structure to match
http://www.thomasboyt.com/2013/09/01/maintainable-grunt.html