Server restructuring
Merged