Fix server structure