refactor rmi-server submodule