Modified server to be submodule