Trying to get the submodules right.