diff --git a/plugins/woocommerce-admin/src/Features/ActivityPanels.php b/plugins/woocommerce-admin/src-internal/Admin/ActivityPanels.php
similarity index 97%
rename from plugins/woocommerce-admin/src/Features/ActivityPanels.php
rename to plugins/woocommerce-admin/src-internal/Admin/ActivityPanels.php
index 0a58e0d782a..0412f67170a 100644
--- a/plugins/woocommerce-admin/src/Features/ActivityPanels.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/ActivityPanels.php
@@ -4,7 +4,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Notes\Notes;
 
diff --git a/plugins/woocommerce-admin/src/Features/Analytics.php b/plugins/woocommerce-admin/src-internal/Admin/Analytics.php
similarity index 99%
rename from plugins/woocommerce-admin/src/Features/Analytics.php
rename to plugins/woocommerce-admin/src-internal/Admin/Analytics.php
index 080592e386d..4922debae49 100644
--- a/plugins/woocommerce-admin/src/Features/Analytics.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/Analytics.php
@@ -4,9 +4,8 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
-use Automattic\WooCommerce\Admin\Loader;
 use Automattic\WooCommerce\Admin\API\Reports\Cache;
 use Automattic\WooCommerce\Admin\Features\Features;
 
diff --git a/plugins/woocommerce-admin/src/Features/Coupons.php b/plugins/woocommerce-admin/src-internal/Admin/Coupons.php
similarity index 98%
rename from plugins/woocommerce-admin/src/Features/Coupons.php
rename to plugins/woocommerce-admin/src-internal/Admin/Coupons.php
index 567bc034513..a2415497eb3 100644
--- a/plugins/woocommerce-admin/src/Features/Coupons.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/Coupons.php
@@ -5,7 +5,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Features\Features;
 use Automattic\WooCommerce\Admin\Loader;
diff --git a/plugins/woocommerce-admin/src/Features/CouponsMovedTrait.php b/plugins/woocommerce-admin/src-internal/Admin/CouponsMovedTrait.php
similarity index 97%
rename from plugins/woocommerce-admin/src/Features/CouponsMovedTrait.php
rename to plugins/woocommerce-admin/src-internal/Admin/CouponsMovedTrait.php
index e7c6f773623..c748b4681b5 100644
--- a/plugins/woocommerce-admin/src/Features/CouponsMovedTrait.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/CouponsMovedTrait.php
@@ -3,7 +3,7 @@
  * A Trait to help with managing the legacy coupon menu.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Features\Features;
 
diff --git a/plugins/woocommerce-admin/src/Features/CustomerEffortScoreTracks.php b/plugins/woocommerce-admin/src-internal/Admin/CustomerEffortScoreTracks.php
similarity index 99%
rename from plugins/woocommerce-admin/src/Features/CustomerEffortScoreTracks.php
rename to plugins/woocommerce-admin/src-internal/Admin/CustomerEffortScoreTracks.php
index 7f5aa214240..9baafdb99c4 100644
--- a/plugins/woocommerce-admin/src/Features/CustomerEffortScoreTracks.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/CustomerEffortScoreTracks.php
@@ -5,7 +5,7 @@
  * @package WooCommerce\Admin\Features
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 defined( 'ABSPATH' ) || exit;
 
diff --git a/plugins/woocommerce-admin/src/Features/Homescreen.php b/plugins/woocommerce-admin/src-internal/Admin/Homescreen.php
similarity index 99%
rename from plugins/woocommerce-admin/src/Features/Homescreen.php
rename to plugins/woocommerce-admin/src-internal/Admin/Homescreen.php
index baa85d56cf4..4fd5afd53ae 100644
--- a/plugins/woocommerce-admin/src/Features/Homescreen.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/Homescreen.php
@@ -4,7 +4,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Loader;
 
diff --git a/plugins/woocommerce-admin/src/Features/Marketing.php b/plugins/woocommerce-admin/src-internal/Admin/Marketing.php
similarity index 99%
rename from plugins/woocommerce-admin/src/Features/Marketing.php
rename to plugins/woocommerce-admin/src-internal/Admin/Marketing.php
index f07d8e5250d..c7b5dd6f356 100644
--- a/plugins/woocommerce-admin/src/Features/Marketing.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/Marketing.php
@@ -4,7 +4,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Features\Features;
 use Automattic\WooCommerce\Admin\Marketing\InstalledExtensions;
diff --git a/plugins/woocommerce-admin/src/Features/MobileAppBanner.php b/plugins/woocommerce-admin/src-internal/Admin/MobileAppBanner.php
similarity index 94%
rename from plugins/woocommerce-admin/src/Features/MobileAppBanner.php
rename to plugins/woocommerce-admin/src-internal/Admin/MobileAppBanner.php
index 878486e846e..e0f6c50716f 100644
--- a/plugins/woocommerce-admin/src/Features/MobileAppBanner.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/MobileAppBanner.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 defined( 'ABSPATH' ) || exit;
 
diff --git a/plugins/woocommerce-admin/src/Features/RemoteInboxNotifications.php b/plugins/woocommerce-admin/src-internal/Admin/RemoteInboxNotifications.php
similarity index 95%
rename from plugins/woocommerce-admin/src/Features/RemoteInboxNotifications.php
rename to plugins/woocommerce-admin/src-internal/Admin/RemoteInboxNotifications.php
index 7af7c2f6b65..eefd9ad09a9 100644
--- a/plugins/woocommerce-admin/src/Features/RemoteInboxNotifications.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/RemoteInboxNotifications.php
@@ -4,7 +4,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Features\Features;
 use \Automattic\WooCommerce\Admin\RemoteInboxNotifications\RemoteInboxNotificationsEngine;
diff --git a/plugins/woocommerce-admin/src/Features/Settings.php b/plugins/woocommerce-admin/src-internal/Admin/Settings.php
similarity index 96%
rename from plugins/woocommerce-admin/src/Features/Settings.php
rename to plugins/woocommerce-admin/src-internal/Admin/Settings.php
index 38fe0e2f24c..878be1872df 100644
--- a/plugins/woocommerce-admin/src/Features/Settings.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/Settings.php
@@ -4,10 +4,8 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
-use Automattic\WooCommerce\Admin\Marketing\InstalledExtensions;
-use Automattic\WooCommerce\Admin\Loader;
 use Automattic\WooCommerce\Admin\PageController;
 
 /**
diff --git a/plugins/woocommerce-admin/src/Features/ShippingLabelBanner.php b/plugins/woocommerce-admin/src-internal/Admin/ShippingLabelBanner.php
similarity index 98%
rename from plugins/woocommerce-admin/src/Features/ShippingLabelBanner.php
rename to plugins/woocommerce-admin/src-internal/Admin/ShippingLabelBanner.php
index f7494e6ea8a..cc3ee80e0fd 100644
--- a/plugins/woocommerce-admin/src/Features/ShippingLabelBanner.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/ShippingLabelBanner.php
@@ -4,7 +4,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use \Automattic\WooCommerce\Admin\Loader;
 use \Automattic\Jetpack\Connection\Manager as Jetpack_Connection_Manager;
diff --git a/plugins/woocommerce-admin/src/Features/ShippingLabelBannerDisplayRules.php b/plugins/woocommerce-admin/src-internal/Admin/ShippingLabelBannerDisplayRules.php
similarity index 99%
rename from plugins/woocommerce-admin/src/Features/ShippingLabelBannerDisplayRules.php
rename to plugins/woocommerce-admin/src-internal/Admin/ShippingLabelBannerDisplayRules.php
index dc0754154ef..57b0b2b25f1 100644
--- a/plugins/woocommerce-admin/src/Features/ShippingLabelBannerDisplayRules.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/ShippingLabelBannerDisplayRules.php
@@ -4,7 +4,7 @@
  * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 /**
  * Determines whether or not the Shipping Label Banner should be displayed
diff --git a/plugins/woocommerce-admin/src/Features/WcPayWelcomePage.php b/plugins/woocommerce-admin/src-internal/Admin/WcPayWelcomePage.php
similarity index 99%
rename from plugins/woocommerce-admin/src/Features/WcPayWelcomePage.php
rename to plugins/woocommerce-admin/src-internal/Admin/WcPayWelcomePage.php
index e575f840252..02c92611848 100644
--- a/plugins/woocommerce-admin/src/Features/WcPayWelcomePage.php
+++ b/plugins/woocommerce-admin/src-internal/Admin/WcPayWelcomePage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Automattic\WooCommerce\Admin\Features;
+namespace Automattic\WooCommerce\Internal\Admin;
 
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Tasks\WooCommercePayments;
 
diff --git a/plugins/woocommerce-admin/src/API/Marketing.php b/plugins/woocommerce-admin/src/API/Marketing.php
index b7b9e75acee..2bcbdb56b9d 100644
--- a/plugins/woocommerce-admin/src/API/Marketing.php
+++ b/plugins/woocommerce-admin/src/API/Marketing.php
@@ -7,7 +7,7 @@
 
 namespace Automattic\WooCommerce\Admin\API;
 
-use Automattic\WooCommerce\Admin\Features\Marketing as MarketingFeature;
+use Automattic\WooCommerce\Internal\Admin\Marketing as MarketingFeature;
 use Automattic\WooCommerce\Admin\PluginsHelper;
 
 defined( 'ABSPATH' ) || exit;
diff --git a/plugins/woocommerce-admin/src/API/Options.php b/plugins/woocommerce-admin/src/API/Options.php
index 1fc53ede3a6..bfcdeada250 100644
--- a/plugins/woocommerce-admin/src/API/Options.php
+++ b/plugins/woocommerce-admin/src/API/Options.php
@@ -142,7 +142,7 @@ class Options extends \WC_REST_Data_Controller {
 	 * @return array
 	 */
 	public static function get_default_option_permissions() {
-		$is_woocommerce_admin    = \Automattic\WooCommerce\Admin\Features\Homescreen::is_admin_user();
+		$is_woocommerce_admin    = \Automattic\WooCommerce\Internal\Admin\Homescreen::is_admin_user();
 		$woocommerce_permissions = array(
 			'woocommerce_setup_jetpack_opted_in',
 			'woocommerce_stripe_settings',
diff --git a/plugins/woocommerce-admin/src/Features/Features.php b/plugins/woocommerce-admin/src/Features/Features.php
index de5587f368c..aacfa1fa22d 100644
--- a/plugins/woocommerce-admin/src/Features/Features.php
+++ b/plugins/woocommerce-admin/src/Features/Features.php
@@ -402,6 +402,19 @@ class Features {
 			// new class => original class (this will be aliased).
 			'Automattic\WooCommerce\Internal\Admin\WCPayPromotion\Init' => 'Automattic\WooCommerce\Admin\Features\WcPayPromotion\Init',
 			'Automattic\WooCommerce\Internal\Admin\RemoteFreeExtensions\Init' => 'Automattic\WooCommerce\Admin\Features\RemoteFreeExtensions\Init',
+			'Automattic\WooCommerce\Internal\Admin\ActivityPanels' => 'Automattic\WooCommerce\Admin\Features\ActivityPanels',
+			'Automattic\WooCommerce\Internal\Admin\Analytics' => 'Automattic\WooCommerce\Admin\Features\Analytics',
+			'Automattic\WooCommerce\Internal\Admin\Coupons' => 'Automattic\WooCommerce\Admin\Features\Coupons',
+			'Automattic\WooCommerce\Internal\Admin\CouponsMovedTrait' => 'Automattic\WooCommerce\Admin\Features\CouponsMovedTrait',
+			'Automattic\WooCommerce\Internal\Admin\CustomerEffortScoreTracks' => 'Automattic\WooCommerce\Admin\Features\CustomerEffortScoreTracks',
+			'Automattic\WooCommerce\Internal\Admin\Homescreen' => 'Automattic\WooCommerce\Admin\Features\Homescreen',
+			'Automattic\WooCommerce\Internal\Admin\Marketing' => 'Automattic\WooCommerce\Admin\Features\Marketing',
+			'Automattic\WooCommerce\Internal\Admin\MobileAppBanner' => 'Automattic\WooCommerce\Admin\Features\MobileAppBanner',
+			'Automattic\WooCommerce\Internal\Admin\RemoteInboxNotifications' => 'Automattic\WooCommerce\Admin\Features\RemoteInboxNotifications',
+			'Automattic\WooCommerce\Internal\Admin\Settings' => 'Automattic\WooCommerce\Admin\Features\Settings',
+			'Automattic\WooCommerce\Internal\Admin\ShippingLabelBanner' => 'Automattic\WooCommerce\Admin\Features\ShippingLabelBanner',
+			'Automattic\WooCommerce\Internal\Admin\ShippingLabelBannerDisplayRules' => 'Automattic\WooCommerce\Admin\Features\ShippingLabelBannerDisplayRules',
+			'Automattic\WooCommerce\Internal\Admin\WcPayWelcomePage' => 'Automattic\WooCommerce\Admin\Features\WcPayWelcomePage',
 		);
 		foreach ( $aliases as $new_class => $orig_class ) {
 			class_alias( $new_class, $orig_class );
diff --git a/plugins/woocommerce-admin/src/Features/Navigation/CoreMenu.php b/plugins/woocommerce-admin/src/Features/Navigation/CoreMenu.php
index 6ff5fe326cf..5b63684b25f 100644
--- a/plugins/woocommerce-admin/src/Features/Navigation/CoreMenu.php
+++ b/plugins/woocommerce-admin/src/Features/Navigation/CoreMenu.php
@@ -189,11 +189,11 @@ class CoreMenu {
 		}
 
 		$home_item = array();
-		if ( defined( '\Automattic\WooCommerce\Admin\Features\Homescreen::MENU_SLUG' ) ) {
+		if ( defined( '\Automattic\WooCommerce\Internal\Admin\Features\Homescreen::MENU_SLUG' ) ) {
 			$home_item = array(
 				'id'              => 'woocommerce-home',
 				'title'           => __( 'Home', 'woocommerce-admin' ),
-				'url'             => \Automattic\WooCommerce\Admin\Features\Homescreen::MENU_SLUG,
+				'url'             => \Automattic\WooCommerce\Internal\Admin\Homescreen::MENU_SLUG,
 				'order'           => 0,
 				'matchExpression' => 'page=wc-admin((?!path=).)*$',
 			);
diff --git a/plugins/woocommerce-admin/src/Notes/CouponPageMoved.php b/plugins/woocommerce-admin/src/Notes/CouponPageMoved.php
index fc7e9cfd1fa..a18fba70d1c 100644
--- a/plugins/woocommerce-admin/src/Notes/CouponPageMoved.php
+++ b/plugins/woocommerce-admin/src/Notes/CouponPageMoved.php
@@ -7,8 +7,7 @@
 
 namespace Automattic\WooCommerce\Admin\Notes;
 
-use Automattic\WooCommerce\Admin\Features\Features;
-use Automattic\WooCommerce\Admin\Features\CouponsMovedTrait;
+use Automattic\WooCommerce\Internal\Admin\CouponsMovedTrait;
 use stdClass;
 use WC_Data_Store;
 
diff --git a/plugins/woocommerce-admin/tests/features/class-wc-tests-ces-tracks.php b/plugins/woocommerce-admin/tests/features/class-wc-tests-ces-tracks.php
index 17796158757..61993824f1e 100644
--- a/plugins/woocommerce-admin/tests/features/class-wc-tests-ces-tracks.php
+++ b/plugins/woocommerce-admin/tests/features/class-wc-tests-ces-tracks.php
@@ -5,7 +5,7 @@
  * @package Automattic\WooCommerce\Admin\Features
  */
 
-use \Automattic\WooCommerce\Admin\Features\CustomerEffortScoreTracks;
+use Automattic\WooCommerce\Internal\Admin\CustomerEffortScoreTracks;
 
 // CustomerEffortScoreTracks only works in wp-admin, so let's fake it.
 define( 'WP_ADMIN', true );
diff --git a/plugins/woocommerce-admin/tests/features/class-wc-tests-shipping-label-banner-display-rules.php b/plugins/woocommerce-admin/tests/features/class-wc-tests-shipping-label-banner-display-rules.php
index 6d2e6e0f800..f4679cdf58a 100644
--- a/plugins/woocommerce-admin/tests/features/class-wc-tests-shipping-label-banner-display-rules.php
+++ b/plugins/woocommerce-admin/tests/features/class-wc-tests-shipping-label-banner-display-rules.php
@@ -5,7 +5,7 @@
  * @package WooCommerce\Admin\Tests\ShippingLabelBannerDisplayRules
  */
 
-use \Automattic\WooCommerce\Admin\Features\ShippingLabelBannerDisplayRules;
+use Automattic\WooCommerce\Internal\Admin\ShippingLabelBannerDisplayRules;
 
 /**
  * Class WC_Tests_Shipping_Label_Banner_Display_Rules