Reorganize server settings section as it isn't semantic