diff --git a/lib/API/API.php b/lib/API/API.php
new file mode 100644
index 0000000000..3c13d8e2f0
--- /dev/null
+++ b/lib/API/API.php
@@ -0,0 +1,18 @@
+<?php
+namespace MailPoet\API;
+
+if(!defined('ABSPATH')) exit;
+
+class API {
+  static function JSON() {
+    return new \MailPoet\API\JSON\API();
+  }
+
+  static function MP($version) {
+    $api_class = sprintf('%s\MP\%s\API', __NAMESPACE__, $version);
+    if(class_exists($api_class)) {
+      return new $api_class();
+    }
+    throw new \Exception(__('Invalid API version.', 'mailpoet'));
+  }
+}
\ No newline at end of file
diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php
index 120b1453fd..64fd0f75fc 100644
--- a/lib/API/JSON/API.php
+++ b/lib/API/JSON/API.php
@@ -20,12 +20,11 @@ class API {
       'v1'
   );
   const CURRENT_VERSION = 'v1';
-  const ENDPOINTS_LOCATION = 'Endpoints';
 
   function __construct() {
     foreach($this->_available_api_versions as $available_api_version) {
       $this->addEndpointNamespace(
-        sprintf('%s\%s\%s', __NAMESPACE__, self::ENDPOINTS_LOCATION, $available_api_version),
+        sprintf('%s\%s', __NAMESPACE__, $available_api_version),
         $available_api_version
       );
     }
diff --git a/lib/API/JSON/Endpoints/v1/AutomatedLatestContent.php b/lib/API/JSON/v1/AutomatedLatestContent.php
similarity index 97%
rename from lib/API/JSON/Endpoints/v1/AutomatedLatestContent.php
rename to lib/API/JSON/v1/AutomatedLatestContent.php
index 3c6c7fd145..74d0ac4a29 100644
--- a/lib/API/JSON/Endpoints/v1/AutomatedLatestContent.php
+++ b/lib/API/JSON/v1/AutomatedLatestContent.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\WP\Posts as WPPosts;
 
diff --git a/lib/API/JSON/Endpoints/v1/CustomFields.php b/lib/API/JSON/v1/CustomFields.php
similarity index 97%
rename from lib/API/JSON/Endpoints/v1/CustomFields.php
rename to lib/API/JSON/v1/CustomFields.php
index d28f176176..529e7d476a 100644
--- a/lib/API/JSON/Endpoints/v1/CustomFields.php
+++ b/lib/API/JSON/v1/CustomFields.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Models\CustomField;
diff --git a/lib/API/JSON/Endpoints/v1/Forms.php b/lib/API/JSON/v1/Forms.php
similarity index 99%
rename from lib/API/JSON/Endpoints/v1/Forms.php
rename to lib/API/JSON/v1/Forms.php
index 4a640a8c70..179d805836 100644
--- a/lib/API/JSON/Endpoints/v1/Forms.php
+++ b/lib/API/JSON/v1/Forms.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 
diff --git a/lib/API/JSON/Endpoints/v1/ImportExport.php b/lib/API/JSON/v1/ImportExport.php
similarity index 97%
rename from lib/API/JSON/Endpoints/v1/ImportExport.php
rename to lib/API/JSON/v1/ImportExport.php
index 5e5d178671..8e4f3b89c0 100644
--- a/lib/API/JSON/Endpoints/v1/ImportExport.php
+++ b/lib/API/JSON/v1/ImportExport.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 
 use MailPoet\Subscribers\ImportExport\Import\MailChimp;
diff --git a/lib/API/JSON/Endpoints/v1/Mailer.php b/lib/API/JSON/v1/Mailer.php
similarity index 96%
rename from lib/API/JSON/Endpoints/v1/Mailer.php
rename to lib/API/JSON/v1/Mailer.php
index f0193e71ec..4400453299 100644
--- a/lib/API/JSON/Endpoints/v1/Mailer.php
+++ b/lib/API/JSON/v1/Mailer.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Mailer\MailerLog;
diff --git a/lib/API/JSON/Endpoints/v1/NewsletterTemplates.php b/lib/API/JSON/v1/NewsletterTemplates.php
similarity index 97%
rename from lib/API/JSON/Endpoints/v1/NewsletterTemplates.php
rename to lib/API/JSON/v1/NewsletterTemplates.php
index df83539df4..69c4f5a4d5 100644
--- a/lib/API/JSON/Endpoints/v1/NewsletterTemplates.php
+++ b/lib/API/JSON/v1/NewsletterTemplates.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 
diff --git a/lib/API/JSON/Endpoints/v1/Newsletters.php b/lib/API/JSON/v1/Newsletters.php
similarity index 99%
rename from lib/API/JSON/Endpoints/v1/Newsletters.php
rename to lib/API/JSON/v1/Newsletters.php
index a1414925f1..beab51932c 100644
--- a/lib/API/JSON/Endpoints/v1/Newsletters.php
+++ b/lib/API/JSON/v1/Newsletters.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
diff --git a/lib/API/JSON/Endpoints/v1/Segments.php b/lib/API/JSON/v1/Segments.php
similarity index 99%
rename from lib/API/JSON/Endpoints/v1/Segments.php
rename to lib/API/JSON/v1/Segments.php
index b29fb9896c..2ef6a07b89 100644
--- a/lib/API/JSON/Endpoints/v1/Segments.php
+++ b/lib/API/JSON/v1/Segments.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 
diff --git a/lib/API/JSON/Endpoints/v1/SendingQueue.php b/lib/API/JSON/v1/SendingQueue.php
similarity index 99%
rename from lib/API/JSON/Endpoints/v1/SendingQueue.php
rename to lib/API/JSON/v1/SendingQueue.php
index a6c3d9fce4..e155cbd0cc 100644
--- a/lib/API/JSON/Endpoints/v1/SendingQueue.php
+++ b/lib/API/JSON/v1/SendingQueue.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 
diff --git a/lib/API/JSON/Endpoints/v1/Services.php b/lib/API/JSON/v1/Services.php
similarity index 98%
rename from lib/API/JSON/Endpoints/v1/Services.php
rename to lib/API/JSON/v1/Services.php
index 87ef06a7a4..92bee7a61e 100644
--- a/lib/API/JSON/Endpoints/v1/Services.php
+++ b/lib/API/JSON/v1/Services.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
diff --git a/lib/API/JSON/Endpoints/v1/Settings.php b/lib/API/JSON/v1/Settings.php
similarity index 94%
rename from lib/API/JSON/Endpoints/v1/Settings.php
rename to lib/API/JSON/v1/Settings.php
index bdaad0208c..1a2093c4ed 100644
--- a/lib/API/JSON/Endpoints/v1/Settings.php
+++ b/lib/API/JSON/v1/Settings.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
diff --git a/lib/API/JSON/Endpoints/v1/Setup.php b/lib/API/JSON/v1/Setup.php
similarity index 92%
rename from lib/API/JSON/Endpoints/v1/Setup.php
rename to lib/API/JSON/v1/Setup.php
index ec1fae58b5..d0f6989226 100644
--- a/lib/API/JSON/Endpoints/v1/Setup.php
+++ b/lib/API/JSON/v1/Setup.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\Config\Activator;
diff --git a/lib/API/JSON/Endpoints/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php
similarity index 99%
rename from lib/API/JSON/Endpoints/v1/Subscribers.php
rename to lib/API/JSON/v1/Subscribers.php
index 9074e91562..fc161d0549 100644
--- a/lib/API/JSON/Endpoints/v1/Subscribers.php
+++ b/lib/API/JSON/v1/Subscribers.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Error as APIError;
 use MailPoet\API\JSON\Access as APIAccess;
diff --git a/lib/API/MP/API.php b/lib/API/MP/API.php
deleted file mode 100644
index a49a6389bf..0000000000
--- a/lib/API/MP/API.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace MailPoet\MP\API;
-
-if(!defined('ABSPATH')) exit;
-
-class API {
-  static function __callStatic($version, $arguments) {
-    $api_class = sprintf('%s\%s\API', __NAMESPACE__, $version);
-    if(class_exists($api_class)) {
-      $api = new $api_class();
-      return $api;
-    }
-    throw new \Exception(__('Invalid API version.', 'mailpoet'));
-  }
-}
\ No newline at end of file
diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php
index 0bc18faa5d..f9b8abfa8c 100644
--- a/lib/Config/Initializer.php
+++ b/lib/Config/Initializer.php
@@ -172,8 +172,7 @@ class Initializer {
   }
 
   function setupJSONAPI() {
-    $api = new API\JSON\API();
-    $api->init();
+    API\API::JSON()->init();
   }
 
   function setupRouter() {
diff --git a/tests/unit/API/JSON/APITest.php b/tests/unit/API/JSON/APITest.php
index a27365eac0..f29a6eabe7 100644
--- a/tests/unit/API/JSON/APITest.php
+++ b/tests/unit/API/JSON/APITest.php
@@ -84,7 +84,7 @@ class APITest extends MailPoetTest {
 
   function testItAcceptsAndProcessesAPIVersion() {
     $namespace = array(
-      'name' => 'MailPoet\API\JSON\Endpoints\v2',
+      'name' => 'MailPoet\API\JSON\v2',
       'version' => 'v2'
     );
     $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
@@ -98,13 +98,13 @@ class APITest extends MailPoetTest {
 
     expect($this->api->getRequestedAPIVersion())->equals('v2');
     expect($this->api->getRequestedEndpointClass())->equals(
-      'MailPoet\API\JSON\Endpoints\v2\NamespacedEndpointStub'
+      'MailPoet\API\JSON\v2\NamespacedEndpointStub'
     );
   }
 
   function testItCallsAddedEndpoints() {
     $namespace = array(
-      'name' => 'MailPoet\API\JSON\Endpoints\v1',
+      'name' => 'MailPoet\API\JSON\v1',
       'version' => 'v1'
     );
     $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
@@ -123,7 +123,7 @@ class APITest extends MailPoetTest {
 
   function testItCallsAddedEndpointsForSpecificAPIVersion() {
     $namespace = array(
-      'name' => 'MailPoet\API\JSON\Endpoints\v2',
+      'name' => 'MailPoet\API\JSON\v2',
       'version' => 'v2'
     );
     $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
diff --git a/tests/unit/API/JSON/APITestNamespacedEndpointStubV1.php b/tests/unit/API/JSON/APITestNamespacedEndpointStubV1.php
index 148942e348..e261461208 100644
--- a/tests/unit/API/JSON/APITestNamespacedEndpointStubV1.php
+++ b/tests/unit/API/JSON/APITestNamespacedEndpointStubV1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\API\JSON\Access as APIAccess;
diff --git a/tests/unit/API/JSON/APITestNamespacedEndpointStubV2.php b/tests/unit/API/JSON/APITestNamespacedEndpointStubV2.php
index 32a5467759..27a68cea2d 100644
--- a/tests/unit/API/JSON/APITestNamespacedEndpointStubV2.php
+++ b/tests/unit/API/JSON/APITestNamespacedEndpointStubV2.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MailPoet\API\JSON\Endpoints\v2;
+namespace MailPoet\API\JSON\v2;
 
 use MailPoet\API\JSON\Access as APIAccess;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
diff --git a/tests/unit/API/JSON/Endpoints/v1/CustomFieldsTest.php b/tests/unit/API/JSON/v1/CustomFieldsTest.php
similarity index 98%
rename from tests/unit/API/JSON/Endpoints/v1/CustomFieldsTest.php
rename to tests/unit/API/JSON/v1/CustomFieldsTest.php
index fde1ed27eb..9a9bcb9fd2 100644
--- a/tests/unit/API/JSON/Endpoints/v1/CustomFieldsTest.php
+++ b/tests/unit/API/JSON/v1/CustomFieldsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\API\JSON\Endpoints\v1\CustomFields;
+use MailPoet\API\JSON\v1\CustomFields;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\CustomField;
 
diff --git a/tests/unit/API/JSON/Endpoints/v1/FormsTest.php b/tests/unit/API/JSON/v1/FormsTest.php
similarity index 99%
rename from tests/unit/API/JSON/Endpoints/v1/FormsTest.php
rename to tests/unit/API/JSON/v1/FormsTest.php
index 9bea75825f..2b4d09c42d 100644
--- a/tests/unit/API/JSON/Endpoints/v1/FormsTest.php
+++ b/tests/unit/API/JSON/v1/FormsTest.php
@@ -1,5 +1,5 @@
 <?php
-use MailPoet\API\JSON\Endpoints\v1\Forms;
+use MailPoet\API\JSON\v1\Forms;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Form;
 use MailPoet\Models\Segment;
diff --git a/tests/unit/API/JSON/Endpoints/v1/MailerTest.php b/tests/unit/API/JSON/v1/MailerTest.php
similarity index 94%
rename from tests/unit/API/JSON/Endpoints/v1/MailerTest.php
rename to tests/unit/API/JSON/v1/MailerTest.php
index bdc0c9cfdd..251aa1b3d3 100644
--- a/tests/unit/API/JSON/Endpoints/v1/MailerTest.php
+++ b/tests/unit/API/JSON/v1/MailerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\API\JSON\Endpoints\v1\Mailer;
+use MailPoet\API\JSON\v1\Mailer;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Mailer\MailerLog;
 
diff --git a/tests/unit/API/JSON/Endpoints/v1/NewsletterTemplatesTest.php b/tests/unit/API/JSON/v1/NewsletterTemplatesTest.php
similarity index 98%
rename from tests/unit/API/JSON/Endpoints/v1/NewsletterTemplatesTest.php
rename to tests/unit/API/JSON/v1/NewsletterTemplatesTest.php
index 7ec4709f9a..387b62550b 100644
--- a/tests/unit/API/JSON/Endpoints/v1/NewsletterTemplatesTest.php
+++ b/tests/unit/API/JSON/v1/NewsletterTemplatesTest.php
@@ -1,6 +1,6 @@
 <?php
 use MailPoet\API\JSON\Response as APIResponse;
-use MailPoet\API\JSON\Endpoints\v1\NewsletterTemplates;
+use MailPoet\API\JSON\v1\NewsletterTemplates;
 use MailPoet\Models\NewsletterTemplate;
 
 class NewsletterTemplatesTest extends MailPoetTest {
diff --git a/tests/unit/API/JSON/Endpoints/v1/NewslettersTest.php b/tests/unit/API/JSON/v1/NewslettersTest.php
similarity index 99%
rename from tests/unit/API/JSON/Endpoints/v1/NewslettersTest.php
rename to tests/unit/API/JSON/v1/NewslettersTest.php
index bfd2264400..53cbbe6033 100644
--- a/tests/unit/API/JSON/Endpoints/v1/NewslettersTest.php
+++ b/tests/unit/API/JSON/v1/NewslettersTest.php
@@ -3,7 +3,7 @@ use Carbon\Carbon;
 use Codeception\Util\Fixtures;
 use Codeception\Util\Stub;
 use Helper\WordPressHooks as WPHooksHelper;
-use MailPoet\API\JSON\Endpoints\v1\Newsletters;
+use MailPoet\API\JSON\v1\Newsletters;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\NewsletterOptionField;
diff --git a/tests/unit/API/JSON/Endpoints/v1/SegmentsTest.php b/tests/unit/API/JSON/v1/SegmentsTest.php
similarity index 99%
rename from tests/unit/API/JSON/Endpoints/v1/SegmentsTest.php
rename to tests/unit/API/JSON/v1/SegmentsTest.php
index 3bb16b69d1..185f3c3d13 100644
--- a/tests/unit/API/JSON/Endpoints/v1/SegmentsTest.php
+++ b/tests/unit/API/JSON/v1/SegmentsTest.php
@@ -1,5 +1,5 @@
 <?php
-use MailPoet\API\JSON\Endpoints\v1\Segments;
+use MailPoet\API\JSON\v1\Segments;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Segment;
 
diff --git a/tests/unit/API/JSON/Endpoints/v1/ServicesTest.php b/tests/unit/API/JSON/v1/ServicesTest.php
similarity index 99%
rename from tests/unit/API/JSON/Endpoints/v1/ServicesTest.php
rename to tests/unit/API/JSON/v1/ServicesTest.php
index ae07c9de82..568181a75c 100644
--- a/tests/unit/API/JSON/Endpoints/v1/ServicesTest.php
+++ b/tests/unit/API/JSON/v1/ServicesTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Codeception\Util\Stub;
-use MailPoet\API\JSON\Endpoints\v1\Services;
+use MailPoet\API\JSON\v1\Services;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Services\Bridge;
 
diff --git a/tests/unit/API/JSON/Endpoints/v1/SettingsTest.php b/tests/unit/API/JSON/v1/SettingsTest.php
similarity index 97%
rename from tests/unit/API/JSON/Endpoints/v1/SettingsTest.php
rename to tests/unit/API/JSON/v1/SettingsTest.php
index 237d491523..f1e122e603 100644
--- a/tests/unit/API/JSON/Endpoints/v1/SettingsTest.php
+++ b/tests/unit/API/JSON/v1/SettingsTest.php
@@ -1,7 +1,7 @@
 <?php
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\API\JSON\Error as APIError;
-use MailPoet\API\JSON\Endpoints\v1\Settings;
+use MailPoet\API\JSON\v1\Settings;
 use MailPoet\Models\Setting;
 
 class SettingsTest extends MailPoetTest {
diff --git a/tests/unit/API/JSON/Endpoints/v1/SetupTest.php b/tests/unit/API/JSON/v1/SetupTest.php
similarity index 94%
rename from tests/unit/API/JSON/Endpoints/v1/SetupTest.php
rename to tests/unit/API/JSON/v1/SetupTest.php
index d4a1ff94ef..0a1c064bbe 100644
--- a/tests/unit/API/JSON/Endpoints/v1/SetupTest.php
+++ b/tests/unit/API/JSON/v1/SetupTest.php
@@ -1,7 +1,7 @@
 <?php
 use Helper\WordPressHooks as WPHooksHelper;
 use MailPoet\API\JSON\Response as APIResponse;
-use MailPoet\API\JSON\Endpoints\v1\Setup;
+use MailPoet\API\JSON\v1\Setup;
 use MailPoet\Models\Setting;
 
 class SetupTest extends MailPoetTest {
diff --git a/tests/unit/API/JSON/Endpoints/v1/SubscribersTest.php b/tests/unit/API/JSON/v1/SubscribersTest.php
similarity index 99%
rename from tests/unit/API/JSON/Endpoints/v1/SubscribersTest.php
rename to tests/unit/API/JSON/v1/SubscribersTest.php
index 661374de81..64514f11e3 100644
--- a/tests/unit/API/JSON/Endpoints/v1/SubscribersTest.php
+++ b/tests/unit/API/JSON/v1/SubscribersTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Codeception\Util\Fixtures;
-use MailPoet\API\JSON\Endpoints\v1\Subscribers;
+use MailPoet\API\JSON\v1\Subscribers;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Form;
 use MailPoet\Models\Subscriber;