From 9e6e2eb8512203ef11e102546d158312ff00f9ed Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 18 May 2023 17:22:12 -0700
Subject: [PATCH] (REF) sql - Move `civicrm_data` support files to subdir

I'd like to move more of the `civicrm_data` into separate files.  But it's
going to get rather messy if we add all those files directly to `./sql/`.
---
 .../civicrm_option_group.php}                                   | 2 +-
 .../civicrm_option_group}/accept_creditcard.sqldata.php         | 0
 .../civicrm_option_group}/account_relationship.sqldata.php      | 0
 .../civicrm_option_group}/acl_role.sqldata.php                  | 0
 .../civicrm_option_group}/activity_contacts.sqldata.php         | 0
 .../civicrm_option_group}/activity_default_assignee.sqldata.php | 0
 .../civicrm_option_group}/activity_status.sqldata.php           | 0
 .../civicrm_option_group}/activity_type.sqldata.php             | 0
 .../civicrm_option_group}/address_options.sqldata.php           | 0
 .../civicrm_option_group}/addressee.sqldata.php                 | 0
 .../civicrm_option_group}/advanced_search_options.sqldata.php   | 0
 .../civicrm_option_group}/auto_renew_options.sqldata.php        | 0
 .../civicrm_option_group}/batch_mode.sqldata.php                | 0
 .../civicrm_option_group}/batch_status.sqldata.php              | 0
 .../civicrm_option_group}/batch_type.sqldata.php                | 0
 .../civicrm_option_group}/campaign_status.sqldata.php           | 0
 .../civicrm_option_group}/campaign_type.sqldata.php             | 0
 .../civicrm_option_group}/case_status.sqldata.php               | 0
 .../civicrm_option_group}/case_type.sqldata.php                 | 0
 .../civicrm_option_group}/cg_extend_objects.sqldata.php         | 0
 .../civicrm_option_group}/communication_style.sqldata.php       | 0
 .../civicrm_option_group}/conference_slot.sqldata.php           | 0
 .../contact_autocomplete_options.sqldata.php                    | 0
 .../contact_date_reminder_options.sqldata.php                   | 0
 .../civicrm_option_group}/contact_edit_options.sqldata.php      | 0
 .../civicrm_option_group}/contact_reference_options.sqldata.php | 0
 .../contact_smart_group_display.sqldata.php                     | 0
 .../civicrm_option_group}/contact_view_options.sqldata.php      | 0
 .../civicrm_option_group}/contribution_recur_status.sqldata.php | 0
 .../civicrm_option_group}/contribution_status.sqldata.php       | 0
 .../civicrm_option_group}/currencies_enabled.sqldata.php        | 0
 .../civicrm_option_group}/custom_data_type.sqldata.php          | 0
 .../civicrm_option_group}/custom_search.sqldata.php             | 0
 .../civicrm_option_group}/email_greeting.sqldata.php            | 0
 .../civicrm_option_group}/encounter_medium.sqldata.php          | 0
 .../civicrm_option_group}/engagement_index.sqldata.php          | 0
 .../civicrm_option_group}/entity_batch_extends.sqldata.php      | 0
 .../civicrm_option_group}/environment.sqldata.php               | 0
 .../civicrm_option_group}/event_badge.sqldata.php               | 0
 .../civicrm_option_group}/event_contacts.sqldata.php            | 0
 .../civicrm_option_group}/event_type.sqldata.php                | 0
 .../civicrm_option_group}/file_type.sqldata.php                 | 0
 .../civicrm_option_group}/financial_account_type.sqldata.php    | 0
 .../civicrm_option_group}/financial_item_status.sqldata.php     | 0
 .../civicrm_option_group}/from_email_address.sqldata.php        | 0
 .../civicrm_option_group}/gender.sqldata.php                    | 0
 .../civicrm_option_group}/group_type.sqldata.php                | 0
 .../civicrm_option_group}/individual_prefix.sqldata.php         | 0
 .../civicrm_option_group}/individual_suffix.sqldata.php         | 0
 .../civicrm_option_group}/instant_messenger_service.sqldata.php | 0
 .../civicrm_option_group}/label_format.sqldata.php              | 0
 .../civicrm_option_group}/label_type.sqldata.php                | 0
 .../civicrm_option_group}/mail_approval_status.sqldata.php      | 0
 .../civicrm_option_group}/mail_protocol.sqldata.php             | 0
 .../civicrm_option_group}/mapping_type.sqldata.php              | 0
 .../civicrm_option_group}/mobile_provider.sqldata.php           | 0
 .../civicrm_option_group}/msg_mode.sqldata.php                  | 0
 .../civicrm_option_group}/name_badge.sqldata.php                | 0
 .../civicrm_option_group}/note_privacy.sqldata.php              | 0
 .../civicrm_option_group}/note_used_for.sqldata.php             | 0
 .../civicrm_option_group}/paper_size.sqldata.php                | 0
 .../civicrm_option_group}/participant_listing.sqldata.php       | 0
 .../civicrm_option_group}/participant_role.sqldata.php          | 0
 .../civicrm_option_group}/payment_instrument.sqldata.php        | 0
 .../civicrm_option_group}/pcp_owner_notify.sqldata.php          | 0
 .../civicrm_option_group}/pcp_status.sqldata.php                | 0
 .../civicrm_option_group}/pdf_format.sqldata.php                | 0
 .../civicrm_option_group}/phone_type.sqldata.php                | 0
 .../civicrm_option_group}/pledge_status.sqldata.php             | 0
 .../civicrm_option_group}/postal_greeting.sqldata.php           | 0
 .../preferred_communication_method.sqldata.php                  | 0
 .../civicrm_option_group}/priority.sqldata.php                  | 0
 .../civicrm_option_group}/recent_items_providers.sqldata.php    | 0
 .../civicrm_option_group}/recur_frequency_units.sqldata.php     | 0
 .../civicrm_option_group}/redaction_rule.sqldata.php            | 0
 .../civicrm_option_group}/relative_date_filters.sqldata.php     | 0
 .../civicrm_option_group}/report_template.sqldata.php           | 0
 .../civicrm_option_group}/safe_file_extension.sqldata.php       | 0
 .../civicrm_option_group}/sms_api_type.sqldata.php              | 0
 .../civicrm_option_group}/sms_provider_name.sqldata.php         | 0
 .../civicrm_option_group}/soft_credit_type.sqldata.php          | 0
 .../civicrm_option_group}/system_extensions.sqldata.php         | 0
 .../civicrm_option_group}/tag_used_for.sqldata.php              | 0
 .../civicrm_option_group}/user_dashboard_options.sqldata.php    | 0
 .../civicrm_option_group}/visibility.sqldata.php                | 0
 .../civicrm_option_group}/website_type.sqldata.php              | 0
 .../civicrm_option_group}/wysiwyg_editor.sqldata.php            | 0
 .../civicrm_option_group}/wysiwyg_presets.sqldata.php           | 0
 xml/templates/civicrm_data.tpl                                  | 2 +-
 89 files changed, 2 insertions(+), 2 deletions(-)
 rename sql/{civicrm_option_groups.php => civicrm_data/civicrm_option_group.php} (81%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/accept_creditcard.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/account_relationship.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/acl_role.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/activity_contacts.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/activity_default_assignee.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/activity_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/activity_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/address_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/addressee.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/advanced_search_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/auto_renew_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/batch_mode.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/batch_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/batch_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/campaign_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/campaign_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/case_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/case_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/cg_extend_objects.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/communication_style.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/conference_slot.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contact_autocomplete_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contact_date_reminder_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contact_edit_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contact_reference_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contact_smart_group_display.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contact_view_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contribution_recur_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/contribution_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/currencies_enabled.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/custom_data_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/custom_search.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/email_greeting.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/encounter_medium.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/engagement_index.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/entity_batch_extends.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/environment.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/event_badge.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/event_contacts.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/event_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/file_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/financial_account_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/financial_item_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/from_email_address.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/gender.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/group_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/individual_prefix.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/individual_suffix.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/instant_messenger_service.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/label_format.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/label_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/mail_approval_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/mail_protocol.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/mapping_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/mobile_provider.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/msg_mode.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/name_badge.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/note_privacy.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/note_used_for.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/paper_size.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/participant_listing.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/participant_role.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/payment_instrument.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/pcp_owner_notify.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/pcp_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/pdf_format.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/phone_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/pledge_status.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/postal_greeting.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/preferred_communication_method.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/priority.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/recent_items_providers.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/recur_frequency_units.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/redaction_rule.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/relative_date_filters.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/report_template.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/safe_file_extension.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/sms_api_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/sms_provider_name.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/soft_credit_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/system_extensions.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/tag_used_for.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/user_dashboard_options.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/visibility.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/website_type.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/wysiwyg_editor.sqldata.php (100%)
 rename sql/{civicrm_option_groups => civicrm_data/civicrm_option_group}/wysiwyg_presets.sqldata.php (100%)

diff --git a/sql/civicrm_option_groups.php b/sql/civicrm_data/civicrm_option_group.php
similarity index 81%
rename from sql/civicrm_option_groups.php
rename to sql/civicrm_data/civicrm_option_group.php
index 8d4ee7eb29..ea0e4594ce 100644
--- a/sql/civicrm_option_groups.php
+++ b/sql/civicrm_data/civicrm_option_group.php
@@ -1,7 +1,7 @@
 <?php
 
 $readOptionGroups = function (): array {
-  $files = (array) glob(__DIR__ . '/civicrm_option_groups/*.sqldata.php');
+  $files = (array) glob(__DIR__ . '/civicrm_option_group/*.sqldata.php');
   $result = [];
   foreach ($files as $file) {
     $basename = preg_replace('/\.sqldata\.php$/', '', basename($file));
diff --git a/sql/civicrm_option_groups/accept_creditcard.sqldata.php b/sql/civicrm_data/civicrm_option_group/accept_creditcard.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/accept_creditcard.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/accept_creditcard.sqldata.php
diff --git a/sql/civicrm_option_groups/account_relationship.sqldata.php b/sql/civicrm_data/civicrm_option_group/account_relationship.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/account_relationship.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/account_relationship.sqldata.php
diff --git a/sql/civicrm_option_groups/acl_role.sqldata.php b/sql/civicrm_data/civicrm_option_group/acl_role.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/acl_role.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/acl_role.sqldata.php
diff --git a/sql/civicrm_option_groups/activity_contacts.sqldata.php b/sql/civicrm_data/civicrm_option_group/activity_contacts.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/activity_contacts.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/activity_contacts.sqldata.php
diff --git a/sql/civicrm_option_groups/activity_default_assignee.sqldata.php b/sql/civicrm_data/civicrm_option_group/activity_default_assignee.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/activity_default_assignee.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/activity_default_assignee.sqldata.php
diff --git a/sql/civicrm_option_groups/activity_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/activity_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/activity_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/activity_status.sqldata.php
diff --git a/sql/civicrm_option_groups/activity_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/activity_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/activity_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/activity_type.sqldata.php
diff --git a/sql/civicrm_option_groups/address_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/address_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/address_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/address_options.sqldata.php
diff --git a/sql/civicrm_option_groups/addressee.sqldata.php b/sql/civicrm_data/civicrm_option_group/addressee.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/addressee.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/addressee.sqldata.php
diff --git a/sql/civicrm_option_groups/advanced_search_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/advanced_search_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/advanced_search_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/advanced_search_options.sqldata.php
diff --git a/sql/civicrm_option_groups/auto_renew_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/auto_renew_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/auto_renew_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/auto_renew_options.sqldata.php
diff --git a/sql/civicrm_option_groups/batch_mode.sqldata.php b/sql/civicrm_data/civicrm_option_group/batch_mode.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/batch_mode.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/batch_mode.sqldata.php
diff --git a/sql/civicrm_option_groups/batch_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/batch_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/batch_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/batch_status.sqldata.php
diff --git a/sql/civicrm_option_groups/batch_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/batch_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/batch_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/batch_type.sqldata.php
diff --git a/sql/civicrm_option_groups/campaign_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/campaign_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/campaign_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/campaign_status.sqldata.php
diff --git a/sql/civicrm_option_groups/campaign_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/campaign_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/campaign_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/campaign_type.sqldata.php
diff --git a/sql/civicrm_option_groups/case_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/case_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/case_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/case_status.sqldata.php
diff --git a/sql/civicrm_option_groups/case_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/case_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/case_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/case_type.sqldata.php
diff --git a/sql/civicrm_option_groups/cg_extend_objects.sqldata.php b/sql/civicrm_data/civicrm_option_group/cg_extend_objects.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/cg_extend_objects.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/cg_extend_objects.sqldata.php
diff --git a/sql/civicrm_option_groups/communication_style.sqldata.php b/sql/civicrm_data/civicrm_option_group/communication_style.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/communication_style.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/communication_style.sqldata.php
diff --git a/sql/civicrm_option_groups/conference_slot.sqldata.php b/sql/civicrm_data/civicrm_option_group/conference_slot.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/conference_slot.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/conference_slot.sqldata.php
diff --git a/sql/civicrm_option_groups/contact_autocomplete_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/contact_autocomplete_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contact_autocomplete_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contact_autocomplete_options.sqldata.php
diff --git a/sql/civicrm_option_groups/contact_date_reminder_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/contact_date_reminder_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contact_date_reminder_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contact_date_reminder_options.sqldata.php
diff --git a/sql/civicrm_option_groups/contact_edit_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/contact_edit_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contact_edit_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contact_edit_options.sqldata.php
diff --git a/sql/civicrm_option_groups/contact_reference_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/contact_reference_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contact_reference_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contact_reference_options.sqldata.php
diff --git a/sql/civicrm_option_groups/contact_smart_group_display.sqldata.php b/sql/civicrm_data/civicrm_option_group/contact_smart_group_display.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contact_smart_group_display.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contact_smart_group_display.sqldata.php
diff --git a/sql/civicrm_option_groups/contact_view_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/contact_view_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contact_view_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contact_view_options.sqldata.php
diff --git a/sql/civicrm_option_groups/contribution_recur_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/contribution_recur_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contribution_recur_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contribution_recur_status.sqldata.php
diff --git a/sql/civicrm_option_groups/contribution_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/contribution_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/contribution_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/contribution_status.sqldata.php
diff --git a/sql/civicrm_option_groups/currencies_enabled.sqldata.php b/sql/civicrm_data/civicrm_option_group/currencies_enabled.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/currencies_enabled.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/currencies_enabled.sqldata.php
diff --git a/sql/civicrm_option_groups/custom_data_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/custom_data_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/custom_data_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/custom_data_type.sqldata.php
diff --git a/sql/civicrm_option_groups/custom_search.sqldata.php b/sql/civicrm_data/civicrm_option_group/custom_search.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/custom_search.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/custom_search.sqldata.php
diff --git a/sql/civicrm_option_groups/email_greeting.sqldata.php b/sql/civicrm_data/civicrm_option_group/email_greeting.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/email_greeting.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/email_greeting.sqldata.php
diff --git a/sql/civicrm_option_groups/encounter_medium.sqldata.php b/sql/civicrm_data/civicrm_option_group/encounter_medium.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/encounter_medium.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/encounter_medium.sqldata.php
diff --git a/sql/civicrm_option_groups/engagement_index.sqldata.php b/sql/civicrm_data/civicrm_option_group/engagement_index.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/engagement_index.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/engagement_index.sqldata.php
diff --git a/sql/civicrm_option_groups/entity_batch_extends.sqldata.php b/sql/civicrm_data/civicrm_option_group/entity_batch_extends.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/entity_batch_extends.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/entity_batch_extends.sqldata.php
diff --git a/sql/civicrm_option_groups/environment.sqldata.php b/sql/civicrm_data/civicrm_option_group/environment.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/environment.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/environment.sqldata.php
diff --git a/sql/civicrm_option_groups/event_badge.sqldata.php b/sql/civicrm_data/civicrm_option_group/event_badge.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/event_badge.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/event_badge.sqldata.php
diff --git a/sql/civicrm_option_groups/event_contacts.sqldata.php b/sql/civicrm_data/civicrm_option_group/event_contacts.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/event_contacts.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/event_contacts.sqldata.php
diff --git a/sql/civicrm_option_groups/event_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/event_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/event_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/event_type.sqldata.php
diff --git a/sql/civicrm_option_groups/file_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/file_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/file_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/file_type.sqldata.php
diff --git a/sql/civicrm_option_groups/financial_account_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/financial_account_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/financial_account_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/financial_account_type.sqldata.php
diff --git a/sql/civicrm_option_groups/financial_item_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/financial_item_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/financial_item_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/financial_item_status.sqldata.php
diff --git a/sql/civicrm_option_groups/from_email_address.sqldata.php b/sql/civicrm_data/civicrm_option_group/from_email_address.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/from_email_address.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/from_email_address.sqldata.php
diff --git a/sql/civicrm_option_groups/gender.sqldata.php b/sql/civicrm_data/civicrm_option_group/gender.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/gender.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/gender.sqldata.php
diff --git a/sql/civicrm_option_groups/group_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/group_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/group_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/group_type.sqldata.php
diff --git a/sql/civicrm_option_groups/individual_prefix.sqldata.php b/sql/civicrm_data/civicrm_option_group/individual_prefix.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/individual_prefix.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/individual_prefix.sqldata.php
diff --git a/sql/civicrm_option_groups/individual_suffix.sqldata.php b/sql/civicrm_data/civicrm_option_group/individual_suffix.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/individual_suffix.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/individual_suffix.sqldata.php
diff --git a/sql/civicrm_option_groups/instant_messenger_service.sqldata.php b/sql/civicrm_data/civicrm_option_group/instant_messenger_service.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/instant_messenger_service.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/instant_messenger_service.sqldata.php
diff --git a/sql/civicrm_option_groups/label_format.sqldata.php b/sql/civicrm_data/civicrm_option_group/label_format.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/label_format.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/label_format.sqldata.php
diff --git a/sql/civicrm_option_groups/label_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/label_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/label_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/label_type.sqldata.php
diff --git a/sql/civicrm_option_groups/mail_approval_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/mail_approval_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/mail_approval_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/mail_approval_status.sqldata.php
diff --git a/sql/civicrm_option_groups/mail_protocol.sqldata.php b/sql/civicrm_data/civicrm_option_group/mail_protocol.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/mail_protocol.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/mail_protocol.sqldata.php
diff --git a/sql/civicrm_option_groups/mapping_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/mapping_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/mapping_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/mapping_type.sqldata.php
diff --git a/sql/civicrm_option_groups/mobile_provider.sqldata.php b/sql/civicrm_data/civicrm_option_group/mobile_provider.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/mobile_provider.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/mobile_provider.sqldata.php
diff --git a/sql/civicrm_option_groups/msg_mode.sqldata.php b/sql/civicrm_data/civicrm_option_group/msg_mode.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/msg_mode.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/msg_mode.sqldata.php
diff --git a/sql/civicrm_option_groups/name_badge.sqldata.php b/sql/civicrm_data/civicrm_option_group/name_badge.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/name_badge.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/name_badge.sqldata.php
diff --git a/sql/civicrm_option_groups/note_privacy.sqldata.php b/sql/civicrm_data/civicrm_option_group/note_privacy.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/note_privacy.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/note_privacy.sqldata.php
diff --git a/sql/civicrm_option_groups/note_used_for.sqldata.php b/sql/civicrm_data/civicrm_option_group/note_used_for.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/note_used_for.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/note_used_for.sqldata.php
diff --git a/sql/civicrm_option_groups/paper_size.sqldata.php b/sql/civicrm_data/civicrm_option_group/paper_size.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/paper_size.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/paper_size.sqldata.php
diff --git a/sql/civicrm_option_groups/participant_listing.sqldata.php b/sql/civicrm_data/civicrm_option_group/participant_listing.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/participant_listing.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/participant_listing.sqldata.php
diff --git a/sql/civicrm_option_groups/participant_role.sqldata.php b/sql/civicrm_data/civicrm_option_group/participant_role.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/participant_role.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/participant_role.sqldata.php
diff --git a/sql/civicrm_option_groups/payment_instrument.sqldata.php b/sql/civicrm_data/civicrm_option_group/payment_instrument.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/payment_instrument.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/payment_instrument.sqldata.php
diff --git a/sql/civicrm_option_groups/pcp_owner_notify.sqldata.php b/sql/civicrm_data/civicrm_option_group/pcp_owner_notify.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/pcp_owner_notify.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/pcp_owner_notify.sqldata.php
diff --git a/sql/civicrm_option_groups/pcp_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/pcp_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/pcp_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/pcp_status.sqldata.php
diff --git a/sql/civicrm_option_groups/pdf_format.sqldata.php b/sql/civicrm_data/civicrm_option_group/pdf_format.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/pdf_format.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/pdf_format.sqldata.php
diff --git a/sql/civicrm_option_groups/phone_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/phone_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/phone_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/phone_type.sqldata.php
diff --git a/sql/civicrm_option_groups/pledge_status.sqldata.php b/sql/civicrm_data/civicrm_option_group/pledge_status.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/pledge_status.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/pledge_status.sqldata.php
diff --git a/sql/civicrm_option_groups/postal_greeting.sqldata.php b/sql/civicrm_data/civicrm_option_group/postal_greeting.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/postal_greeting.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/postal_greeting.sqldata.php
diff --git a/sql/civicrm_option_groups/preferred_communication_method.sqldata.php b/sql/civicrm_data/civicrm_option_group/preferred_communication_method.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/preferred_communication_method.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/preferred_communication_method.sqldata.php
diff --git a/sql/civicrm_option_groups/priority.sqldata.php b/sql/civicrm_data/civicrm_option_group/priority.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/priority.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/priority.sqldata.php
diff --git a/sql/civicrm_option_groups/recent_items_providers.sqldata.php b/sql/civicrm_data/civicrm_option_group/recent_items_providers.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/recent_items_providers.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/recent_items_providers.sqldata.php
diff --git a/sql/civicrm_option_groups/recur_frequency_units.sqldata.php b/sql/civicrm_data/civicrm_option_group/recur_frequency_units.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/recur_frequency_units.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/recur_frequency_units.sqldata.php
diff --git a/sql/civicrm_option_groups/redaction_rule.sqldata.php b/sql/civicrm_data/civicrm_option_group/redaction_rule.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/redaction_rule.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/redaction_rule.sqldata.php
diff --git a/sql/civicrm_option_groups/relative_date_filters.sqldata.php b/sql/civicrm_data/civicrm_option_group/relative_date_filters.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/relative_date_filters.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/relative_date_filters.sqldata.php
diff --git a/sql/civicrm_option_groups/report_template.sqldata.php b/sql/civicrm_data/civicrm_option_group/report_template.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/report_template.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/report_template.sqldata.php
diff --git a/sql/civicrm_option_groups/safe_file_extension.sqldata.php b/sql/civicrm_data/civicrm_option_group/safe_file_extension.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/safe_file_extension.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/safe_file_extension.sqldata.php
diff --git a/sql/civicrm_option_groups/sms_api_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/sms_api_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/sms_api_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/sms_api_type.sqldata.php
diff --git a/sql/civicrm_option_groups/sms_provider_name.sqldata.php b/sql/civicrm_data/civicrm_option_group/sms_provider_name.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/sms_provider_name.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/sms_provider_name.sqldata.php
diff --git a/sql/civicrm_option_groups/soft_credit_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/soft_credit_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/soft_credit_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/soft_credit_type.sqldata.php
diff --git a/sql/civicrm_option_groups/system_extensions.sqldata.php b/sql/civicrm_data/civicrm_option_group/system_extensions.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/system_extensions.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/system_extensions.sqldata.php
diff --git a/sql/civicrm_option_groups/tag_used_for.sqldata.php b/sql/civicrm_data/civicrm_option_group/tag_used_for.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/tag_used_for.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/tag_used_for.sqldata.php
diff --git a/sql/civicrm_option_groups/user_dashboard_options.sqldata.php b/sql/civicrm_data/civicrm_option_group/user_dashboard_options.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/user_dashboard_options.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/user_dashboard_options.sqldata.php
diff --git a/sql/civicrm_option_groups/visibility.sqldata.php b/sql/civicrm_data/civicrm_option_group/visibility.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/visibility.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/visibility.sqldata.php
diff --git a/sql/civicrm_option_groups/website_type.sqldata.php b/sql/civicrm_data/civicrm_option_group/website_type.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/website_type.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/website_type.sqldata.php
diff --git a/sql/civicrm_option_groups/wysiwyg_editor.sqldata.php b/sql/civicrm_data/civicrm_option_group/wysiwyg_editor.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/wysiwyg_editor.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/wysiwyg_editor.sqldata.php
diff --git a/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php b/sql/civicrm_data/civicrm_option_group/wysiwyg_presets.sqldata.php
similarity index 100%
rename from sql/civicrm_option_groups/wysiwyg_presets.sqldata.php
rename to sql/civicrm_data/civicrm_option_group/wysiwyg_presets.sqldata.php
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 6a0db7cd67..a3f7482226 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -119,7 +119,7 @@ VALUES
 -- option groups and values for 'preferred communication methods' , 'activity types', 'gender', etc.
 
 {php}
-  $optionGroups = include 'sql/civicrm_option_groups.php';
+  $optionGroups = include 'sql/civicrm_data/civicrm_option_group.php';
   $laterGroups = ['encounter_medium', 'soft_credit_type', 'recent_items_providers'];
   foreach ($optionGroups as $groupName => $group) {
     if (!in_array($groupName, $laterGroups)) {
-- 
2.25.1