diff --git a/diff.api.php b/diff.api.php
index e0f6e0d..ab3337f 100644
--- a/diff.api.php
+++ b/diff.api.php
@@ -17,7 +17,7 @@
  * \Drupal\diff\FieldDiffBuilderInterface. Field diff builders plugins are
  * managed by the \Drupal\diff\DiffBuilderManager class. Field diff builders
  * classes usually extend base class \Drupal\diff\FieldDiffBuilderBase and need
- * to be in the namespace \Drupal\{your_module}\Plugin\Diff\. See the
+ * to be in the namespace \Drupal\{your_module}\Plugin\diff\Field\. See the
  * @link plugin_api Plugin API topic @endlink for more information on how to
  * define plugins.
  *
diff --git a/src/DiffBuilderManager.php b/src/DiffBuilderManager.php
index e5e5702..7ed2cff 100644
--- a/src/DiffBuilderManager.php
+++ b/src/DiffBuilderManager.php
@@ -58,7 +58,7 @@ class DiffBuilderManager extends DefaultPluginManager {
    *   The configuration factory.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $configFactory) {
-    parent::__construct('Plugin/Diff', $namespaces, $module_handler, '\Drupal\diff\FieldDiffBuilderInterface', 'Drupal\diff\Annotation\FieldDiffBuilder');
+    parent::__construct('Plugin/diff/Field', $namespaces, $module_handler, '\Drupal\diff\FieldDiffBuilderInterface', 'Drupal\diff\Annotation\FieldDiffBuilder');
 
     $this->setCacheBackend($cache_backend, 'field_diff_builder_plugins');
     $this->alterInfo('field_diff_builder_info');
diff --git a/src/FieldDiffBuilderInterface.php b/src/FieldDiffBuilderInterface.php
index ac76b5a..2f8b0a1 100644
--- a/src/FieldDiffBuilderInterface.php
+++ b/src/FieldDiffBuilderInterface.php
@@ -25,7 +25,7 @@ interface FieldDiffBuilderInterface extends PluginFormInterface, ConfigurablePlu
    * )
    * @endcode
    *
-   * @see \Drupal\diff\Plugin\Diff\TextFieldBuilder
+   * @see \Drupal\diff\Plugin\diff\Field\TextFieldBuilder
    *
    * @param FieldItemListInterface $field_items
    *   Represents an entity field.
diff --git a/src/Plugin/Diff/CommentFieldBuilder.php b/src/Plugin/diff/Field/CommentFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/CommentFieldBuilder.php
rename to src/Plugin/diff/Field/CommentFieldBuilder.php
index 7982a4d..c15afab 100644
--- a/src/Plugin/Diff/CommentFieldBuilder.php
+++ b/src/Plugin/diff/Field/CommentFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/CoreFieldBuilder.php b/src/Plugin/diff/Field/CoreFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/CoreFieldBuilder.php
rename to src/Plugin/diff/Field/CoreFieldBuilder.php
index b156fed..a62743a 100644
--- a/src/Plugin/Diff/CoreFieldBuilder.php
+++ b/src/Plugin/diff/Field/CoreFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
diff --git a/src/Plugin/Diff/EntityReferenceFieldBuilder.php b/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/EntityReferenceFieldBuilder.php
rename to src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
index bea66fd..afda04f 100644
--- a/src/Plugin/Diff/EntityReferenceFieldBuilder.php
+++ b/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/FileFieldBuilder.php b/src/Plugin/diff/Field/FileFieldBuilder.php
similarity index 99%
rename from src/Plugin/Diff/FileFieldBuilder.php
rename to src/Plugin/diff/Field/FileFieldBuilder.php
index 304ae4c..3088b97 100644
--- a/src/Plugin/Diff/FileFieldBuilder.php
+++ b/src/Plugin/diff/Field/FileFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/ImageFieldBuilder.php b/src/Plugin/diff/Field/ImageFieldBuilder.php
similarity index 99%
rename from src/Plugin/Diff/ImageFieldBuilder.php
rename to src/Plugin/diff/Field/ImageFieldBuilder.php
index e98fe88..387bbc7 100644
--- a/src/Plugin/Diff/ImageFieldBuilder.php
+++ b/src/Plugin/diff/Field/ImageFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/LinkFieldBuilder.php b/src/Plugin/diff/Field/LinkFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/LinkFieldBuilder.php
rename to src/Plugin/diff/Field/LinkFieldBuilder.php
index 9e72b16..5f32c68 100644
--- a/src/Plugin/Diff/LinkFieldBuilder.php
+++ b/src/Plugin/diff/Field/LinkFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/ListFieldBuilder.php b/src/Plugin/diff/Field/ListFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/ListFieldBuilder.php
rename to src/Plugin/diff/Field/ListFieldBuilder.php
index 9425c80..215448d 100644
--- a/src/Plugin/Diff/ListFieldBuilder.php
+++ b/src/Plugin/diff/Field/ListFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/TextFieldBuilder.php b/src/Plugin/diff/Field/TextFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/TextFieldBuilder.php
rename to src/Plugin/diff/Field/TextFieldBuilder.php
index 4055acd..9363913 100644
--- a/src/Plugin/Diff/TextFieldBuilder.php
+++ b/src/Plugin/diff/Field/TextFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/src/Plugin/Diff/TextWithSummaryFieldBuilder.php b/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
similarity index 98%
rename from src/Plugin/Diff/TextWithSummaryFieldBuilder.php
rename to src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
index 2a88de1..f1c6c16 100644
--- a/src/Plugin/Diff/TextWithSummaryFieldBuilder.php
+++ b/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Diff;
+namespace Drupal\diff\Plugin\diff\Field;
 
 use Drupal\diff\FieldDiffBuilderBase;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/tests/modules/diff_test/src/Plugin/Diff/TestHeavierTextPlugin.php b/tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php
similarity index 96%
rename from tests/modules/diff_test/src/Plugin/Diff/TestHeavierTextPlugin.php
rename to tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php
index 5568032..b45eba9 100644
--- a/tests/modules/diff_test/src/Plugin/Diff/TestHeavierTextPlugin.php
+++ b/tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff_test\Plugin\Diff;
+namespace Drupal\diff_test\Plugin\diff\Field;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\diff\FieldDiffBuilderBase;
diff --git a/tests/modules/diff_test/src/Plugin/Diff/TestLighterTextPlugin.php b/tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php
similarity index 95%
rename from tests/modules/diff_test/src/Plugin/Diff/TestLighterTextPlugin.php
rename to tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php
index a670b1f..7f311e4 100644
--- a/tests/modules/diff_test/src/Plugin/Diff/TestLighterTextPlugin.php
+++ b/tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff_test\Plugin\Diff;
+namespace Drupal\diff_test\Plugin\diff\Field;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\diff\FieldDiffBuilderBase;