diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php
index df683ab78c..2a87d903cd 100644
--- a/lib/Config/Initializer.php
+++ b/lib/Config/Initializer.php
@@ -120,8 +120,12 @@ class Initializer {
     }
 
     try {
+      // legacy router
       $this->setupRouter();
+      // new api (will replace legacy router completely)
       $this->setupAPI();
+
+      $this->setupFrontRouter();
       $this->setupPages();
     } catch(\Exception $e) {
       $this->handleFailedInitialization($e);
@@ -187,8 +191,12 @@ class Initializer {
   }
 
   function setupAPI() {
-    $API = new \MailPoet\API\API();
-    $API->init();
+
+  }
+
+  function setupFrontRouter() {
+    $router = new Router\Front();
+    $router->init();
   }
 
   function runQueueSupervisor() {
diff --git a/lib/Cron/CronHelper.php b/lib/Cron/CronHelper.php
index 60c35b539f..72b1a4ea4f 100644
--- a/lib/Cron/CronHelper.php
+++ b/lib/Cron/CronHelper.php
@@ -1,8 +1,8 @@
 <?php
 namespace MailPoet\Cron;
 
-use MailPoet\API\API;
-use MailPoet\API\Endpoints\Queue as QueueAPI;
+use MailPoet\Router\Front as FrontRouter;
+use MailPoet\Router\Queue as QueueEndpoint;
 use MailPoet\Models\Setting;
 use MailPoet\Util\Security;
 
@@ -40,9 +40,9 @@ class CronHelper {
 
   static function accessDaemon($token, $timeout = self::DAEMON_REQUEST_TIMEOUT) {
     $data = array('token' => $token);
-    $url = API::buildRequest(
-      QueueAPI::ENDPOINT,
-      QueueAPI::ACTION_RUN,
+    $url = FrontRouter::buildRequest(
+      QueueEndpoint::ENDPOINT,
+      QueueEndpoint::ACTION_RUN,
       $data
     );
     $args = array(
diff --git a/lib/Newsletter/Links/Links.php b/lib/Newsletter/Links/Links.php
index 9846eb02a6..f7066f9476 100644
--- a/lib/Newsletter/Links/Links.php
+++ b/lib/Newsletter/Links/Links.php
@@ -1,8 +1,8 @@
 <?php
 namespace MailPoet\Newsletter\Links;
 
-use MailPoet\API\API;
-use MailPoet\API\Endpoints\Track as TrackAPI;
+use MailPoet\Router\Front as FrontRouter;
+use MailPoet\Router\Track as TrackEndpoint;
 use MailPoet\Models\NewsletterLink;
 use MailPoet\Newsletter\Shortcodes\Shortcodes;
 use MailPoet\Util\Security;
@@ -115,12 +115,12 @@ class Links {
         'queue' => $queue_id,
         'hash' => $hash
       );
-      $API_action = ($matches[2][$index] === self::DATA_TAG_CLICK) ?
-        TrackAPI::ACTION_CLICK :
-        TrackAPI::ACTION_OPEN;
-      $link = API::buildRequest(
-        TrackAPI::ENDPOINT,
-        $API_action,
+      $router_action = ($matches[2][$index] === self::DATA_TAG_CLICK) ?
+        TrackEndpoint::ACTION_CLICK :
+        TrackEndpoint::ACTION_OPEN;
+      $link = FrontRouter::buildRequest(
+        TrackEndpoint::ENDPOINT,
+        $router_action,
         $data
       );
       $content = str_replace($match, $link, $content);
diff --git a/lib/Newsletter/Url.php b/lib/Newsletter/Url.php
index c71c627e91..18e52fa34c 100644
--- a/lib/Newsletter/Url.php
+++ b/lib/Newsletter/Url.php
@@ -1,8 +1,8 @@
 <?php
 namespace MailPoet\Newsletter;
 
-use MailPoet\API\API;
-use MailPoet\API\Endpoints\ViewInBrowser as ViewInBrowserAPI;
+use MailPoet\Router\Front as FrontRouter;
+use MailPoet\Router\ViewInBrowser as ViewInBrowserEndpoint;
 use MailPoet\Models\Subscriber;
 
 class Url {
@@ -34,9 +34,9 @@ class Url {
         $queue['id'] :
         $queue
     );
-    return API::buildRequest(
-      ViewInBrowserAPI::ENDPOINT,
-      ViewInBrowserAPI::ACTION_VIEW,
+    return FrontRouter::buildRequest(
+      ViewInBrowserEndpoint::ENDPOINT,
+      ViewInBrowserEndpoint::ACTION_VIEW,
       $data
     );
   }
diff --git a/lib/API/API.php b/lib/Router/Front.php
similarity index 85%
rename from lib/API/API.php
rename to lib/Router/Front.php
index 7985ffe68a..625a409d39 100644
--- a/lib/API/API.php
+++ b/lib/Router/Front.php
@@ -1,17 +1,16 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\Router;
 
 use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
-class API {
+class Front {
   public $api_request;
   public $endpoint;
   public $action;
   public $data;
   const NAME = 'mailpoet_api';
-  const ENDPOINT_NAMESPACE = '\MailPoet\API\Endpoints\\';
   const RESPONSE_ERROR = 404;
 
   function __construct($api_data = false) {
@@ -29,10 +28,10 @@ class API {
   }
 
   function init() {
-    $endpoint = self::ENDPOINT_NAMESPACE . ucfirst($this->endpoint);
+    $endpoint = ucfirst($this->endpoint);
     if(!$this->api_request) return;
     if(!$this->endpoint || !class_exists($endpoint)) {
-      self::terminateRequest(self::RESPONSE_ERROR, __('Invalid API endpoint.'));
+      self::terminateRequest(self::RESPONSE_ERROR, __('Invalid Router endpoint.'));
     }
     $this->callEndpoint(
       $endpoint,
@@ -43,7 +42,7 @@ class API {
 
   function callEndpoint($endpoint, $action, $data) {
     if(!method_exists($endpoint, $action)) {
-      self::terminateRequest(self::RESPONSE_ERROR, __('Invalid API action.'));
+      self::terminateRequest(self::RESPONSE_ERROR, __('Invalid Router action.'));
     }
     call_user_func(
       array(
diff --git a/lib/API/Endpoints/Queue.php b/lib/Router/Queue.php
similarity index 86%
rename from lib/API/Endpoints/Queue.php
rename to lib/Router/Queue.php
index 736e83d554..36740d5273 100644
--- a/lib/API/Endpoints/Queue.php
+++ b/lib/Router/Queue.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\Endpoints;
+namespace MailPoet\Router;
 
 use MailPoet\Cron\Daemon;
 
diff --git a/lib/API/Endpoints/Subscription.php b/lib/Router/Subscription.php
similarity index 93%
rename from lib/API/Endpoints/Subscription.php
rename to lib/Router/Subscription.php
index 671c7dd382..7df2dda2da 100644
--- a/lib/API/Endpoints/Subscription.php
+++ b/lib/Router/Subscription.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\Endpoints;
+namespace MailPoet\Router;
 
 use MailPoet\Subscription as UserSubscription;
 
diff --git a/lib/API/Endpoints/Track.php b/lib/Router/Track.php
similarity index 91%
rename from lib/API/Endpoints/Track.php
rename to lib/Router/Track.php
index d75da6debe..8e80422292 100644
--- a/lib/API/Endpoints/Track.php
+++ b/lib/Router/Track.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\Endpoints;
+namespace MailPoet\Router;
 
 use MailPoet\Statistics\Track\Clicks;
 use MailPoet\Statistics\Track\Opens;
diff --git a/lib/API/Endpoints/ViewInBrowser.php b/lib/Router/ViewInBrowser.php
similarity index 89%
rename from lib/API/Endpoints/ViewInBrowser.php
rename to lib/Router/ViewInBrowser.php
index 29ceb32c83..5d0ebc59e7 100644
--- a/lib/API/Endpoints/ViewInBrowser.php
+++ b/lib/Router/ViewInBrowser.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\Endpoints;
+namespace MailPoet\Router;
 
 use MailPoet\Newsletter\ViewInBrowser as NewsletterViewInBrowser;
 
diff --git a/lib/Subscription/Url.php b/lib/Subscription/Url.php
index 52e6045f14..b94d0cb6fe 100644
--- a/lib/Subscription/Url.php
+++ b/lib/Subscription/Url.php
@@ -1,8 +1,8 @@
 <?php
 namespace MailPoet\Subscription;
 
-use MailPoet\API\API;
-use MailPoet\API\Endpoints\Subscription;
+use MailPoet\Router\Front as FrontRouter;
+use MailPoet\Router\Subscription as SubscriptionEndpoint;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\Setting;
 
@@ -45,10 +45,10 @@ class Url {
     }
 
     $params = array(
-      API::NAME,
-      'endpoint='.Subscription::ENDPOINT,
+      FrontRouter::NAME,
+      'endpoint='.SubscriptionEndpoint::ENDPOINT,
       'action='.$action,
-      'data='.API::encodeRequestData($data)
+      'data='.FrontRouter::encodeRequestData($data)
     );
 
     // add parameters