Restructure the server service