Move kill server to a separate file