Move things around, update submodules