Re-organisation GuiManager