Use submodules again