diff --git a/currency.routing.yml b/currency.routing.yml
index 5b27022..ab91130 100644
--- a/currency.routing.yml
+++ b/currency.routing.yml
@@ -2,7 +2,7 @@
 currency.exchange_rate_provider.config:
   path: '/admin/config/regional/currency-exchange'
   defaults:
-    _form: '\Drupal\currency\Controller\PluginBasedExchangeRateProviderForm'
+    _form: '\Drupal\currency\Form\PluginBasedExchangeRateProviderForm'
     _title: Currency exchange
   requirements:
     _permission: 'currency.exchange_rate_provider.administer'
@@ -18,7 +18,7 @@ currency.exchange_rate_provider.fixed_rates.overview:
 currency.exchange_rate_provider.fixed_rates.add:
   path: '/admin/config/regional/currency-exchange/fixed/add'
   defaults:
-    _form: '\Drupal\currency\Controller\FixedRatesForm'
+    _form: '\Drupal\currency\Form\FixedRatesForm'
     _title: 'Add an exchange rate'
   requirements:
     _permission: 'currency.exchange_rate_provider.fixed_rates.administer'
@@ -26,7 +26,7 @@ currency.exchange_rate_provider.fixed_rates.add:
 currency.exchange_rate_provider.fixed_rates.edit:
   path: '/admin/config/regional/currency-exchange/fixed/{currency_code_from}/{currency_code_to}'
   defaults:
-    _form: '\Drupal\currency\Controller\FixedRatesForm'
+    _form: '\Drupal\currency\Form\FixedRatesForm'
     _title: 'Edit an exchange rate'
   requirements:
     _permission: 'currency.exchange_rate_provider.fixed_rates.administer'
@@ -52,7 +52,7 @@ currency.currency.add:
 currency.currency.import:
   path: '/admin/config/regional/currency/import'
   defaults:
-    _form: '\Drupal\currency\Controller\CurrencyImportForm'
+    _form: '\Drupal\currency\Form\CurrencyImportForm'
     _title: Import a currency
   requirements:
     _entity_create_access: 'currency'
@@ -106,7 +106,7 @@ currency.currency_locale.add:
 currency.currency_locale.import:
   path: '/admin/config/regional/currency-formatting/locale/import'
   defaults:
-    _form: '\Drupal\currency\Controller\CurrencyLocaleImportForm'
+    _form: '\Drupal\currency\Form\CurrencyLocaleImportForm'
     _title: Import a currency locale
   requirements:
     _entity_create_access: 'currency_locale'
@@ -130,7 +130,7 @@ entity.currency_locale.delete_form:
 currency.amount_formatting:
   path: '/admin/config/regional/currency-formatting'
   defaults:
-    _form: '\Drupal\currency\Controller\AmountFormattingForm'
+    _form: '\Drupal\currency\Form\AmountFormattingForm'
     _title: Currency amount formatting
   requirements:
     _permission: 'currency.amount_formatting.administer'
diff --git a/src/Controller/AmountFormattingForm.php b/src/Form/AmountFormattingForm.php
similarity index 97%
rename from src/Controller/AmountFormattingForm.php
rename to src/Form/AmountFormattingForm.php
index d338c6b..64d90c2 100644
--- a/src/Controller/AmountFormattingForm.php
+++ b/src/Form/AmountFormattingForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\currency\Controller\AmountFormattingForm.
+ * Contains \Drupal\currency\Form\AmountFormattingForm.
  */
 
-namespace Drupal\currency\Controller;
+namespace Drupal\currency\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\ConfigFormBase;
diff --git a/src/Controller/CurrencyImportForm.php b/src/Form/CurrencyImportForm.php
similarity index 97%
rename from src/Controller/CurrencyImportForm.php
rename to src/Form/CurrencyImportForm.php
index d67592a..165c32d 100644
--- a/src/Controller/CurrencyImportForm.php
+++ b/src/Form/CurrencyImportForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\currency\Controller\CurrencyImportForm.
+ * Contains \Drupal\currency\Form\CurrencyImportForm.
  */
 
-namespace Drupal\currency\Controller;
+namespace Drupal\currency\Form;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\FormBase;
diff --git a/src/Controller/CurrencyLocaleImportForm.php b/src/Form/CurrencyLocaleImportForm.php
similarity index 97%
rename from src/Controller/CurrencyLocaleImportForm.php
rename to src/Form/CurrencyLocaleImportForm.php
index c846ae3..d0e1817 100644
--- a/src/Controller/CurrencyLocaleImportForm.php
+++ b/src/Form/CurrencyLocaleImportForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\currency\Controller\CurrencyLocaleImportForm.
+ * Contains \Drupal\currency\Form\CurrencyLocaleImportForm.
  */
 
-namespace Drupal\currency\Controller;
+namespace Drupal\currency\Form;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\FormBase;
diff --git a/src/Controller/FixedRatesForm.php b/src/Form/FixedRatesForm.php
similarity index 98%
rename from src/Controller/FixedRatesForm.php
rename to src/Form/FixedRatesForm.php
index a714cbe..0ba1bd1 100644
--- a/src/Controller/FixedRatesForm.php
+++ b/src/Form/FixedRatesForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\currency\Controller\FixedRatesForm.
+ * Contains \Drupal\currency\Form\FixedRatesForm.
  */
 
-namespace Drupal\currency\Controller;
+namespace Drupal\currency\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
diff --git a/src/Controller/PluginBasedExchangeRateProviderForm.php b/src/Form/PluginBasedExchangeRateProviderForm.php
similarity index 97%
rename from src/Controller/PluginBasedExchangeRateProviderForm.php
rename to src/Form/PluginBasedExchangeRateProviderForm.php
index 8d11e8c..6f07507 100644
--- a/src/Controller/PluginBasedExchangeRateProviderForm.php
+++ b/src/Form/PluginBasedExchangeRateProviderForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\currency\Controller\PluginBasedExchangeRateProviderForm.
+ * Contains \Drupal\currency\Form\PluginBasedExchangeRateProviderForm.
  */
 
-namespace Drupal\currency\Controller;
+namespace Drupal\currency\Form;
 
 use Drupal\Component\Utility\SortArray;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
diff --git a/tests/src/Unit/Controller/AmountFormattingFormTest.php b/tests/src/Unit/Controller/AmountFormattingFormTest.php
index 3996631..6df9cc7 100644
--- a/tests/src/Unit/Controller/AmountFormattingFormTest.php
+++ b/tests/src/Unit/Controller/AmountFormattingFormTest.php
@@ -12,13 +12,13 @@ namespace Drupal\Tests\currency\Unit\Controller {
   use Drupal\Core\Form\FormState;
   use Drupal\Core\Form\FormStateInterface;
   use Drupal\Core\Render\Element\Radios;
-  use Drupal\currency\Controller\AmountFormattingForm;
+  use Drupal\currency\Form\AmountFormattingForm;
   use Drupal\currency\Plugin\Currency\AmountFormatter\AmountFormatterManagerInterface;
   use Drupal\Tests\UnitTestCase;
   use Symfony\Component\DependencyInjection\ContainerInterface;
 
   /**
-   * @coversDefaultClass \Drupal\currency\Controller\AmountFormattingForm
+   * @coversDefaultClass \Drupal\currency\Form\AmountFormattingForm
    *
    * @group Currency
    */
@@ -34,7 +34,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
     /**
      * The controller under test.
      *
-     * @var \Drupal\currency\Controller\AmountFormattingForm
+     * @var \Drupal\currency\Form\AmountFormattingForm
      */
     protected $controller;
 
diff --git a/tests/src/Unit/Controller/CurrencyImportFormTest.php b/tests/src/Unit/Controller/CurrencyImportFormTest.php
index 8083e38..d1663a0 100644
--- a/tests/src/Unit/Controller/CurrencyImportFormTest.php
+++ b/tests/src/Unit/Controller/CurrencyImportFormTest.php
@@ -10,14 +10,14 @@ namespace Drupal\Tests\currency\Unit\Controller {
   use Drupal\Core\Form\FormStateInterface;
   use Drupal\Core\Url;
   use Drupal\currency\ConfigImporterInterface;
-  use Drupal\currency\Controller\CurrencyImportForm;
+  use Drupal\currency\Form\CurrencyImportForm;
   use Drupal\currency\Entity\CurrencyInterface;
   use Drupal\currency\FormHelperInterface;
   use Drupal\Tests\UnitTestCase;
   use Symfony\Component\DependencyInjection\ContainerInterface;
 
   /**
-   * @coversDefaultClass \Drupal\currency\Controller\CurrencyImportForm
+   * @coversDefaultClass \Drupal\currency\Form\CurrencyImportForm
    *
    * @group Currency
    */
@@ -47,7 +47,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
     /**
      * The class under test.
      *
-     * @var \Drupal\currency\Controller\CurrencyImportForm
+     * @var \Drupal\currency\Form\CurrencyImportForm
      */
     protected $sut;
 
diff --git a/tests/src/Unit/Controller/CurrencyLocaleImportFormTest.php b/tests/src/Unit/Controller/CurrencyLocaleImportFormTest.php
index 2a26252..779970d 100644
--- a/tests/src/Unit/Controller/CurrencyLocaleImportFormTest.php
+++ b/tests/src/Unit/Controller/CurrencyLocaleImportFormTest.php
@@ -10,7 +10,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
   use Drupal\Core\Form\FormStateInterface;
   use Drupal\Core\Url;
   use Drupal\currency\ConfigImporterInterface;
-  use Drupal\currency\Controller\CurrencyLocaleImportForm;
+  use Drupal\currency\Form\CurrencyLocaleImportForm;
   use Drupal\currency\Entity\CurrencyInterface;
   use Drupal\currency\Entity\CurrencyLocaleInterface;
   use Drupal\currency\FormHelperInterface;
@@ -18,7 +18,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
   use Symfony\Component\DependencyInjection\ContainerInterface;
 
   /**
-   * @coversDefaultClass \Drupal\currency\Controller\CurrencyLocaleImportForm
+   * @coversDefaultClass \Drupal\currency\Form\CurrencyLocaleImportForm
    *
    * @group Currency
    */
@@ -48,7 +48,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
     /**
      * The class under test.
      *
-     * @var \Drupal\currency\Controller\CurrencyLocaleImportForm
+     * @var \Drupal\currency\Form\CurrencyLocaleImportForm
      */
     protected $sut;
 
diff --git a/tests/src/Unit/Controller/FixedRatesFormTest.php b/tests/src/Unit/Controller/FixedRatesFormTest.php
index 2e98aa4..435f963 100644
--- a/tests/src/Unit/Controller/FixedRatesFormTest.php
+++ b/tests/src/Unit/Controller/FixedRatesFormTest.php
@@ -11,7 +11,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
   use Drupal\Core\Entity\EntityManagerInterface;
   use Drupal\Core\Entity\EntityStorageInterface;
   use Drupal\Core\Form\FormStateInterface;
-  use Drupal\currency\Controller\FixedRatesForm;
+  use Drupal\currency\Form\FixedRatesForm;
   use Drupal\currency\Entity\CurrencyInterface;
   use Drupal\currency\ExchangeRateInterface;
   use Drupal\currency\ExchangeRateProviderInterface;
@@ -22,7 +22,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
   use Symfony\Component\DependencyInjection\ContainerInterface;
 
   /**
- * @coversDefaultClass \Drupal\currency\Controller\FixedRatesForm
+ * @coversDefaultClass \Drupal\currency\Form\FixedRatesForm
  *
  * @group Currency
  */
@@ -66,7 +66,7 @@ class FixedRatesFormTest extends UnitTestCase {
   /**
    * The class under test.
    *
-   * @var \Drupal\currency\Controller\FixedRatesForm
+   * @var \Drupal\currency\Form\FixedRatesForm
    */
   protected $sut;
 
diff --git a/tests/src/Unit/Controller/PluginBasedExchangeRateProviderFormTest.php b/tests/src/Unit/Controller/PluginBasedExchangeRateProviderFormTest.php
index 308a248..1344f26 100644
--- a/tests/src/Unit/Controller/PluginBasedExchangeRateProviderFormTest.php
+++ b/tests/src/Unit/Controller/PluginBasedExchangeRateProviderFormTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\currency\Unit\Controller {
 
   use Drupal\Core\Form\FormState;
-  use Drupal\currency\Controller\PluginBasedExchangeRateProviderForm;
+  use Drupal\currency\Form\PluginBasedExchangeRateProviderForm;
   use Drupal\currency\Plugin\Currency\ExchangeRateProvider\ExchangeRateProviderManagerInterface;
   use Drupal\currency\PluginBasedExchangeRateProvider;
   use Drupal\Tests\UnitTestCase;
@@ -45,7 +45,7 @@ namespace Drupal\Tests\currency\Unit\Controller {
     /**
      * The class under test.
      *
-     * @var \Drupal\currency\Controller\PluginBasedExchangeRateProviderForm
+     * @var \Drupal\currency\Form\PluginBasedExchangeRateProviderForm
      */
     protected $sut;