diff --git a/core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/ButtonsWidget.php
similarity index 97%
rename from core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/ButtonsWidget.php
index aed9a29..068ae0b 100644
--- a/core/modules/options/src/Plugin/Field/FieldWidget/ButtonsWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/ButtonsWidget.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\options\Plugin\Field\FieldWidget\ButtonsWidget.
  */
 
-namespace Drupal\options\Plugin\Field\FieldWidget;
+namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
diff --git a/core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
similarity index 99%
rename from core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
index 49f2d81..10edbda 100644
--- a/core/modules/options/src/Plugin/Field/FieldWidget/OptionsWidgetBase.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\options\Plugin\Field\FieldWidget\OptionsWidgetBase.
  */
 
-namespace Drupal\options\Plugin\Field\FieldWidget;
+namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
 
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/SelectWidget.php
similarity index 94%
rename from core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/SelectWidget.php
index 28a75d2..998b879 100644
--- a/core/modules/options/src/Plugin/Field/FieldWidget/SelectWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/SelectWidget.php
@@ -5,11 +5,10 @@
  * Contains \Drupal\options\Plugin\Field\FieldWidget\SelectWidget.
  */
 
-namespace Drupal\options\Plugin\Field\FieldWidget;
+namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\options\Plugin\Field\FieldWidget\OptionsWidgetBase;
 
 /**
  * Plugin implementation of the 'options_select' widget.