diff --git a/diff.routing.yml b/diff.routing.yml
index a493bbf..b79153e 100644
--- a/diff.routing.yml
+++ b/diff.routing.yml
@@ -3,7 +3,7 @@ diff.revisions_diff:
   defaults:
     _controller: '\Drupal\diff\Controller\NodeRevisionController::compareNodeRevisions'
     _title: Diff General Settings
-    filter: 'classic_layout'
+    filter: 'classic'
   requirements:
     _access_node_revision: 'view'
   options:
diff --git a/src/DiffLayoutManager.php b/src/DiffLayoutManager.php
index bb58dc5..d58a1a5 100644
--- a/src/DiffLayoutManager.php
+++ b/src/DiffLayoutManager.php
@@ -48,7 +48,7 @@ class DiffLayoutManager 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/Layout', $namespaces, $module_handler, '\Drupal\diff\DiffLayoutInterface', 'Drupal\diff\Annotation\DiffLayoutBuilder');
+    parent::__construct('Plugin/diff/Layout', $namespaces, $module_handler, '\Drupal\diff\DiffLayoutInterface', 'Drupal\diff\Annotation\DiffLayoutBuilder');
 
     $this->setCacheBackend($cache_backend, 'diff_layout_builder_plugins');
     $this->alterInfo('field_diff_builder_info');
diff --git a/src/Plugin/Layout/ClassicDiffLayout.php b/src/Plugin/diff/Layout/ClassicDiffLayout.php
similarity index 96%
rename from src/Plugin/Layout/ClassicDiffLayout.php
rename to src/Plugin/diff/Layout/ClassicDiffLayout.php
index efc741d..d7f8a0a 100644
--- a/src/Plugin/Layout/ClassicDiffLayout.php
+++ b/src/Plugin/diff/Layout/ClassicDiffLayout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Layout;
+namespace Drupal\diff\Plugin\diff\Layout;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @DiffLayoutBuilder(
- *   id = "classic_layout",
+ *   id = "classic",
  *   label = @Translation("Standard"),
  * )
  */
diff --git a/src/Plugin/Layout/MarkdownDiffLayout.php b/src/Plugin/diff/Layout/MarkdownDiffLayout.php
similarity index 99%
rename from src/Plugin/Layout/MarkdownDiffLayout.php
rename to src/Plugin/diff/Layout/MarkdownDiffLayout.php
index 2b2c3c5..3dc8851 100644
--- a/src/Plugin/Layout/MarkdownDiffLayout.php
+++ b/src/Plugin/diff/Layout/MarkdownDiffLayout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\diff\Plugin\Layout;
+namespace Drupal\diff\Plugin\diff\Layout;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @DiffLayoutBuilder(
- *   id = "markdown_layout",
+ *   id = "markdown",
  *   label = @Translation("Markdown"),
  * )
  */
diff --git a/src/Routing/DiffRouteProvider.php b/src/Routing/DiffRouteProvider.php
index 0c0cd2e..ea77f59 100644
--- a/src/Routing/DiffRouteProvider.php
+++ b/src/Routing/DiffRouteProvider.php
@@ -37,7 +37,7 @@ class DiffRouteProvider implements EntityRouteProviderInterface {
       $route = new Route($entity_type->getLinkTemplate('revisions-diff'));
       $route->addDefaults([
         '_controller' => '\Drupal\diff\Controller\PluginRevisionController::compareEntityRevisions',
-        'filter' => 'classic_layout',
+        'filter' => 'classic',
       ]);
       $route->addRequirements([
         '_entity_access' => $entity_type->id() . '.view',