Moving dev and json files around, adjusting grunt and build script accordingly.