refactoring server submodule
refactoring server submodule