reorganized server project