Reorganize server section