Editor Update
Reorganised server