massive changes to the structure to atone for grunt and bower