reorganise imports for new Collections conflict class