[FCS-23] Small reorganization in server classes