Readded server submodule