core/modules/edit/lib/Drupal/edit/EditorBase.php   |    6 +-
 .../edit/lib/Drupal/edit/EditorInterface.php       |   60 ++++++++++++++++++++
 .../lib/Drupal/edit/Plugin/EditorInterFace.php     |   60 --------------------
 .../edit/Plugin/edit/editor/DirectEditor.php       |    2 +-
 .../Drupal/edit/Plugin/edit/editor/FormEditor.php  |    2 +-
 .../edit_test/Plugin/edit/editor/WysiwygEditor.php |    4 +-
 6 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/core/modules/edit/lib/Drupal/edit/EditorBase.php b/core/modules/edit/lib/Drupal/edit/EditorBase.php
index ecb8ff5..b94a50f 100644
--- a/core/modules/edit/lib/Drupal/edit/EditorBase.php
+++ b/core/modules/edit/lib/Drupal/edit/EditorBase.php
@@ -8,7 +8,7 @@
 namespace Drupal\edit;
 
 use Drupal\Component\Plugin\PluginBase;
-use Drupal\edit\Plugin\EditorInterface;
+use Drupal\edit\EditorInterface;
 use Drupal\field\FieldInstance;
 
 /**
@@ -20,14 +20,14 @@
 abstract class EditorBase extends PluginBase implements EditorInterface {
 
   /**
-   * Implements \Drupal\edit\Plugin\EditorInterface::getMetadata().
+   * Implements \Drupal\edit\EditorInterface::getMetadata().
    */
   function getMetadata(FieldInstance $instance, array $items) {
     return array();
   }
 
   /**
-   * Implements \Drupal\edit\Plugin\EditorInterface::getDynamicAttachments().
+   * Implements \Drupal\edit\EditorInterface::getDynamicAttachments().
    */
   function getDynamicAttachments() {
     return array();
diff --git a/core/modules/edit/lib/Drupal/edit/EditorInterface.php b/core/modules/edit/lib/Drupal/edit/EditorInterface.php
new file mode 100644
index 0000000..d6b0950
--- /dev/null
+++ b/core/modules/edit/lib/Drupal/edit/EditorInterface.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\edit\EditorInterface.
+ */
+
+namespace Drupal\edit;
+
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\field\FieldInstance;
+
+/**
+ * Defines an interface for Create.js PropertyEditor widgets.
+ *
+ * A PropertyEditor widget is a user-facing interface to edit an entity property
+ * through Create.js.
+ */
+interface EditorInterface extends PluginInspectionInterface {
+
+  /**
+   * Checks whether this editor is compatible with a given field instance.
+   *
+   * @param \Drupal\field\FieldInstance $instance
+   *   The field instance of the field being edited.
+   * @param array $items
+   *   The field's item values.
+   *
+   * @return bool
+   *   TRUE if it is compatible, FALSE otherwise.
+   */
+  public function isCompatible(FieldInstance $instance, array $items);
+
+  /**
+   * Generates metadata that is needed specifically for this editor.
+   *
+   * Will only be called by \Drupal\edit\MetadataGeneratorInterface::generate()
+   * when the passed in field instance & item values will use this editor.
+   *
+   * @param \Drupal\field\FieldInstance $instance
+   *   The field instance of the field being edited.
+   * @param array $items
+   *   The field's item values.
+   *
+   * @return array
+   *   A keyed array with metadata. Each key should be prefixed with the plug-in
+   *   ID of the editor.
+   */
+  public function getMetadata(FieldInstance $instance, array $items);
+
+  /**
+   * Returns the dynamic (context-specific) attachments for this editor.
+   *
+   * @return array
+   *   An array of attachments, for use with #attached.
+   *
+   * @see drupal_process_attached()
+   */
+  public function getDynamicAttachments();
+}
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/EditorInterFace.php b/core/modules/edit/lib/Drupal/edit/Plugin/EditorInterFace.php
deleted file mode 100644
index 99dd9cd..0000000
--- a/core/modules/edit/lib/Drupal/edit/Plugin/EditorInterFace.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\edit\Plugin\EditorInterface.
- */
-
-namespace Drupal\edit\Plugin;
-
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\field\FieldInstance;
-
-/**
- * Defines an interface for Create.js PropertyEditor widgets.
- *
- * A PropertyEditor widget is a user-facing interface to edit an entity property
- * through Create.js.
- */
-interface EditorInterface extends PluginInspectionInterface {
-
-  /**
-   * Checks whether this editor is compatible with a given field instance.
-   *
-   * @param \Drupal\field\FieldInstance $instance
-   *   The field instance of the field being edited.
-   * @param array $items
-   *   The field's item values.
-   *
-   * @return bool
-   *   TRUE if it is compatible, FALSE otherwise.
-   */
-  public function isCompatible(FieldInstance $instance, array $items);
-
-  /**
-   * Generates metadata that is needed specifically for this editor.
-   *
-   * Will only be called by \Drupal\edit\MetadataGeneratorInterface::generate()
-   * when the passed in field instance & item values will use this editor.
-   *
-   * @param \Drupal\field\FieldInstance $instance
-   *   The field instance of the field being edited.
-   * @param array $items
-   *   The field's item values.
-   *
-   * @return array
-   *   A keyed array with metadata. Each key should be prefixed with the plug-in
-   *   ID of the editor.
-   */
-  public function getMetadata(FieldInstance $instance, array $items);
-
-  /**
-   * Returns the dynamic (context-specific) attachments for this editor.
-   *
-   * @return array
-   *   An array of attachments, for use with #attached.
-   *
-   * @see drupal_process_attached()
-   */
-  public function getDynamicAttachments();
-}
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
index b5b4fda..304dba4 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
@@ -27,7 +27,7 @@
 class DirectEditor extends EditorBase {
 
   /**
-   * Implements \Drupal\edit\Plugin\EditorInterface::isCompatible().
+   * Implements \Drupal\edit\EditorInterface::isCompatible().
    *
    * @todo The processed text logic is too coupled to text fields. Figure out
    *   how to generalize to other textual field types.
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
index 91bf12b..aa08ae5 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
@@ -27,7 +27,7 @@
 class FormEditor extends EditorBase {
 
   /**
-   * Implements \Drupal\edit\Plugin\EditorInterface::isCompatible().
+   * Implements \Drupal\edit\EditorInterface::isCompatible().
    */
   function isCompatible(FieldInstance $instance, array $items) {
     return TRUE;
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php
index a2b3fea..fa54bea 100644
--- a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php
+++ b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php
@@ -28,7 +28,7 @@
 class WysiwygEditor extends EditorBase {
 
   /**
-   * Implements \Drupal\edit\Plugin\EditorInterface::isCompatible().
+   * Implements \Drupal\edit\EditorInterface::isCompatible().
    */
   function isCompatible(FieldInstance $instance, array $items) {
     $field = field_info_field($instance['field_name']);
@@ -50,7 +50,7 @@ function isCompatible(FieldInstance $instance, array $items) {
   }
 
   /**
-   * Implements \Drupal\edit\Plugin\EditorInterface::getMetadata().
+   * Implements \Drupal\edit\EditorInterface::getMetadata().
    */
   function getMetadata(FieldInstance $instance, array $items) {
     $format_id = $items[0]['format'];