Restructure server.