diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index 6ddaf05..4a49bfb 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -21,9 +21,9 @@
  *   handlers = {
  *     "access" = "Drupal\shortcut\ShortcutAccessControlHandler",
  *     "form" = {
- *       "default" = "Drupal\shortcut\ShortcutForm",
- *       "add" = "Drupal\shortcut\ShortcutForm",
- *       "edit" = "Drupal\shortcut\ShortcutForm",
+ *       "default" = "Drupal\shortcut\Form\ShortcutForm",
+ *       "add" = "Drupal\shortcut\Form\ShortcutForm",
+ *       "edit" = "Drupal\shortcut\Form\ShortcutForm",
  *       "delete" = "Drupal\shortcut\Form\ShortcutDeleteForm"
  *     },
  *     "translation" = "Drupal\content_translation\ContentTranslationHandler"
diff --git a/core/modules/shortcut/src/Entity/ShortcutSet.php b/core/modules/shortcut/src/Entity/ShortcutSet.php
index 7b42310..f58aebf 100644
--- a/core/modules/shortcut/src/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/src/Entity/ShortcutSet.php
@@ -17,9 +17,9 @@
  *     "access" = "Drupal\shortcut\ShortcutSetAccessControlHandler",
  *     "list_builder" = "Drupal\shortcut\ShortcutSetListBuilder",
  *     "form" = {
- *       "default" = "Drupal\shortcut\ShortcutSetForm",
- *       "add" = "Drupal\shortcut\ShortcutSetForm",
- *       "edit" = "Drupal\shortcut\ShortcutSetForm",
+ *       "default" = "Drupal\shortcut\Form\ShortcutSetForm",
+ *       "add" = "Drupal\shortcut\Form\ShortcutSetForm",
+ *       "edit" = "Drupal\shortcut\Form\ShortcutSetForm",
  *       "customize" = "Drupal\shortcut\Form\SetCustomize",
  *       "delete" = "Drupal\shortcut\Form\ShortcutSetDeleteForm"
  *     }
diff --git a/core/modules/shortcut/src/ShortcutForm.php b/core/modules/shortcut/src/Form/ShortcutForm.php
similarity index 97%
copy from core/modules/shortcut/src/ShortcutForm.php
copy to core/modules/shortcut/src/Form/ShortcutForm.php
index b87db1b..7de4db2 100644
--- a/core/modules/shortcut/src/ShortcutForm.php
+++ b/core/modules/shortcut/src/Form/ShortcutForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut;
+namespace Drupal\shortcut\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/shortcut/src/ShortcutSetForm.php b/core/modules/shortcut/src/Form/ShortcutSetForm.php
similarity index 98%
copy from core/modules/shortcut/src/ShortcutSetForm.php
copy to core/modules/shortcut/src/Form/ShortcutSetForm.php
index 012de5f..10b044a 100644
--- a/core/modules/shortcut/src/ShortcutSetForm.php
+++ b/core/modules/shortcut/src/Form/ShortcutSetForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut;
+namespace Drupal\shortcut\Form;
 
 use Drupal\Core\Entity\BundleEntityFormBase;
 use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/shortcut/src/ShortcutForm.php b/core/modules/shortcut/src/ShortcutForm.php
index b87db1b..a78945d 100644
--- a/core/modules/shortcut/src/ShortcutForm.php
+++ b/core/modules/shortcut/src/ShortcutForm.php
@@ -2,50 +2,16 @@
 
 namespace Drupal\shortcut;
 
-use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Form\FormStateInterface;
+use Drupal\shortcut\Form\ShortcutForm as NewShortcutForm;
 
 /**
- * Form handler for the shortcut entity forms.
+ * Deprecated. Form handler for the shortcut entity forms.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed in Drupal 9.0.x. Use
+ *   \Drupal\shortcut\Form\ShortcutForm instead.
+ *
+ * @see \Drupal\shortcut\Form\ShortcutForm
  */
-class ShortcutForm extends ContentEntityForm {
-
-  /**
-   * The entity being used by this form.
-   *
-   * @var \Drupal\shortcut\ShortcutInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $entity = $this->entity;
-    $status = $entity->save();
-    $url = $entity->getUrl();
-    // There's an edge case where a user can have permission to
-    // 'link to any content', but has no right to access the linked page. So we
-    // check the access before showing the link.
-    if ($url->access()) {
-      $view_link = \Drupal::l($entity->getTitle(), $url);
-    }
-    else {
-      $view_link = $entity->getTitle();
-    }
-
-    if ($status == SAVED_UPDATED) {
-      $message = $this->t('The shortcut %link has been updated.', array('%link' => $view_link));
-    }
-    else {
-      $message = $this->t('Added a shortcut for %title.', array('%title' => $view_link));
-    }
-    drupal_set_message($message);
-
-    $form_state->setRedirect(
-      'entity.shortcut_set.customize_form',
-      array('shortcut_set' => $entity->bundle())
-    );
-  }
+class ShortcutForm extends NewShortcutForm {
 
 }
diff --git a/core/modules/shortcut/src/ShortcutSetForm.php b/core/modules/shortcut/src/ShortcutSetForm.php
index 012de5f..f6e0e05 100644
--- a/core/modules/shortcut/src/ShortcutSetForm.php
+++ b/core/modules/shortcut/src/ShortcutSetForm.php
@@ -2,61 +2,16 @@
 
 namespace Drupal\shortcut;
 
-use Drupal\Core\Entity\BundleEntityFormBase;
-use Drupal\Core\Form\FormStateInterface;
+use Drupal\shortcut\Form\ShortcutSetForm as NewShortcutSetForm;
 
 /**
- * Form handler for the shortcut set entity edit forms.
+ * Deprecated. Form handler for the shortcut set entity edit forms.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed in Drupal 9.0.x. Use
+ *   \Drupal\shortcut\Form\ShortcutSetForm instead.
+ *
+ * @see \Drupal\shortcut\Form\ShortcutSetForm
  */
-class ShortcutSetForm extends BundleEntityFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form = parent::form($form, $form_state);
-
-    $entity = $this->entity;
-    $form['label'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Set name'),
-      '#description' => t('The new set is created by copying items from your default shortcut set.'),
-      '#required' => TRUE,
-      '#default_value' => $entity->label(),
-    );
-    $form['id'] = array(
-      '#type' => 'machine_name',
-      '#machine_name' => array(
-        'exists' => '\Drupal\shortcut\Entity\ShortcutSet::load',
-        'source' => array('label'),
-        'replace_pattern' => '[^a-z0-9-]+',
-        'replace' => '-',
-      ),
-      '#default_value' => $entity->id(),
-      // This id could be used for menu name.
-      '#maxlength' => 23,
-    );
-
-    $form['actions']['submit']['#value'] = t('Create new set');
-
-    return $this->protectBundleIdElement($form);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $entity = $this->entity;
-    $is_new = !$entity->getOriginalId();
-    $entity->save();
-
-    if ($is_new) {
-      drupal_set_message(t('The %set_name shortcut set has been created. You can edit it from this page.', array('%set_name' => $entity->label())));
-    }
-    else {
-      drupal_set_message(t('Updated set name to %set-name.', array('%set-name' => $entity->label())));
-    }
-    $form_state->setRedirectUrl($this->entity->urlInfo('customize-form'));
-  }
+class ShortcutSetForm extends NewShortcutSetForm {
 
 }