diff --git a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-themes-controller.php b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-themes-controller.php
index df7782cfcb7..9f5e2812bdb 100644
--- a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-themes-controller.php
+++ b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-themes-controller.php
@@ -9,6 +9,9 @@
 
 defined( 'ABSPATH' ) || exit;
 
+use Automattic\WooCommerce\Admin\WC_Admin_Theme_Upgrader;
+use Automattic\WooCommerce\Admin\WC_Admin_Theme_Upgrader_Skin;
+
 /**
  * Themes controller.
  *
diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-theme-upgrader.php b/plugins/woocommerce-admin/src/WC_Admin_Theme_Upgrader.php
similarity index 95%
rename from plugins/woocommerce-admin/includes/class-wc-admin-theme-upgrader.php
rename to plugins/woocommerce-admin/src/WC_Admin_Theme_Upgrader.php
index 6c9b9a64b43..ea67c9067a2 100644
--- a/plugins/woocommerce-admin/includes/class-wc-admin-theme-upgrader.php
+++ b/plugins/woocommerce-admin/src/WC_Admin_Theme_Upgrader.php
@@ -5,12 +5,14 @@
  * @package WooCommerce Admin/Classes
  */
 
+namespace Automattic\WooCommerce\Admin;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
  * WC_Admin_Theme_Upgrader Class.
  */
-class WC_Admin_Theme_Upgrader extends Theme_Upgrader {
+class WC_Admin_Theme_Upgrader extends \Theme_Upgrader {
 	/**
 	 * Install a theme package.
 	 *
diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-theme-upgrader-skin.php b/plugins/woocommerce-admin/src/WC_Admin_Theme_Upgrader_Skin.php
similarity index 83%
rename from plugins/woocommerce-admin/includes/class-wc-admin-theme-upgrader-skin.php
rename to plugins/woocommerce-admin/src/WC_Admin_Theme_Upgrader_Skin.php
index bf533c39767..9de76267de4 100644
--- a/plugins/woocommerce-admin/includes/class-wc-admin-theme-upgrader-skin.php
+++ b/plugins/woocommerce-admin/src/WC_Admin_Theme_Upgrader_Skin.php
@@ -5,12 +5,14 @@
  * @package WooCommerce Admin/Classes
  */
 
+namespace Automattic\WooCommerce\Admin;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
  * WC_Admin_Theme_Upgrader_Skin Class.
  */
-class WC_Admin_Theme_Upgrader_Skin extends Theme_Upgrader_Skin {
+class WC_Admin_Theme_Upgrader_Skin extends \Theme_Upgrader_Skin {
 	/**
 	 * Hide the skin header display.
 	 */