Move functionality for making servers to separate module