reorganized server