diff --git a/includes/class-wc-api.php b/includes/class-wc-api.php
index f9c7855e6ae..a56ea1bb5e3 100644
--- a/includes/class-wc-api.php
+++ b/includes/class-wc-api.php
@@ -24,8 +24,6 @@ class WC_API extends WC_Legacy_API {
 	 * @since 2.0
 	 */
 	public function __construct() {
-		parent::__construct();
-
 		$this->wc_api_init();
 		$this->rest_api_init();
 	}
diff --git a/includes/class-woocommerce.php b/includes/class-woocommerce.php
index 38451d0501a..a04c841670a 100644
--- a/includes/class-woocommerce.php
+++ b/includes/class-woocommerce.php
@@ -459,6 +459,7 @@ final class WooCommerce {
 		$this->theme_support_includes();
 		$this->query = new WC_Query();
 		$this->api   = new WC_API();
+		$this->api->init();
 	}
 
 	/**
diff --git a/includes/api/legacy/class-wc-rest-legacy-coupons-controller.php b/includes/legacy/api/class-wc-rest-legacy-coupons-controller.php
similarity index 100%
rename from includes/api/legacy/class-wc-rest-legacy-coupons-controller.php
rename to includes/legacy/api/class-wc-rest-legacy-coupons-controller.php
diff --git a/includes/api/legacy/class-wc-rest-legacy-orders-controller.php b/includes/legacy/api/class-wc-rest-legacy-orders-controller.php
similarity index 100%
rename from includes/api/legacy/class-wc-rest-legacy-orders-controller.php
rename to includes/legacy/api/class-wc-rest-legacy-orders-controller.php
diff --git a/includes/api/legacy/class-wc-rest-legacy-products-controller.php b/includes/legacy/api/class-wc-rest-legacy-products-controller.php
similarity index 100%
rename from includes/api/legacy/class-wc-rest-legacy-products-controller.php
rename to includes/legacy/api/class-wc-rest-legacy-products-controller.php
diff --git a/includes/api/legacy/v1/class-wc-api-authentication.php b/includes/legacy/api/v1/class-wc-api-authentication.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-authentication.php
rename to includes/legacy/api/v1/class-wc-api-authentication.php
diff --git a/includes/api/legacy/v1/class-wc-api-coupons.php b/includes/legacy/api/v1/class-wc-api-coupons.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-coupons.php
rename to includes/legacy/api/v1/class-wc-api-coupons.php
diff --git a/includes/api/legacy/v1/class-wc-api-customers.php b/includes/legacy/api/v1/class-wc-api-customers.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-customers.php
rename to includes/legacy/api/v1/class-wc-api-customers.php
diff --git a/includes/api/legacy/v1/class-wc-api-json-handler.php b/includes/legacy/api/v1/class-wc-api-json-handler.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-json-handler.php
rename to includes/legacy/api/v1/class-wc-api-json-handler.php
diff --git a/includes/api/legacy/v1/class-wc-api-orders.php b/includes/legacy/api/v1/class-wc-api-orders.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-orders.php
rename to includes/legacy/api/v1/class-wc-api-orders.php
diff --git a/includes/api/legacy/v1/class-wc-api-products.php b/includes/legacy/api/v1/class-wc-api-products.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-products.php
rename to includes/legacy/api/v1/class-wc-api-products.php
diff --git a/includes/api/legacy/v1/class-wc-api-reports.php b/includes/legacy/api/v1/class-wc-api-reports.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-reports.php
rename to includes/legacy/api/v1/class-wc-api-reports.php
diff --git a/includes/api/legacy/v1/class-wc-api-resource.php b/includes/legacy/api/v1/class-wc-api-resource.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-resource.php
rename to includes/legacy/api/v1/class-wc-api-resource.php
diff --git a/includes/api/legacy/v1/class-wc-api-server.php b/includes/legacy/api/v1/class-wc-api-server.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-server.php
rename to includes/legacy/api/v1/class-wc-api-server.php
diff --git a/includes/api/legacy/v1/class-wc-api-xml-handler.php b/includes/legacy/api/v1/class-wc-api-xml-handler.php
similarity index 100%
rename from includes/api/legacy/v1/class-wc-api-xml-handler.php
rename to includes/legacy/api/v1/class-wc-api-xml-handler.php
diff --git a/includes/api/legacy/v1/interface-wc-api-handler.php b/includes/legacy/api/v1/interface-wc-api-handler.php
similarity index 100%
rename from includes/api/legacy/v1/interface-wc-api-handler.php
rename to includes/legacy/api/v1/interface-wc-api-handler.php
diff --git a/includes/api/legacy/v2/class-wc-api-authentication.php b/includes/legacy/api/v2/class-wc-api-authentication.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-authentication.php
rename to includes/legacy/api/v2/class-wc-api-authentication.php
diff --git a/includes/api/legacy/v2/class-wc-api-coupons.php b/includes/legacy/api/v2/class-wc-api-coupons.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-coupons.php
rename to includes/legacy/api/v2/class-wc-api-coupons.php
diff --git a/includes/api/legacy/v2/class-wc-api-customers.php b/includes/legacy/api/v2/class-wc-api-customers.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-customers.php
rename to includes/legacy/api/v2/class-wc-api-customers.php
diff --git a/includes/api/legacy/v2/class-wc-api-exception.php b/includes/legacy/api/v2/class-wc-api-exception.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-exception.php
rename to includes/legacy/api/v2/class-wc-api-exception.php
diff --git a/includes/api/legacy/v2/class-wc-api-json-handler.php b/includes/legacy/api/v2/class-wc-api-json-handler.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-json-handler.php
rename to includes/legacy/api/v2/class-wc-api-json-handler.php
diff --git a/includes/api/legacy/v2/class-wc-api-orders.php b/includes/legacy/api/v2/class-wc-api-orders.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-orders.php
rename to includes/legacy/api/v2/class-wc-api-orders.php
diff --git a/includes/api/legacy/v2/class-wc-api-products.php b/includes/legacy/api/v2/class-wc-api-products.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-products.php
rename to includes/legacy/api/v2/class-wc-api-products.php
diff --git a/includes/api/legacy/v2/class-wc-api-reports.php b/includes/legacy/api/v2/class-wc-api-reports.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-reports.php
rename to includes/legacy/api/v2/class-wc-api-reports.php
diff --git a/includes/api/legacy/v2/class-wc-api-resource.php b/includes/legacy/api/v2/class-wc-api-resource.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-resource.php
rename to includes/legacy/api/v2/class-wc-api-resource.php
diff --git a/includes/api/legacy/v2/class-wc-api-server.php b/includes/legacy/api/v2/class-wc-api-server.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-server.php
rename to includes/legacy/api/v2/class-wc-api-server.php
diff --git a/includes/api/legacy/v2/class-wc-api-webhooks.php b/includes/legacy/api/v2/class-wc-api-webhooks.php
similarity index 100%
rename from includes/api/legacy/v2/class-wc-api-webhooks.php
rename to includes/legacy/api/v2/class-wc-api-webhooks.php
diff --git a/includes/api/legacy/v2/interface-wc-api-handler.php b/includes/legacy/api/v2/interface-wc-api-handler.php
similarity index 100%
rename from includes/api/legacy/v2/interface-wc-api-handler.php
rename to includes/legacy/api/v2/interface-wc-api-handler.php
diff --git a/includes/api/legacy/v3/class-wc-api-authentication.php b/includes/legacy/api/v3/class-wc-api-authentication.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-authentication.php
rename to includes/legacy/api/v3/class-wc-api-authentication.php
diff --git a/includes/api/legacy/v3/class-wc-api-coupons.php b/includes/legacy/api/v3/class-wc-api-coupons.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-coupons.php
rename to includes/legacy/api/v3/class-wc-api-coupons.php
diff --git a/includes/api/legacy/v3/class-wc-api-customers.php b/includes/legacy/api/v3/class-wc-api-customers.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-customers.php
rename to includes/legacy/api/v3/class-wc-api-customers.php
diff --git a/includes/api/legacy/v3/class-wc-api-exception.php b/includes/legacy/api/v3/class-wc-api-exception.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-exception.php
rename to includes/legacy/api/v3/class-wc-api-exception.php
diff --git a/includes/api/legacy/v3/class-wc-api-json-handler.php b/includes/legacy/api/v3/class-wc-api-json-handler.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-json-handler.php
rename to includes/legacy/api/v3/class-wc-api-json-handler.php
diff --git a/includes/api/legacy/v3/class-wc-api-orders.php b/includes/legacy/api/v3/class-wc-api-orders.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-orders.php
rename to includes/legacy/api/v3/class-wc-api-orders.php
diff --git a/includes/api/legacy/v3/class-wc-api-products.php b/includes/legacy/api/v3/class-wc-api-products.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-products.php
rename to includes/legacy/api/v3/class-wc-api-products.php
diff --git a/includes/api/legacy/v3/class-wc-api-reports.php b/includes/legacy/api/v3/class-wc-api-reports.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-reports.php
rename to includes/legacy/api/v3/class-wc-api-reports.php
diff --git a/includes/api/legacy/v3/class-wc-api-resource.php b/includes/legacy/api/v3/class-wc-api-resource.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-resource.php
rename to includes/legacy/api/v3/class-wc-api-resource.php
diff --git a/includes/api/legacy/v3/class-wc-api-server.php b/includes/legacy/api/v3/class-wc-api-server.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-server.php
rename to includes/legacy/api/v3/class-wc-api-server.php
diff --git a/includes/api/legacy/v3/class-wc-api-taxes.php b/includes/legacy/api/v3/class-wc-api-taxes.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-taxes.php
rename to includes/legacy/api/v3/class-wc-api-taxes.php
diff --git a/includes/api/legacy/v3/class-wc-api-webhooks.php b/includes/legacy/api/v3/class-wc-api-webhooks.php
similarity index 100%
rename from includes/api/legacy/v3/class-wc-api-webhooks.php
rename to includes/legacy/api/v3/class-wc-api-webhooks.php
diff --git a/includes/api/legacy/v3/interface-wc-api-handler.php b/includes/legacy/api/v3/interface-wc-api-handler.php
similarity index 100%
rename from includes/api/legacy/v3/interface-wc-api-handler.php
rename to includes/legacy/api/v3/interface-wc-api-handler.php
diff --git a/includes/legacy/class-wc-legacy-api.php b/includes/legacy/class-wc-legacy-api.php
index 2c1000dd3c7..e79781bab68 100644
--- a/includes/legacy/class-wc-legacy-api.php
+++ b/includes/legacy/class-wc-legacy-api.php
@@ -43,11 +43,9 @@ class WC_Legacy_API {
 	public $authentication;
 
 	/**
-	 * Setup class.
-	 *
-	 * @since 2.0
+	 * Init the legacy API.
 	 */
-	public function __construct() {
+	public function init() {
 		add_action( 'parse_request', array( $this, 'handle_rest_api_requests' ), 0 );
 	}
 
@@ -128,23 +126,23 @@ class WC_Legacy_API {
 	public function includes() {
 
 		// API server / response handlers.
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-exception.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-server.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/interface-wc-api-handler.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-json-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-exception.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-server.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/interface-wc-api-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-json-handler.php' );
 
 		// Authentication.
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-authentication.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-authentication.php' );
 		$this->authentication = new WC_API_Authentication();
 
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-resource.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-coupons.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-customers.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-orders.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-products.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-reports.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-taxes.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v3/class-wc-api-webhooks.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-resource.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-coupons.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-customers.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-orders.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-products.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-reports.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-taxes.php' );
+		include_once( dirname( __FILE__ ) . '/api/v3/class-wc-api-webhooks.php' );
 
 		// Allow plugins to load other response handlers or resource classes.
 		do_action( 'woocommerce_api_loaded' );
@@ -186,20 +184,20 @@ class WC_Legacy_API {
 	private function handle_v1_rest_api_request() {
 
 		// Include legacy required files for v1 REST API request.
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-server.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/interface-wc-api-handler.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-json-handler.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-xml-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-server.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/interface-wc-api-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-json-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-xml-handler.php' );
 
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-authentication.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-authentication.php' );
 		$this->authentication = new WC_API_Authentication();
 
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-resource.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-coupons.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-customers.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-orders.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-products.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v1/class-wc-api-reports.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-resource.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-coupons.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-customers.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-orders.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-products.php' );
+		include_once( dirname( __FILE__ ) . '/api/v1/class-wc-api-reports.php' );
 
 		// Allow plugins to load other response handlers or resource classes.
 		do_action( 'woocommerce_api_loaded' );
@@ -232,21 +230,21 @@ class WC_Legacy_API {
 	 * @deprecated 2.6.0
 	 */
 	private function handle_v2_rest_api_request() {
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-exception.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-server.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/interface-wc-api-handler.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-json-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-exception.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-server.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/interface-wc-api-handler.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-json-handler.php' );
 
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-authentication.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-authentication.php' );
 		$this->authentication = new WC_API_Authentication();
 
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-resource.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-coupons.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-customers.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-orders.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-products.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-reports.php' );
-		include_once( dirname( __FILE__ ) . '/../api/legacy/v2/class-wc-api-webhooks.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-resource.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-coupons.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-customers.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-orders.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-products.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-reports.php' );
+		include_once( dirname( __FILE__ ) . '/api/v2/class-wc-api-webhooks.php' );
 
 		// allow plugins to load other response handlers or resource classes.
 		do_action( 'woocommerce_api_loaded' );