diff --git a/.gitmodules b/.gitmodules
index fa3de93..639fd8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "inc/constellix-api"]
-	path = inc/constellix-api
+	path = includes/constellix-api
 	url = https://github.com/anchorhost/constellix-api
diff --git a/captaincore.php b/captaincore.php
index e8aa74a..6f42f1e 100755
--- a/captaincore.php
+++ b/captaincore.php
@@ -82,12 +82,12 @@ function run_captaincore() {
 }
 run_captaincore();
 
-require 'inc/woocommerce-my-account-endpoints.php';
-require 'inc/constellix-api/constellix-api.php';
-require 'inc/woocommerce-custom-password-fields.php';
-require 'inc/mailgun-api.php';
-require 'inc/process-functions.php';
-require 'inc/bulk-actions.php'; // Custom bulk actions.
+require 'includes/woocommerce-my-account-endpoints.php';
+require 'includes/constellix-api/constellix-api.php';
+require 'includes/woocommerce-custom-password-fields.php';
+require 'includes/mailgun-api.php';
+require 'includes/process-functions.php';
+require 'includes/bulk-actions.php'; // Custom bulk actions.
 
 function captaincore_rewrite() {
 	add_rewrite_rule( '^captaincore-api/([^/]*)/?', 'index.php?pagename=captaincore-api&callback=$matches[1]', 'top' );
@@ -826,7 +826,7 @@ function captaincore_website_tabs() {
 		// Before:
 		add_action(
 			'all_admin_notices', function() {
-					include 'inc/admin-website-tabs.php';
+					include 'includes/admin-website-tabs.php';
 				echo '';
 			}
 		);
@@ -4531,32 +4531,32 @@ function captaincore_custom_pages() {
 
 function captaincore_customer_report_callback() {
 	// Loads the Customer Report template
-	require_once dirname( __FILE__ ) . '/inc/admin-customer-report.php';
+	require_once dirname( __FILE__ ) . '/includes/admin-customer-report.php';
 }
 
 function captaincore_partner_report_callback() {
 	// Loads the Customer Report template
-	require_once dirname( __FILE__ ) . '/inc/admin-partner-report.php';
+	require_once dirname( __FILE__ ) . '/includes/admin-partner-report.php';
 }
 
 function captaincore_installs_report_callback() {
 	// Loads the Customer Report template
-	require_once dirname( __FILE__ ) . '/inc/admin-installs-report.php';
+	require_once dirname( __FILE__ ) . '/includes/admin-installs-report.php';
 }
 
 function captaincore_timeline_report_callback() {
 	// Loads the Customer Report template
-	require_once dirname( __FILE__ ) . '/inc/admin-timeline-report.php';
+	require_once dirname( __FILE__ ) . '/includes/admin-timeline-report.php';
 }
 
 function captaincore_kpi_report_callback() {
 	// Loads the Customer Report template
-	require_once dirname( __FILE__ ) . '/inc/admin-kpi-report.php';
+	require_once dirname( __FILE__ ) . '/includes/admin-kpi-report.php';
 }
 
 function captaincore_quicksaves_report_callback() {
 	// Loads the Quicksaves Report template
-	require_once dirname( __FILE__ ) . '/inc/admin-report-quicksaves.php';
+	require_once dirname( __FILE__ ) . '/includes/admin-report-quicksaves.php';
 }
 
 // allow SVGs
diff --git a/inc/admin-customer-report.php b/includes/admin-customer-report.php
similarity index 100%
rename from inc/admin-customer-report.php
rename to includes/admin-customer-report.php
diff --git a/inc/admin-installs-report.php b/includes/admin-installs-report.php
similarity index 100%
rename from inc/admin-installs-report.php
rename to includes/admin-installs-report.php
diff --git a/inc/admin-kpi-report.php b/includes/admin-kpi-report.php
similarity index 100%
rename from inc/admin-kpi-report.php
rename to includes/admin-kpi-report.php
diff --git a/inc/admin-partner-report.php b/includes/admin-partner-report.php
similarity index 100%
rename from inc/admin-partner-report.php
rename to includes/admin-partner-report.php
diff --git a/inc/admin-report-quicksaves.php b/includes/admin-report-quicksaves.php
similarity index 100%
rename from inc/admin-report-quicksaves.php
rename to includes/admin-report-quicksaves.php
diff --git a/inc/admin-submenu-tabs.php b/includes/admin-submenu-tabs.php
similarity index 100%
rename from inc/admin-submenu-tabs.php
rename to includes/admin-submenu-tabs.php
diff --git a/inc/admin-timeline-report.php b/includes/admin-timeline-report.php
similarity index 100%
rename from inc/admin-timeline-report.php
rename to includes/admin-timeline-report.php
diff --git a/inc/admin-website-tabs.php b/includes/admin-website-tabs.php
similarity index 100%
rename from inc/admin-website-tabs.php
rename to includes/admin-website-tabs.php
diff --git a/inc/bulk-actions.php b/includes/bulk-actions.php
similarity index 100%
rename from inc/bulk-actions.php
rename to includes/bulk-actions.php
diff --git a/inc/constellix-api b/includes/constellix-api
similarity index 100%
rename from inc/constellix-api
rename to includes/constellix-api
diff --git a/inc/mailgun-api.php b/includes/mailgun-api.php
similarity index 100%
rename from inc/mailgun-api.php
rename to includes/mailgun-api.php
diff --git a/inc/process-functions.php b/includes/process-functions.php
similarity index 100%
rename from inc/process-functions.php
rename to includes/process-functions.php
diff --git a/inc/woocommerce-custom-password-fields.php b/includes/woocommerce-custom-password-fields.php
similarity index 100%
rename from inc/woocommerce-custom-password-fields.php
rename to includes/woocommerce-custom-password-fields.php
diff --git a/inc/woocommerce-my-account-endpoints.php b/includes/woocommerce-my-account-endpoints.php
similarity index 100%
rename from inc/woocommerce-my-account-endpoints.php
rename to includes/woocommerce-my-account-endpoints.php