[Magic-HD] Some reorganisations.