Organize server a bit