diff --git a/core/modules/field/modules/email/email.info b/core/modules/email/email.info
similarity index 100%
rename from core/modules/field/modules/email/email.info
rename to core/modules/email/email.info
diff --git a/core/modules/field/modules/email/email.install b/core/modules/email/email.install
similarity index 100%
rename from core/modules/field/modules/email/email.install
rename to core/modules/email/email.install
diff --git a/core/modules/field/modules/email/email.module b/core/modules/email/email.module
similarity index 100%
rename from core/modules/field/modules/email/email.module
rename to core/modules/email/email.module
diff --git a/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php b/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
similarity index 100%
rename from core/modules/field/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
rename to core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
diff --git a/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php b/core/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php
similarity index 100%
rename from core/modules/field/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php
rename to core/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php
diff --git a/core/modules/field/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php b/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
similarity index 100%
rename from core/modules/field/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
rename to core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.info b/core/modules/field_sql_storage/field_sql_storage.info
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/field_sql_storage.info
rename to core/modules/field_sql_storage/field_sql_storage.info
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.install b/core/modules/field_sql_storage/field_sql_storage.install
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/field_sql_storage.install
rename to core/modules/field_sql_storage/field_sql_storage.install
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.module b/core/modules/field_sql_storage/field_sql_storage.module
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/field_sql_storage.module
rename to core/modules/field_sql_storage/field_sql_storage.module
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Condition.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Condition.php
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Condition.php
rename to core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Condition.php
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php
rename to core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/QueryFactory.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/QueryFactory.php
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/QueryFactory.php
rename to core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/QueryFactory.php
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
rename to core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php
rename to core/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php
similarity index 100%
rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php
rename to core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php
diff --git a/core/modules/field/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
similarity index 100%
rename from core/modules/field/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
rename to core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
diff --git a/core/modules/field/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
similarity index 100%
rename from core/modules/field/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
rename to core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
diff --git a/core/modules/field/modules/link/link.info b/core/modules/link/link.info
similarity index 100%
rename from core/modules/field/modules/link/link.info
rename to core/modules/link/link.info
diff --git a/core/modules/field/modules/link/link.install b/core/modules/link/link.install
similarity index 100%
rename from core/modules/field/modules/link/link.install
rename to core/modules/link/link.install
diff --git a/core/modules/field/modules/link/link.module b/core/modules/link/link.module
similarity index 100%
rename from core/modules/field/modules/link/link.module
rename to core/modules/link/link.module
diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
similarity index 100%
rename from core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
rename to core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
similarity index 100%
rename from core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
rename to core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
similarity index 100%
rename from core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
rename to core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php b/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
similarity index 100%
rename from core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
rename to core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php b/core/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php
similarity index 100%
rename from core/modules/field/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php
rename to core/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php
diff --git a/core/modules/field/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php b/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
similarity index 100%
rename from core/modules/field/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
rename to core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
diff --git a/core/modules/field/modules/number/number.info b/core/modules/number/number.info
similarity index 100%
rename from core/modules/field/modules/number/number.info
rename to core/modules/number/number.info
diff --git a/core/modules/field/modules/number/number.install b/core/modules/number/number.install
similarity index 100%
rename from core/modules/field/modules/number/number.install
rename to core/modules/number/number.install
diff --git a/core/modules/field/modules/number/number.module b/core/modules/number/number.module
similarity index 100%
rename from core/modules/field/modules/number/number.module
rename to core/modules/number/number.module
diff --git a/core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php
similarity index 100%
rename from core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php
rename to core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php
diff --git a/core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php
similarity index 100%
rename from core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php
rename to core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php
diff --git a/core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
similarity index 100%
rename from core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
rename to core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
diff --git a/core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
similarity index 100%
rename from core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
rename to core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
diff --git a/core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php
similarity index 100%
rename from core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php
rename to core/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php
diff --git a/core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
similarity index 100%
rename from core/modules/field/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
rename to core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
diff --git a/core/modules/field/modules/options/options.api.php b/core/modules/options/options.api.php
similarity index 100%
rename from core/modules/field/modules/options/options.api.php
rename to core/modules/options/options.api.php
diff --git a/core/modules/field/modules/options/options.info b/core/modules/options/options.info
similarity index 100%
rename from core/modules/field/modules/options/options.info
rename to core/modules/options/options.info
diff --git a/core/modules/field/modules/options/options.install b/core/modules/options/options.install
similarity index 100%
rename from core/modules/field/modules/options/options.install
rename to core/modules/options/options.install
diff --git a/core/modules/field/modules/options/options.module b/core/modules/options/options.module
similarity index 100%
rename from core/modules/field/modules/options/options.module
rename to core/modules/options/options.module
diff --git a/core/modules/field/modules/options/tests/options_test.info b/core/modules/options/tests/options_test.info
similarity index 100%
rename from core/modules/field/modules/options/tests/options_test.info
rename to core/modules/options/tests/options_test.info
diff --git a/core/modules/field/modules/options/tests/options_test.module b/core/modules/options/tests/options_test.module
similarity index 100%
rename from core/modules/field/modules/options/tests/options_test.module
rename to core/modules/options/tests/options_test.module
diff --git a/core/modules/field/modules/text/config/text.settings.yml b/core/modules/text/config/text.settings.yml
similarity index 100%
rename from core/modules/field/modules/text/config/text.settings.yml
rename to core/modules/text/config/text.settings.yml
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php
rename to core/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
rename to core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php b/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
rename to core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php b/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php
rename to core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/TextProcessed.php b/core/modules/text/lib/Drupal/text/TextProcessed.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/TextProcessed.php
rename to core/modules/text/lib/Drupal/text/TextProcessed.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Type/TextItem.php b/core/modules/text/lib/Drupal/text/Type/TextItem.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Type/TextItem.php
rename to core/modules/text/lib/Drupal/text/Type/TextItem.php
diff --git a/core/modules/field/modules/text/lib/Drupal/text/Type/TextSummaryItem.php b/core/modules/text/lib/Drupal/text/Type/TextSummaryItem.php
similarity index 100%
rename from core/modules/field/modules/text/lib/Drupal/text/Type/TextSummaryItem.php
rename to core/modules/text/lib/Drupal/text/Type/TextSummaryItem.php
diff --git a/core/modules/field/modules/text/text.info b/core/modules/text/text.info
similarity index 100%
rename from core/modules/field/modules/text/text.info
rename to core/modules/text/text.info
diff --git a/core/modules/field/modules/text/text.install b/core/modules/text/text.install
similarity index 100%
rename from core/modules/field/modules/text/text.install
rename to core/modules/text/text.install
diff --git a/core/modules/field/modules/text/text.js b/core/modules/text/text.js
similarity index 100%
rename from core/modules/field/modules/text/text.js
rename to core/modules/text/text.js
diff --git a/core/modules/field/modules/text/text.module b/core/modules/text/text.module
similarity index 100%
rename from core/modules/field/modules/text/text.module
rename to core/modules/text/text.module