Move all the modules around
Merge branch 'master' of https://github.com/ndmitchell/bake