reorganized server content
organized server and ui