Reorganised server