WIP Gruntfile; reorg dirs