refactor rmi-client submodule