Adding original submodules back in