new gruntfile and reorg