diff --git a/core/modules/image/js/plugins/drupalimagestyle/plugin.js b/core/modules/ckeditor/js/plugins/drupalimagestyle/plugin.js
similarity index 100%
rename from core/modules/image/js/plugins/drupalimagestyle/plugin.js
rename to core/modules/ckeditor/js/plugins/drupalimagestyle/plugin.js
diff --git a/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
similarity index 93%
rename from core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
rename to core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
index 9a8c390..9ce2fd4 100644
--- a/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
@@ -1,11 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\image\Plugin\CKEditorPlugin\DrupalImageStyle.
- */
-
-namespace Drupal\image\Plugin\CKEditorPlugin;
+namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
 
 use Drupal\Component\Plugin\PluginBase;
 use Drupal\editor\Entity\Editor;
diff --git a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php b/core/modules/filter/src/Plugin/Filter/FilterImageStyle.php
similarity index 94%
rename from core/modules/image/src/Plugin/Filter/FilterImageStyle.php
rename to core/modules/filter/src/Plugin/Filter/FilterImageStyle.php
index 8475fcb..532e990 100644
--- a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterImageStyle.php
@@ -1,16 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\image\Plugin\Filter\FilterImageStyle.
- */
-
-namespace Drupal\image\Plugin\Filter;
+namespace Drupal\filter\Plugin\Filter;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\String;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Annotation\Translation;
 use Drupal\filter\Annotation\Filter;
 use Drupal\filter\FilterProcessResult;