Moves the submodules to more logical locations