Place the server in a separatefile + new server function