reorganize to remove WARES section from servers