Readded submodules in the correct location