diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Block/ResponsivePreviewControlBlock.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Block/ResponsivePreviewControlBlock.php
new file mode 100644
index 0000000..748a8bf
--- /dev/null
+++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Block/ResponsivePreviewControlBlock.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\responsive_preview\Plugin\Block\ResponsivePreviewControlBlock.
+ */
+
+namespace Drupal\responsive_preview\Plugin\Block;
+
+use Drupal\block\BlockBase;
+use Drupal\Component\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+
+/**
+ * Provides a 'Responsive preview controls' block.
+ *
+ * @Plugin(
+ *   id = "responsive-preview-controls",
+ *   admin_label = @Translation("Responsive preview controls"),
+ *   module = "responsive_preview"
+ * )
+ */
+class ResponsivePreviewControlBlock extends BlockBase {
+
+  /**
+   * Implements \Drupal\block\BlockBase::blockBuild().
+   */
+  public function blockBuild() {
+    $block = array(
+      'device_options' => array(
+        '#theme' => 'item_list',
+        '#items' => responsive_preview_get_devices_list(),
+        '#attributes' => array(
+          'class' => array('options'),
+        ),
+        '#attached' => array(
+          'library' => array(
+            array('responsive_preview', 'responsive-preview'),
+          ),
+        ),
+      ),
+    );
+
+    return $block;
+  }
+}
diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/block/block/ResponsivePreviewControlBlock.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/block/block/ResponsivePreviewControlBlock.php
deleted file mode 100644
index a884df4..0000000
--- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/block/block/ResponsivePreviewControlBlock.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\responsive_preview\Plugin\block\block\ResponsivePreviewControlBlock.
- */
-
-namespace Drupal\responsive_preview\Plugin\block\block;
-
-use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * Provides a 'Responsive preview controls' block.
- *
- * @Plugin(
- *   id = "responsive-preview-controls",
- *   admin_label = @Translation("Responsive preview controls"),
- *   module = "responsive_preview"
- * )
- */
-class ResponsivePreviewControlBlock extends BlockBase {
-
-  /**
-   * Implements \Drupal\block\BlockBase::build().
-   */
-  public function build() {
-    $block = array(
-      'device_options' => array(
-        '#theme' => 'item_list',
-        '#items' => responsive_preview_get_devices_list(),
-        '#attributes' => array(
-          'class' => array('options'),
-        ),
-        '#attached' => array(
-          'library' => array(
-            array('responsive_preview', 'responsive-preview'),
-          ),
-        ),
-      ),
-    );
-
-    return $block;
-  }
-
-}