Move some files around
Grunt build & merge