diff --git a/modules/core/quick/src/QuickFormBase.php b/modules/core/quick/src/Plugin/QuickForm/QuickFormBase.php
similarity index 98%
rename from modules/core/quick/src/QuickFormBase.php
rename to modules/core/quick/src/Plugin/QuickForm/QuickFormBase.php
index eddd983b..bc01e181 100644
--- a/modules/core/quick/src/QuickFormBase.php
+++ b/modules/core/quick/src/Plugin/QuickForm/QuickFormBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\farm_quick;
+namespace Drupal\farm_quick\Plugin\QuickForm;
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Form\FormStateInterface;
diff --git a/modules/core/quick/src/QuickFormInterface.php b/modules/core/quick/src/Plugin/QuickForm/QuickFormInterface.php
similarity index 98%
rename from modules/core/quick/src/QuickFormInterface.php
rename to modules/core/quick/src/Plugin/QuickForm/QuickFormInterface.php
index 69475ff9..bb28265e 100644
--- a/modules/core/quick/src/QuickFormInterface.php
+++ b/modules/core/quick/src/Plugin/QuickForm/QuickFormInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\farm_quick;
+namespace Drupal\farm_quick\Plugin\QuickForm;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
diff --git a/modules/core/quick/src/QuickFormManager.php b/modules/core/quick/src/QuickFormManager.php
index 6f38b3fc..bba6ee64 100644
--- a/modules/core/quick/src/QuickFormManager.php
+++ b/modules/core/quick/src/QuickFormManager.php
@@ -30,7 +30,7 @@ class QuickFormManager extends DefaultPluginManager {
       'Plugin/QuickForm',
       $namespaces,
       $module_handler,
-      'Drupal\farm_quick\QuickFormInterface',
+      'Drupal\farm_quick\Plugin\QuickForm\QuickFormInterface',
       'Drupal\farm_quick\Annotation\QuickForm'
     );
     $this->alterInfo('quick_form_info');
diff --git a/modules/core/quick/tests/modules/farm_quick_test/src/Plugin/QuickForm/Test.php b/modules/core/quick/tests/modules/farm_quick_test/src/Plugin/QuickForm/Test.php
index f071cf3f..435d742e 100644
--- a/modules/core/quick/tests/modules/farm_quick_test/src/Plugin/QuickForm/Test.php
+++ b/modules/core/quick/tests/modules/farm_quick_test/src/Plugin/QuickForm/Test.php
@@ -3,7 +3,7 @@
 namespace Drupal\farm_quick_test\Plugin\QuickForm;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\farm_quick\QuickFormBase;
+use Drupal\farm_quick\Plugin\QuickForm\QuickFormBase;
 use Drupal\farm_quick\Traits\QuickAssetTrait;
 use Drupal\farm_quick\Traits\QuickLogTrait;
 use Drupal\farm_quick\Traits\QuickQuantityTrait;
diff --git a/modules/core/quick/tests/src/Kernel/QuickFormTest.php b/modules/core/quick/tests/src/Kernel/QuickFormTest.php
index f61ef2cc..0d31cd29 100644
--- a/modules/core/quick/tests/src/Kernel/QuickFormTest.php
+++ b/modules/core/quick/tests/src/Kernel/QuickFormTest.php
@@ -66,7 +66,7 @@ class QuickFormTest extends KernelTestBase {
     $this->assertEquals(1, count($quick_forms));
 
     // Initialize the test quick form.
-    /** @var \Drupal\farm_quick\QuickFormInterface $test_quick_form */
+    /** @var \Drupal\farm_quick\Plugin\QuickForm\QuickFormInterface $test_quick_form */
     $test_quick_form = $this->quickFormManager->createInstance('test');
 
     // Confirm the label, description, helpText, and permissions.