diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
new file mode 100644
index 00000000000..ec387013ecf
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver;
+
+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Block as BlockDataProvider;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * CMS blocks field resolver, used for GraphQL request processing
+ */
+class Blocks implements ResolverInterface
+{
+    /**
+     * @var BlockDataProvider
+     */
+    private $blockDataProvider;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @param BlockDataProvider $blockDataProvider
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        BlockDataProvider $blockDataProvider,
+        ValueFactory $valueFactory
+    ) {
+        $this->blockDataProvider = $blockDataProvider;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) : Value {
+
+        $result = function () use ($args) {
+            $blockIdentifiers = $this->getBlockIdentifiers($args);
+            $blocksData = $this->getBlocksData($blockIdentifiers);
+
+            $resultData = [
+                'items' => $blocksData,
+            ];
+            return $resultData;
+        };
+        return $this->valueFactory->create($result);
+    }
+
+    /**
+     * @param array $args
+     * @return string[]
+     * @throws GraphQlInputException
+     */
+    private function getBlockIdentifiers(array $args): array
+    {
+        if (!isset($args['identifiers']) || !is_array($args['identifiers']) || count($args['identifiers']) === 0) {
+            throw new GraphQlInputException(__('"identifiers" of CMS blocks should be specified'));
+        }
+
+        return $args['identifiers'];
+    }
+
+    /**
+     * @param array $blockIdentifiers
+     * @return array
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getBlocksData(array $blockIdentifiers): array
+    {
+        $blocksData = [];
+        try {
+            foreach ($blockIdentifiers as $blockIdentifier) {
+                $blocksData[$blockIdentifier] = $this->blockDataProvider->getData($blockIdentifier);
+            }
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        }
+        return $blocksData;
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/Cms/CmsBlockDataProvider.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Cms/CmsBlockDataProvider.php
deleted file mode 100644
index f3a6bda382d..00000000000
--- a/app/code/Magento/CmsGraphQl/Model/Resolver/Cms/CmsBlockDataProvider.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CmsGraphQl\Model\Resolver\Cms;
-
-use Magento\Cms\Api\BlockRepositoryInterface as CmsBlockRepositoryInterface;
-use Magento\Cms\Api\Data\BlockInterface as CmsBlockInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-
-/**
- * Cms block field data provider, used for GraphQL request processing.
- */
-class CmsBlockDataProvider
-{
-    /**
-     * @var CmsBlockRepositoryInterface
-     */
-    private $cmsBlockRepository;
-
-    /**
-     * @param CmsBlockRepositoryInterface $cmsBlockRepository
-     */
-    public function __construct(
-        CmsBlockRepositoryInterface $cmsBlockRepository
-    ) {
-        $this->cmsBlockRepository = $cmsBlockRepository;
-    }
-
-    /**
-     * Get CMS block data by identifier
-     *
-     * @param string $cmsBlockIdentifier
-     * @return array|GraphQlInputException
-     * @throws NoSuchEntityException
-     * @throws LocalizedException
-     */
-    public function getCmsBlockById(string $cmsBlockIdentifier)
-    {
-        $cmsBlockModel = $this->cmsBlockRepository->getById($cmsBlockIdentifier);
-
-        if (!$cmsBlockModel->isActive()) {
-            throw new NoSuchEntityException();
-        }
-
-        return $this->processCmsBlock($cmsBlockModel);
-    }
-
-    /**
-     * Transform single CMS block data from object to in array format
-     *
-     * @param CmsBlockInterface $cmsBlockModel
-     * @return array
-     */
-    private function processCmsBlock(CmsBlockInterface $cmsBlockModel) : array
-    {
-        $cmsBlockData = [
-            'identifier' => $cmsBlockModel->getIdentifier(),
-            'title' => $cmsBlockModel->getTitle(),
-            'content' => $cmsBlockModel->getContent(),
-        ];
-
-        return $cmsBlockData;
-    }
-}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/CmsBlocks.php b/app/code/Magento/CmsGraphQl/Model/Resolver/CmsBlocks.php
deleted file mode 100644
index d90f455e5a6..00000000000
--- a/app/code/Magento/CmsGraphQl/Model/Resolver/CmsBlocks.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CmsGraphQl\Model\Resolver;
-
-use Magento\CmsGraphQl\Model\Resolver\Cms\CmsBlockDataProvider;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
-use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-
-/**
- * CMS blocks field resolver, used for GraphQL request processing.
- */
-class CmsBlocks implements ResolverInterface
-{
-    /**
-     * @var CmsBlockDataProvider
-     */
-    private $cmsBlockDataProvider;
-
-    /**
-     * @var ValueFactory
-     */
-    private $valueFactory;
-
-    /**
-     * @param CmsBlockDataProvider $cmsBlockDataProvider
-     * @param ValueFactory $valueFactory
-     */
-    public function __construct(
-        CmsBlockDataProvider $cmsBlockDataProvider,
-        ValueFactory $valueFactory
-    ) {
-        $this->valueFactory = $valueFactory;
-        $this->cmsBlockDataProvider = $cmsBlockDataProvider;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function resolve(
-        Field $field,
-        $context,
-        ResolveInfo $info,
-        array $value = null,
-        array $args = null
-    ) : Value {
-
-        $cmsBlockListData = [];
-        $cmsBlockIdentifiers = $this->getCmsBlockIdentifiers($args);
-
-        foreach ($cmsBlockIdentifiers as $cmsBlockIdentifier) {
-            try {
-                $cmsBlockListData[$cmsBlockIdentifier] = $this->cmsBlockDataProvider->getCmsBlockById(
-                    $cmsBlockIdentifier
-                );
-            } catch (NoSuchEntityException $ex) {
-                $cmsBlockListData[$cmsBlockIdentifier] = new GraphQlNoSuchEntityException(
-                    __(
-                        'CMS block with "%1" ID does not found',
-                        $cmsBlockIdentifier
-                    )
-                );
-            }
-        }
-
-        $cmsBlocksData = [
-            'items' => $cmsBlockListData
-        ];
-
-        $result = function () use ($cmsBlocksData) {
-            return !empty($cmsBlocksData) ? $cmsBlocksData : [];
-        };
-
-        return $this->valueFactory->create($result);
-    }
-
-    /**
-     * Retrieve CMS block identifiers to retrieve
-     *
-     * @param array $args
-     * @return string[]
-     * @throws GraphQlInputException
-     */
-    private function getCmsBlockIdentifiers($args)
-    {
-        if (!isset($args['identifiers']) && is_array($args['identifiers']) && count($args['identifiers']) > 0) {
-            throw new GraphQlInputException(__('"identifiers" of CMS blocks should be specified'));
-        }
-
-        return (array) $args['identifiers'];
-    }
-}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
new file mode 100644
index 00000000000..6b848d633f2
--- /dev/null
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\DataProvider;
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Cms block data provider
+ */
+class Block
+{
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
+    /**
+     * @param BlockRepositoryInterface $blockRepository
+     */
+    public function __construct(
+        BlockRepositoryInterface $blockRepository
+    ) {
+        $this->blockRepository = $blockRepository;
+    }
+
+    /**
+     * @param string $blockIdentifier
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    public function getData(string $blockIdentifier): array
+    {
+        $block = $this->blockRepository->getById($blockIdentifier);
+
+        if (false === $block->isActive()) {
+            throw new NoSuchEntityException();
+        }
+
+        $blockData = [
+            BlockInterface::IDENTIFIER => $block->getIdentifier(),
+            BlockInterface::TITLE => $block->getTitle(),
+            BlockInterface::CONTENT => $block->getContent(),
+        ];
+        return $blockData;
+    }
+}
diff --git a/app/code/Magento/CmsGraphQl/Model/PageDataProvider.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
similarity index 90%
rename from app/code/Magento/CmsGraphQl/Model/PageDataProvider.php
rename to app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
index 9c5b55b741e..c9b16873345 100644
--- a/app/code/Magento/CmsGraphQl/Model/PageDataProvider.php
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php
@@ -5,16 +5,16 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CmsGraphQl\Model;
+namespace Magento\CmsGraphQl\Model\Resolver\DataProvider;
 
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Get CMS page data by Id
+ * Cms page data provider
  */
-class PageDataProvider
+class Page
 {
     /**
      * @var PageRepositoryInterface
@@ -35,7 +35,7 @@ public function __construct(
      * @return array
      * @throws NoSuchEntityException
      */
-    public function getData(int $pageId) : array
+    public function getData(int $pageId): array
     {
         $page = $this->pageRepository->getById($pageId);
 
diff --git a/app/code/Magento/CmsGraphQl/Model/PageResolver.php b/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
similarity index 93%
rename from app/code/Magento/CmsGraphQl/Model/PageResolver.php
rename to app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
index 707bf516ba3..4c96ae26f6b 100644
--- a/app/code/Magento/CmsGraphQl/Model/PageResolver.php
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/Page.php
@@ -5,8 +5,9 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CmsGraphQl\Model;
+namespace Magento\CmsGraphQl\Model\Resolver;
 
+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Page as PageDataProvider;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -19,7 +20,7 @@
 /**
  * CMS page field resolver, used for GraphQL request processing
  */
-class PageResolver implements ResolverInterface
+class Page implements ResolverInterface
 {
     /**
      * @var PageDataProvider
diff --git a/app/code/Magento/CmsGraphQl/etc/schema.graphqls b/app/code/Magento/CmsGraphQl/etc/schema.graphqls
index f32e0b2f4b8..997bbf920a0 100644
--- a/app/code/Magento/CmsGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CmsGraphQl/etc/schema.graphqls
@@ -4,10 +4,10 @@
 type Query {
     cmsPage (
         id: Int @doc(description: "Id of the CMS page")
-    ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\PageResolver") @doc(description: "The CMS page query returns information about a CMS page")
+    ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page")
     cmsBlocks (
-            identifiers: [String] @doc(description: "Identifiers of the CMS blocks")
-        ): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\CmsBlocks") @doc(description: "The CMS block query returns information about CMS blocks")
+        identifiers: [String] @doc(description: "Identifiers of the CMS blocks")
+    ): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "The CMS block query returns information about CMS blocks")
 }
 
 type CmsPage @doc(description: "CMS page defines all CMS page information") {