Adding some grunt stuff and moving things around
Reworking a bit...