Reorganise MagicSetDefinition