diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index 5004a84..47dbf53 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -40,8 +40,8 @@ function action_help($route_name, RouteMatchInterface $route_match) {
 function action_entity_type_build(array &$entity_types) {
   /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
   $entity_types['action']
-    ->setFormClass('add', 'Drupal\action\ActionAddForm')
-    ->setFormClass('edit', 'Drupal\action\ActionEditForm')
+    ->setFormClass('add', 'Drupal\action\Form\ActionAddForm')
+    ->setFormClass('edit', 'Drupal\action\Form\ActionEditForm')
     ->setFormClass('delete', 'Drupal\action\Form\ActionDeleteForm')
     ->setListBuilderClass('Drupal\action\ActionListBuilder')
     ->setLinkTemplate('delete-form', '/admin/config/system/actions/configure/{action}/delete')
diff --git a/core/modules/action/src/ActionAddForm.php b/core/modules/action/src/ActionAddForm.php
deleted file mode 100644
index 59d56ec..0000000
--- a/core/modules/action/src/ActionAddForm.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\action;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Provides a form for action add forms.
- *
- * @internal
- */
-class ActionAddForm extends ActionFormBase {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param string $action_id
-   *   The action ID.
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $action_id = NULL) {
-    $this->entity->setPlugin($action_id);
-
-    // Derive the label and type from the action definition.
-    $definition = $this->entity->getPluginDefinition();
-    $this->entity->set('label', $definition['label']);
-    $this->entity->set('type', $definition['type']);
-
-    return parent::buildForm($form, $form_state);
-  }
-
-}
diff --git a/core/modules/action/src/ActionEditForm.php b/core/modules/action/src/ActionEditForm.php
deleted file mode 100644
index 01f5a9d..0000000
--- a/core/modules/action/src/ActionEditForm.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Drupal\action;
-
-/**
- * Provides a form for action edit forms.
- *
- * @internal
- */
-class ActionEditForm extends ActionFormBase {
-
-}
diff --git a/core/modules/action/src/ActionFormBase.php b/core/modules/action/src/ActionFormBase.php
deleted file mode 100644
index 3fafd03..0000000
--- a/core/modules/action/src/ActionFormBase.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-namespace Drupal\action;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\PluginFormInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a base form for action forms.
- */
-abstract class ActionFormBase extends EntityForm {
-
-  /**
-   * The action plugin being configured.
-   *
-   * @var \Drupal\Core\Action\ActionInterface
-   */
-  protected $plugin;
-
-  /**
-   * The action storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * Constructs a new action form.
-   *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The action storage.
-   */
-  public function __construct(EntityStorageInterface $storage) {
-    $this->storage = $storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.manager')->getStorage('action')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $this->plugin = $this->entity->getPlugin();
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#default_value' => $this->entity->label(),
-      '#maxlength' => '255',
-      '#description' => $this->t('A unique label for this advanced action. This label will be displayed in the interface of modules that integrate with actions.'),
-    ];
-
-    $form['id'] = [
-      '#type' => 'machine_name',
-      '#default_value' => $this->entity->id(),
-      '#disabled' => !$this->entity->isNew(),
-      '#maxlength' => 64,
-      '#description' => $this->t('A unique name for this action. It must only contain lowercase letters, numbers and underscores.'),
-      '#machine_name' => [
-        'exists' => [$this, 'exists'],
-      ],
-    ];
-    $form['plugin'] = [
-      '#type' => 'value',
-      '#value' => $this->entity->get('plugin'),
-    ];
-    $form['type'] = [
-      '#type' => 'value',
-      '#value' => $this->entity->getType(),
-    ];
-
-    if ($this->plugin instanceof PluginFormInterface) {
-      $form += $this->plugin->buildConfigurationForm($form, $form_state);
-    }
-
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * Determines if the action already exists.
-   *
-   * @param string $id
-   *   The action ID
-   *
-   * @return bool
-   *   TRUE if the action exists, FALSE otherwise.
-   */
-  public function exists($id) {
-    $action = $this->storage->load($id);
-    return !empty($action);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions = parent::actions($form, $form_state);
-    unset($actions['delete']);
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-
-    if ($this->plugin instanceof PluginFormInterface) {
-      $this->plugin->validateConfigurationForm($form, $form_state);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    parent::submitForm($form, $form_state);
-
-    if ($this->plugin instanceof PluginFormInterface) {
-      $this->plugin->submitConfigurationForm($form, $form_state);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $this->entity->save();
-    drupal_set_message($this->t('The action has been successfully saved.'));
-
-    $form_state->setRedirect('entity.action.collection');
-  }
-
-}
diff --git a/core/modules/action/src/Form/ActionAddForm.php b/core/modules/action/src/Form/ActionAddForm.php
new file mode 100644
index 0000000..54a2c4c
--- /dev/null
+++ b/core/modules/action/src/Form/ActionAddForm.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\action\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a form for action add forms.
+ *
+ * @internal
+ */
+class ActionAddForm extends ActionFormBase {
+
+  /**
+   * {@inheritdoc}
+   *
+   * @param string $action_id
+   *   The action ID.
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $action_id = NULL) {
+    $this->entity->setPlugin($action_id);
+
+    // Derive the label and type from the action definition.
+    $definition = $this->entity->getPluginDefinition();
+    $this->entity->set('label', $definition['label']);
+    $this->entity->set('type', $definition['type']);
+
+    return parent::buildForm($form, $form_state);
+  }
+
+}
diff --git a/core/modules/action/src/Form/ActionEditForm.php b/core/modules/action/src/Form/ActionEditForm.php
new file mode 100644
index 0000000..1fb28d7
--- /dev/null
+++ b/core/modules/action/src/Form/ActionEditForm.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Drupal\action\Form;
+
+/**
+ * Provides a form for action edit forms.
+ *
+ * @internal
+ */
+class ActionEditForm extends ActionFormBase {
+
+}
diff --git a/core/modules/action/src/Form/ActionFormBase.php b/core/modules/action/src/Form/ActionFormBase.php
new file mode 100644
index 0000000..8a0859e
--- /dev/null
+++ b/core/modules/action/src/Form/ActionFormBase.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Drupal\action\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\PluginFormInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a base form for action forms.
+ */
+abstract class ActionFormBase extends EntityForm {
+
+  /**
+   * The action plugin being configured.
+   *
+   * @var \Drupal\Core\Action\ActionInterface
+   */
+  protected $plugin;
+
+  /**
+   * The action storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $storage;
+
+  /**
+   * Constructs a new action form.
+   *
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The action storage.
+   */
+  public function __construct(EntityStorageInterface $storage) {
+    $this->storage = $storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.manager')->getStorage('action')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $this->plugin = $this->entity->getPlugin();
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#default_value' => $this->entity->label(),
+      '#maxlength' => '255',
+      '#description' => $this->t('A unique label for this advanced action. This label will be displayed in the interface of modules that integrate with actions.'),
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $this->entity->id(),
+      '#disabled' => !$this->entity->isNew(),
+      '#maxlength' => 64,
+      '#description' => $this->t('A unique name for this action. It must only contain lowercase letters, numbers and underscores.'),
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+      ],
+    ];
+    $form['plugin'] = [
+      '#type' => 'value',
+      '#value' => $this->entity->get('plugin'),
+    ];
+    $form['type'] = [
+      '#type' => 'value',
+      '#value' => $this->entity->getType(),
+    ];
+
+    if ($this->plugin instanceof PluginFormInterface) {
+      $form += $this->plugin->buildConfigurationForm($form, $form_state);
+    }
+
+    return parent::form($form, $form_state);
+  }
+
+  /**
+   * Determines if the action already exists.
+   *
+   * @param string $id
+   *   The action ID
+   *
+   * @return bool
+   *   TRUE if the action exists, FALSE otherwise.
+   */
+  public function exists($id) {
+    $action = $this->storage->load($id);
+    return !empty($action);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, FormStateInterface $form_state) {
+    $actions = parent::actions($form, $form_state);
+    unset($actions['delete']);
+    return $actions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
+
+    if ($this->plugin instanceof PluginFormInterface) {
+      $this->plugin->validateConfigurationForm($form, $form_state);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    parent::submitForm($form, $form_state);
+
+    if ($this->plugin instanceof PluginFormInterface) {
+      $this->plugin->submitConfigurationForm($form, $form_state);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $this->entity->save();
+    drupal_set_message($this->t('The action has been successfully saved.'));
+
+    $form_state->setRedirect('entity.action.collection');
+  }
+
+}