diff --git a/bootstrap.php b/bootstrap.php
index 782e0f6..859f38e 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -19,7 +19,7 @@
 	exit;
 }
 
-define( 'NFD_DATA_MODULE_VERSION', '2.4.6' );
+define( 'NFD_DATA_MODULE_VERSION', '2.4.7' );
 
 if ( function_exists( 'is_admin' ) && is_admin() ) {
 	$upgrade_handler = new UpgradeHandler(
diff --git a/composer.json b/composer.json
index f463b9e..c793951 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
   ],
   "autoload": {
     "psr-4": {
-      "NewfoldLabs\\WP\\Module\\Data\\": "src/"
+      "NewfoldLabs\\WP\\Module\\Data\\": "includes/"
     },
     "files": [
       "bootstrap.php"
diff --git a/src/API/Events.php b/includes/API/Events.php
similarity index 100%
rename from src/API/Events.php
rename to includes/API/Events.php
diff --git a/src/API/Verify.php b/includes/API/Verify.php
similarity index 100%
rename from src/API/Verify.php
rename to includes/API/Verify.php
diff --git a/src/Data.php b/includes/Data.php
similarity index 100%
rename from src/Data.php
rename to includes/Data.php
diff --git a/src/Data/Static/site-classification-en-US.json b/includes/Data/Static/site-classification-en-US.json
similarity index 100%
rename from src/Data/Static/site-classification-en-US.json
rename to includes/Data/Static/site-classification-en-US.json
diff --git a/src/Data/Static/site-classification-pt-BR.json b/includes/Data/Static/site-classification-pt-BR.json
similarity index 100%
rename from src/Data/Static/site-classification-pt-BR.json
rename to includes/Data/Static/site-classification-pt-BR.json
diff --git a/src/Event.php b/includes/Event.php
similarity index 100%
rename from src/Event.php
rename to includes/Event.php
diff --git a/src/EventManager.php b/includes/EventManager.php
similarity index 100%
rename from src/EventManager.php
rename to includes/EventManager.php
diff --git a/src/EventQueue/EventQueue.php b/includes/EventQueue/EventQueue.php
similarity index 100%
rename from src/EventQueue/EventQueue.php
rename to includes/EventQueue/EventQueue.php
diff --git a/src/EventQueue/Queryable.php b/includes/EventQueue/Queryable.php
similarity index 100%
rename from src/EventQueue/Queryable.php
rename to includes/EventQueue/Queryable.php
diff --git a/src/EventQueue/Queues/BatchQueue.php b/includes/EventQueue/Queues/BatchQueue.php
similarity index 100%
rename from src/EventQueue/Queues/BatchQueue.php
rename to includes/EventQueue/Queues/BatchQueue.php
diff --git a/src/EventQueue/Queues/BatchQueueInterface.php b/includes/EventQueue/Queues/BatchQueueInterface.php
similarity index 100%
rename from src/EventQueue/Queues/BatchQueueInterface.php
rename to includes/EventQueue/Queues/BatchQueueInterface.php
diff --git a/src/Helpers/Encryption.php b/includes/Helpers/Encryption.php
similarity index 100%
rename from src/Helpers/Encryption.php
rename to includes/Helpers/Encryption.php
diff --git a/src/Helpers/Plugin.php b/includes/Helpers/Plugin.php
similarity index 100%
rename from src/Helpers/Plugin.php
rename to includes/Helpers/Plugin.php
diff --git a/src/Helpers/SiteHealth.php b/includes/Helpers/SiteHealth.php
similarity index 100%
rename from src/Helpers/SiteHealth.php
rename to includes/Helpers/SiteHealth.php
diff --git a/src/Helpers/Transient.php b/includes/Helpers/Transient.php
similarity index 100%
rename from src/Helpers/Transient.php
rename to includes/Helpers/Transient.php
diff --git a/src/HiiveConnection.php b/includes/HiiveConnection.php
similarity index 100%
rename from src/HiiveConnection.php
rename to includes/HiiveConnection.php
diff --git a/src/HiiveWorker.php b/includes/HiiveWorker.php
similarity index 100%
rename from src/HiiveWorker.php
rename to includes/HiiveWorker.php
diff --git a/src/Listeners/Admin.php b/includes/Listeners/Admin.php
similarity index 100%
rename from src/Listeners/Admin.php
rename to includes/Listeners/Admin.php
diff --git a/src/Listeners/BluehostPlugin.php b/includes/Listeners/BluehostPlugin.php
similarity index 100%
rename from src/Listeners/BluehostPlugin.php
rename to includes/Listeners/BluehostPlugin.php
diff --git a/src/Listeners/Commerce.php b/includes/Listeners/Commerce.php
similarity index 100%
rename from src/Listeners/Commerce.php
rename to includes/Listeners/Commerce.php
diff --git a/src/Listeners/Content.php b/includes/Listeners/Content.php
similarity index 100%
rename from src/Listeners/Content.php
rename to includes/Listeners/Content.php
diff --git a/src/Listeners/Cron.php b/includes/Listeners/Cron.php
similarity index 100%
rename from src/Listeners/Cron.php
rename to includes/Listeners/Cron.php
diff --git a/src/Listeners/Jetpack.php b/includes/Listeners/Jetpack.php
similarity index 100%
rename from src/Listeners/Jetpack.php
rename to includes/Listeners/Jetpack.php
diff --git a/src/Listeners/Listener.php b/includes/Listeners/Listener.php
similarity index 100%
rename from src/Listeners/Listener.php
rename to includes/Listeners/Listener.php
diff --git a/src/Listeners/Plugin.php b/includes/Listeners/Plugin.php
similarity index 100%
rename from src/Listeners/Plugin.php
rename to includes/Listeners/Plugin.php
diff --git a/src/Listeners/SiteHealth.php b/includes/Listeners/SiteHealth.php
similarity index 100%
rename from src/Listeners/SiteHealth.php
rename to includes/Listeners/SiteHealth.php
diff --git a/src/Listeners/Theme.php b/includes/Listeners/Theme.php
similarity index 100%
rename from src/Listeners/Theme.php
rename to includes/Listeners/Theme.php
diff --git a/src/Listeners/Yith.php b/includes/Listeners/Yith.php
similarity index 100%
rename from src/Listeners/Yith.php
rename to includes/Listeners/Yith.php
diff --git a/src/Logger.php b/includes/Logger.php
similarity index 100%
rename from src/Logger.php
rename to includes/Logger.php
diff --git a/src/SiteCapabilities.php b/includes/SiteCapabilities.php
similarity index 100%
rename from src/SiteCapabilities.php
rename to includes/SiteCapabilities.php
diff --git a/src/SiteClassification/PrimaryType.php b/includes/SiteClassification/PrimaryType.php
similarity index 100%
rename from src/SiteClassification/PrimaryType.php
rename to includes/SiteClassification/PrimaryType.php
diff --git a/src/SiteClassification/SecondaryType.php b/includes/SiteClassification/SecondaryType.php
similarity index 100%
rename from src/SiteClassification/SecondaryType.php
rename to includes/SiteClassification/SecondaryType.php
diff --git a/src/SiteClassification/SiteClassification.php b/includes/SiteClassification/SiteClassification.php
similarity index 100%
rename from src/SiteClassification/SiteClassification.php
rename to includes/SiteClassification/SiteClassification.php
diff --git a/src/SiteClassification/Types.php b/includes/SiteClassification/Types.php
similarity index 100%
rename from src/SiteClassification/Types.php
rename to includes/SiteClassification/Types.php
diff --git a/src/SubscriberInterface.php b/includes/SubscriberInterface.php
similarity index 100%
rename from src/SubscriberInterface.php
rename to includes/SubscriberInterface.php
diff --git a/src/WonderBlocks/Requests/Fetch.php b/includes/WonderBlocks/Requests/Fetch.php
similarity index 100%
rename from src/WonderBlocks/Requests/Fetch.php
rename to includes/WonderBlocks/Requests/Fetch.php
diff --git a/src/WonderBlocks/Requests/Request.php b/includes/WonderBlocks/Requests/Request.php
similarity index 100%
rename from src/WonderBlocks/Requests/Request.php
rename to includes/WonderBlocks/Requests/Request.php
diff --git a/src/WonderBlocks/WonderBlocks.php b/includes/WonderBlocks/WonderBlocks.php
similarity index 100%
rename from src/WonderBlocks/WonderBlocks.php
rename to includes/WonderBlocks/WonderBlocks.php