diff --git a/src/flextype/core/Endpoints/Api.php b/src/flextype/core/Endpoints/Api.php
index 80c574e2..35ae39db 100644
--- a/src/flextype/core/Endpoints/Api.php
+++ b/src/flextype/core/Endpoints/Api.php
@@ -99,12 +99,12 @@ class Api
             return $this->getStatusCodeMessage(400);
         }
 
-        if (! tokens()->has($data['token'])) {
+        if (! entries()->has('tokens/' . $data['token'])) {
             return $this->getStatusCodeMessage(401);
         }
 
         // Fetch token
-        $tokenData = tokens()->fetch($data['token']);
+        $tokenData = entries()->fetch('tokens/' . $data['token']);
 
         if (
             ! isset($tokenData['state']) ||
@@ -132,7 +132,7 @@ class Api
         }
 
         // Update token calls
-        tokens()->update($data['token'], ['calls' => $tokenData['calls'] + 1]);
+        entries()->update('tokens/' . $data['token'], ['calls' => $tokenData['calls'] + 1]);
 
         return [];
     }
diff --git a/src/flextype/core/Endpoints/Content.php b/src/flextype/core/Endpoints/Entries.php
similarity index 91%
rename from src/flextype/core/Endpoints/Content.php
rename to src/flextype/core/Endpoints/Entries.php
index 86462109..a0e06190 100644
--- a/src/flextype/core/Endpoints/Content.php
+++ b/src/flextype/core/Endpoints/Entries.php
@@ -42,7 +42,7 @@ class Content extends Api
         }
 
         // Get content data
-        $contentData = content()->fetch($requestQueryParams['id'], $requestQueryParams['options'] ?? [])->toArray();
+        $contentData = entries()->fetch($requestQueryParams['id'], $requestQueryParams['options'] ?? [])->toArray();
 
         if (count($contentData) > 0) {
             return $this->getApiResponse($response, $contentData, 200);
@@ -76,10 +76,10 @@ class Content extends Api
         }
 
         // Create new content
-        content()->create($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
+        entries()->create($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
 
         // Fetch content
-        $contentData = content()->fetch($requestParsedBody['id'])->toArray();
+        $contentData = entries()->fetch($requestParsedBody['id'])->toArray();
 
         // Return response
         if (count($contentData) > 0) {
@@ -114,10 +114,10 @@ class Content extends Api
         }
 
         // Update content
-        content()->update($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
+        entries()->update($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
 
         // Fetch content
-        $contentData = content()->fetch($requestParsedBody['id'])->toArray();
+        $contentData = entries()->fetch($requestParsedBody['id'])->toArray();
 
         // Return response
         if (count($contentData) > 0) {
@@ -152,10 +152,10 @@ class Content extends Api
         }
 
         // Move content
-        content()->move($requestParsedBody['id'], $requestParsedBody['new_id']);
+        entries()->move($requestParsedBody['id'], $requestParsedBody['new_id']);
 
         // Fetch content
-        $contentData = content()->fetch($requestParsedBody['new_id'])->toArray();
+        $contentData = entries()->fetch($requestParsedBody['new_id'])->toArray();
 
         // Return response
         if (count($contentData) > 0) {
@@ -190,10 +190,10 @@ class Content extends Api
         }
 
         // Copy content
-        content()->copy($requestParsedBody['id'], $requestParsedBody['new_id']);
+        entries()->copy($requestParsedBody['id'], $requestParsedBody['new_id']);
 
         // Fetch content
-        $contentData = content()->fetch($requestParsedBody['new_id'])->toArray();
+        $contentData = entries()->fetch($requestParsedBody['new_id'])->toArray();
 
         // Return response
         if (count($contentData) > 0) {
@@ -228,7 +228,7 @@ class Content extends Api
         }
 
         // Copy content
-        content()->delete($requestParsedBody['id']);
+        entries()->delete($requestParsedBody['id']);
 
         // Return success response
         return $this->getApiResponse($response, [], 204);
diff --git a/src/flextype/core/Endpoints/Media.php b/src/flextype/core/Endpoints/Media.php
deleted file mode 100644
index 01492205..00000000
--- a/src/flextype/core/Endpoints/Media.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype\Endpoints;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-use function count;
-use function media;
-
-class Media extends Api
-{
-    /**
-     * Fetch media.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function fetch(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Query Params
-        $requestQueryParams = $request->getQueryParams();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'media',
-                'params' => ['token', 'id'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Get media data
-        $contentData = media()->fetch($requestQueryParams['id'], $requestQueryParams['options'] ?? [])->toArray();
-
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404);
-    }
-
-    /**
-     * Create media.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function create(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'media',
-                'params' => ['token', 'id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Create new media
-        media()->create($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
-
-        // Fetch media
-        $contentData = media()->fetch($requestParsedBody['id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Update media.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function update(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'media',
-                'params' => ['token', 'id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Update media
-        media()->update($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
-
-        // Fetch media
-        $contentData = media()->fetch($requestParsedBody['id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Move media.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function move(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'media',
-                'params' => ['token', 'id', 'new_id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Move media
-        media()->move($requestParsedBody['id'], $requestParsedBody['new_id']);
-
-        // Fetch media
-        $contentData = media()->fetch($requestParsedBody['new_id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Copy media.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function copy(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'media',
-                'params' => ['token', 'id', 'new_id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Copy media
-        media()->copy($requestParsedBody['id'], $requestParsedBody['new_id']);
-
-        // Fetch media
-        $contentData = media()->fetch($requestParsedBody['new_id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Delete media.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function delete(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'media',
-                'params' => ['token', 'id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Copy media
-        media()->delete($requestParsedBody['id']);
-
-        // Return success response
-        return $this->getApiResponse($response, [], 204);
-    }
-}
diff --git a/src/flextype/core/Endpoints/Tokens.php b/src/flextype/core/Endpoints/Tokens.php
deleted file mode 100644
index 85aeb258..00000000
--- a/src/flextype/core/Endpoints/Tokens.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype\Endpoints;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-use function count;
-use function tokens;
-
-class Tokens extends Api
-{
-    /**
-     * Fetch token.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function fetch(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Query Params
-        $requestQueryParams = $request->getQueryParams();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'tokens',
-                'params' => ['token', 'id'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Get token data
-        $contentData = tokens()->fetch($requestQueryParams['id'], $requestQueryParams['options'] ?? [])->toArray();
-
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404);
-    }
-
-    /**
-     * Create token.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function create(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'tokens',
-                'params' => ['token', 'id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Create new token
-        tokens()->create($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
-
-        // Fetch token
-        $contentData = tokens()->fetch($requestParsedBody['id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Update token.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function update(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'tokens',
-                'params' => ['token', 'id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Update token
-        tokens()->update($requestParsedBody['id'], $requestParsedBody['data'] ?? []);
-
-        // Fetch token
-        $contentData = tokens()->fetch($requestParsedBody['id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Move token.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function move(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'tokens',
-                'params' => ['token', 'id', 'new_id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Move token
-        tokens()->move($requestParsedBody['id'], $requestParsedBody['new_id']);
-
-        // Fetch token
-        $contentData = tokens()->fetch($requestParsedBody['new_id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Copy token.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function copy(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'tokens',
-                'params' => ['token', 'id', 'new_id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Copy token
-        tokens()->copy($requestParsedBody['id'], $requestParsedBody['new_id']);
-
-        // Fetch token
-        $contentData = tokens()->fetch($requestParsedBody['new_id'])->toArray();
-
-        // Return response
-        if (count($contentData) > 0) {
-            return $this->getApiResponse($response, $contentData, 200);
-        }
-
-        return $this->getApiResponse($response, [], 404);
-    }
-
-    /**
-     * Delete token.
-     *
-     * @param ServerRequestInterface $request  PSR7 request.
-     * @param ResponseInterface      $response PSR7 response.
-     *
-     * @return ResponseInterface Response.
-     */
-    public function delete(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        // Get Request Parsed Body
-        $requestParsedBody = $request->getParsedBody();
-
-        // Validate Api Request
-        if (
-            count($result = $this->validateApiRequest([
-                'request' => $request,
-                'api' => 'tokens',
-                'params' => ['token', 'id', 'access_token'],
-            ])) > 0
-        ) {
-            return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
-        }
-
-        // Copy token
-        tokens()->delete($requestParsedBody['id']);
-
-        // Return success response
-        return $this->getApiResponse($response, [], 204);
-    }
-}
diff --git a/src/flextype/routes/endpoints/content.php b/src/flextype/routes/endpoints/content.php
deleted file mode 100644
index ddb9ad5b..00000000
--- a/src/flextype/routes/endpoints/content.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype;
-
-use Flextype\Endpoints\Content;
-
-use function app;
-
-/**
- * Fetch content
- *
- * endpoint: GET /api/content
- *
- * Query:
- * id      - [REQUIRED] - Unique identifier of the content.
- * token   - [REQUIRED] - Valid public token.
- * options - [OPTIONAL] - Select items in collection by given conditions.
- *
- * Returns:
- * An array of content objects.
- */
-app()->get('/api/content', [Content::class, 'fetch']);
-
-/**
- * Create content
- *
- * endpoint: POST /api/content
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the content.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- * data          - [REQUIRED] - Data to store for the content.
- *
- * Returns:
- * Returns the content object for the content that was just created.
- */
-app()->post('/api/content', [Content::class, 'create']);
-
-/**
- * Update content
- *
- * endpoint: PATCH /api/content
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the content.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- * data          - [REQUIRED] - Data to update for the content.
- *
- * Returns:
- * Returns the content object for the content that was just updated.
- */
-app()->patch('/api/content', [Content::class, 'update']);
-
-/**
- * Move content
- *
- * endpoint: PUT /api/content
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the content.
- * new_id        - [REQUIRED] - New Unique identifier of the content.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns the content object for the content that was just moved.
- */
-app()->put('/api/content', [Content::class, 'move']);
-
-/**
- * Copy content
- *
- * endpoint: PUT /api/content/copy
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the content.
- * new_id        - [REQUIRED] - New Unique identifier of the content.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns the content object for the content that was just copied.
- */
-app()->put('/api/content/copy', [Content::class, 'copy']);
-
-/**
- * Delete content
- *
- * endpoint: DELETE /api/content
- *
- * Body:
- * id           - [REQUIRED] - Unique identifier of the content.
- * token        - [REQUIRED] - Valid pulbic token.
- * access_token - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns an empty body with HTTP status 204
- */
-app()->delete('/api/content', [Content::class, 'delete']);
diff --git a/src/flextype/routes/endpoints/entries.php b/src/flextype/routes/endpoints/entries.php
new file mode 100644
index 00000000..cd0cfd19
--- /dev/null
+++ b/src/flextype/routes/endpoints/entries.php
@@ -0,0 +1,109 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Flextype (https://flextype.org)
+ * Founded by Sergey Romanenko and maintained by Flextype Community.
+ */
+
+namespace Flextype;
+
+use Flextype\Endpoints\Entries;
+
+use function app;
+
+/**
+ * Fetch entry
+ *
+ * endpoint: GET /api/entries
+ *
+ * Query:
+ * id      - [REQUIRED] - Unique identifier of the entry.
+ * token   - [REQUIRED] - Valid public token.
+ * options - [OPTIONAL] - Select items in collection by given conditions.
+ *
+ * Returns:
+ * An array of entry objects.
+ */
+app()->get('/api/entries', [Content::class, 'fetch']);
+
+/**
+ * Create entry
+ *
+ * endpoint: POST /api/entries
+ *
+ * Body:
+ * id            - [REQUIRED] - Unique identifier of the entry.
+ * token         -
+ *  [REQUIRED] - Valid public token.
+ * access_token  - [REQUIRED] - Valid access token.
+ * data          - [REQUIRED] - Data to store for the entry.
+ *
+ * Returns:
+ * Returns the entry object for the entry that was just created.
+ */
+app()->post('/api/entries', [Content::class, 'create']);
+
+/**
+ * Update entry
+ *
+ * endpoint: PATCH /api/entries
+ *
+ * Body:
+ * id            - [REQUIRED] - Unique identifier of the entry.
+ * token         - [REQUIRED] - Valid public token.
+ * access_token  - [REQUIRED] - Valid access token.
+ * data          - [REQUIRED] - Data to update for the entry.
+ *
+ * Returns:
+ * Returns the entry object for the entry that was just updated.
+ */
+app()->patch('/api/entries', [Content::class, 'update']);
+
+/**
+ * Move entry
+ *
+ * endpoint: PUT /api/entries
+ *
+ * Body:
+ * id            - [REQUIRED] - Unique identifier of the entry.
+ * new_id        - [REQUIRED] - New Unique identifier of the entry.
+ * token         - [REQUIRED] - Valid public token.
+ * access_token  - [REQUIRED] - Valid access token.
+ *
+ * Returns:
+ * Returns the entry object for the entry that was just moved.
+ */
+app()->put('/api/entries', [Content::class, 'move']);
+
+/**
+ * Copy entry
+ *
+ * endpoint: PUT /api/entries/copy
+ *
+ * Body:
+ * id            - [REQUIRED] - Unique identifier of the entry.
+ * new_id        - [REQUIRED] - New Unique identifier of the entry.
+ * token         - [REQUIRED] - Valid public token.
+ * access_token  - [REQUIRED] - Valid access token.
+ *
+ * Returns:
+ * Returns the entry object for the entry that was just copied.
+ */
+app()->put('/api/entries/copy', [Content::class, 'copy']);
+
+/**
+ * Delete entry
+ *
+ * endpoint: DELETE /api/entries
+ *
+ * Body:
+ * id           - [REQUIRED] - Unique identifier of the entry.
+ * token        - [REQUIRED] - Valid pulbic token.
+ * access_token - [REQUIRED] - Valid access token.
+ *
+ * Returns:
+ * Returns an empty body with HTTP status 204
+ */
+app()->delete('/api/entries', [Content::class, 'delete']);
diff --git a/src/flextype/routes/endpoints/media.php b/src/flextype/routes/endpoints/media.php
deleted file mode 100644
index 8c77f83e..00000000
--- a/src/flextype/routes/endpoints/media.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype;
-
-use Flextype\Endpoints\Media;
-
-use function app;
-
-/**
- * Fetch media
- *
- * endpoint: GET /api/media
- *
- * Query:
- * id      - [REQUIRED] - Unique identifier of the media.
- * token   - [REQUIRED] - Valid public token.
- * options - [OPTIONAL] - Select items in collection by given conditions.
- *
- * Returns:
- * An array of media objects.
- */
-app()->get('/api/media', [Media::class, 'fetch']);
-
-/**
- * Create media
- *
- * endpoint: POST /api/media
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the media.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- * data          - [REQUIRED] - Data to store for the media.
- *
- * Returns:
- * Returns the media object for the media that was just created.
- */
-app()->post('/api/media', [Media::class, 'create']);
-
-/**
- * Update media
- *
- * endpoint: PATCH /api/media
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the media.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- * data          - [REQUIRED] - Data to update for the media.
- *
- * Returns:
- * Returns the media object for the media that was just updated.
- */
-app()->patch('/api/media', [Media::class, 'update']);
-
-/**
- * Move media
- *
- * endpoint: PUT /api/media
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the media.
- * new_id        - [REQUIRED] - New Unique identifier of the media.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns the media object for the media that was just moved.
- */
-app()->put('/api/media', [Media::class, 'move']);
-
-/**
- * Copy media
- *
- * endpoint: PUT /api/media/copy
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the media.
- * new_id        - [REQUIRED] - New Unique identifier of the media.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns the media object for the media that was just copied.
- */
-app()->put('/api/media/copy', [Media::class, 'copy']);
-
-/**
- * Delete media
- *
- * endpoint: DELETE /api/media
- *
- * Body:
- * id           - [REQUIRED] - Unique identifier of the media.
- * token        - [REQUIRED] - Valid pulbic token.
- * access_token - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns an empty body with HTTP status 204
- */
-app()->delete('/api/media', [Media::class, 'delete']);
diff --git a/src/flextype/routes/endpoints/tokens.php b/src/flextype/routes/endpoints/tokens.php
deleted file mode 100644
index 8b0bae67..00000000
--- a/src/flextype/routes/endpoints/tokens.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (https://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype;
-
-use Flextype\Endpoints\Tokens;
-
-use function app;
-
-/**
- * Fetch token
- *
- * endpoint: GET /api/tokens
- *
- * Query:
- * id      - [REQUIRED] - Unique identifier of the token.
- * token   - [REQUIRED] - Valid public token.
- * options - [OPTIONAL] - Select items in collection by given conditions.
- *
- * Returns:
- * An array of token objects.
- */
-app()->get('/api/tokens', [Tokens::class, 'fetch']);
-
-/**
- * Create token
- *
- * endpoint: POST /api/tokens
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the token.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- * data          - [REQUIRED] - Data to store for the token.
- *
- * Returns:
- * Returns the token object for the token that was just created.
- */
-app()->post('/api/tokens', [Tokens::class, 'create']);
-
-/**
- * Update token
- *
- * endpoint: PATCH /api/tokens
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the token.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- * data          - [REQUIRED] - Data to update for the token.
- *
- * Returns:
- * Returns the token object for the token that was just updated.
- */
-app()->patch('/api/tokens', [Tokens::class, 'update']);
-
-/**
- * Move token
- *
- * endpoint: PUT /api/tokens
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the token.
- * new_id        - [REQUIRED] - New Unique identifier of the token.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns the token object for the token that was just moved.
- */
-app()->put('/api/tokens', [Tokens::class, 'move']);
-
-/**
- * Copy token
- *
- * endpoint: PUT /api/tokens/copy
- *
- * Body:
- * id            - [REQUIRED] - Unique identifier of the token.
- * new_id        - [REQUIRED] - New Unique identifier of the token.
- * token         - [REQUIRED] - Valid public token.
- * access_token  - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns the token object for the token that was just copied.
- */
-app()->put('/api/tokens/copy', [Tokens::class, 'copy']);
-
-/**
- * Delete token
- *
- * endpoint: DELETE /api/tokens
- *
- * Body:
- * id           - [REQUIRED] - Unique identifier of the token.
- * token        - [REQUIRED] - Valid pulbic token.
- * access_token - [REQUIRED] - Valid access token.
- *
- * Returns:
- * Returns an empty body with HTTP status 204
- */
-app()->delete('/api/tokens', [Tokens::class, 'delete']);