Simplification
Shifting folders around, integrating grunt