Remapping client submodule