diff --git a/core/config/core.extension.yml b/core/config/install/core.extension.yml
similarity index 100%
rename from core/config/core.extension.yml
rename to core/config/install/core.extension.yml
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 7ee1b56..a22907b 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -92,36 +92,36 @@ public function installDefaultConfig($type, $name) {
     $source_storage = $this->getSourceStorage();
     $config_to_install = $source_storage->listAll($name . '.');
 
-    // Work out if this extension provides default configuration for any other
-    // enabled extensions.
-    $config_dir = drupal_get_path($type, $name) . '/config';
-    if (is_dir($config_dir)) {
-      if (is_dir($config_dir . '/schema')) {
-        // Refresh the schema cache if installing default configuration and the
-        // extension has a configuration schema directory.
-        $this->typedConfig->clearCachedDefinitions();
-      }
-      // If not installing the core base system default configuration, retrieve
-      // the list of integration configuration of currently enabled extensions.
-      if ($type !== 'core') {
-        $default_storage = new FileStorage($config_dir);
-        $other_module_config = array_filter($default_storage->listAll(), function ($value) use ($name) {
-          return !preg_match('/^' . $name . '\./', $value);
-        });
-        $enabled_extensions = array();
-        // Read enabled extensions directly from configuration to avoid circular
-        // dependencies with ModuleHandler and ThemeHandler.
-        $extension_config = $this->configFactory->get('core.extension');
-        $enabled_extensions += array_keys((array) $extension_config->get('module'));
-        $enabled_extensions += array_keys((array) $extension_config->get('theme'));
-
-        $other_module_config = array_filter($other_module_config, function ($config_name) use ($enabled_extensions) {
-          $provider = Unicode::substr($config_name, 0, strpos($config_name, '.'));
-          return in_array($provider, $enabled_extensions);
-        });
-
-        $config_to_install = array_merge($config_to_install, $other_module_config);
-      }
+    $extension_path = drupal_get_path($type, $name);
+    // If the extension provides configuration schema clear the definitions.
+    if (is_dir($extension_path . '/' . InstallStorage::CONFIG_SCHEMA_DIRECTORY)) {
+      // Refresh the schema cache if installing default configuration and the
+      // extension has a configuration schema directory.
+      $this->typedConfig->clearCachedDefinitions();
+    }
+
+    // If not installing the core base system default configuration, work out if
+    // this extension provides default configuration for any other enabled
+    // extensions.
+    if ($type !== 'core' && is_dir($extension_path . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY)) {
+      $enabled_extensions = $other_module_config = array();
+      $default_storage = new FileStorage($extension_path . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY);
+      $other_module_config = array_filter($default_storage->listAll(), function ($value) use ($name) {
+        return !preg_match('/^' . $name . '\./', $value);
+      });
+
+      // Read enabled extensions directly from configuration to avoid circular
+      // dependencies with ModuleHandler and ThemeHandler.
+      $extension_config = $this->configFactory->get('core.extension');
+      $enabled_extensions += array_keys((array) $extension_config->get('module'));
+      $enabled_extensions += array_keys((array) $extension_config->get('theme'));
+
+      $other_module_config = array_filter($other_module_config, function ($config_name) use ($enabled_extensions) {
+        $provider = Unicode::substr($config_name, 0, strpos($config_name, '.'));
+        return in_array($provider, $enabled_extensions);
+      });
+
+      $config_to_install = array_merge($config_to_install, $other_module_config);
     }
 
     if (!empty($config_to_install)) {
diff --git a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
index 6e7c20d..efa3d54 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
@@ -19,7 +19,7 @@
    * directories for all other extensions to locate any configuration with its
    * name prefix. For example, the Node module provides the frontpage view as a
    * default configuration file:
-   * core/modules/node/config/views.view.frontpage.yml
+   * core/modules/node/config/install/views.view.frontpage.yml
    * When the Views module is installed after the Node module is already
    * enabled, the frontpage view will be installed.
    *
diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php
index 6fd55c9..7300be8 100644
--- a/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -156,7 +156,7 @@ public function uninstall($type, $name) {
     foreach ($config_names as $config_name) {
       $this->configFactory->get($config_name)->delete();
     }
-    $schema_dir = drupal_get_path($type, $name) . '/config/schema';
+    $schema_dir = drupal_get_path($type, $name) . '/' . InstallStorage::CONFIG_SCHEMA_DIRECTORY;
     if (is_dir($schema_dir)) {
       // Refresh the schema cache if uninstalling an extension that provides
       // configuration schema.
diff --git a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php
index ba797f0..813efeb 100644
--- a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php
+++ b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php
@@ -32,7 +32,7 @@ class ExtensionInstallStorage extends InstallStorage {
    *   The directory to scan in each extension to scan for files. Defaults to
    *   'config'.
    */
-  public function __construct(StorageInterface $config_storage, $directory = 'config') {
+  public function __construct(StorageInterface $config_storage, $directory = self::CONFIG_INSTALL_DIRECTORY) {
     $this->configStorage = $config_storage;
     $this->directory = $directory;
   }
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index 1aa1bec..2db0944 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -23,6 +23,16 @@
 class InstallStorage extends FileStorage {
 
   /**
+   * Extension sub-directory containing default configuration for installation.
+   */
+  const CONFIG_INSTALL_DIRECTORY = 'config/install';
+
+  /**
+   * Extension sub-directory containing configuration schema.
+   */
+  const CONFIG_SCHEMA_DIRECTORY = 'config/schema';
+
+  /**
    * Folder map indexed by configuration name.
    *
    * @var array
@@ -43,7 +53,7 @@ class InstallStorage extends FileStorage {
    *   The directory to scan in each extension to scan for files. Defaults to
    *   'config'.
    */
-  public function __construct($directory = 'config') {
+  public function __construct($directory = self::CONFIG_INSTALL_DIRECTORY) {
     $this->directory = $directory;
   }
 
diff --git a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
new file mode 100644
index 0000000..6781539
--- /dev/null
+++ b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Extension\UpdateModuleHandler.
+ */
+
+namespace Drupal\Core\Extension;
+
+use Drupal\Core\Config\ConfigException;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+
+/**
+ * Deals with module enables and throws exception if hooks fired during updates.
+ *
+ * This is necessary for a reliable and testable update environment.
+ */
+class UpdateModuleHandler extends ModuleHandler {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getImplementations($hook) {
+    if (substr($hook, -6) === '_alter') {
+      return array();
+    }
+    // _theme() is called during updates and fires hooks, so whitelist the
+    // system module.
+    if (substr($hook, 0, 6) == 'theme_') {
+      return array('system');
+    }
+    switch ($hook) {
+      // hook_requirements is necessary for updates to work.
+      case 'requirements':
+      // Allow logging.
+      case 'watchdog':
+        return parent::getImplementations($hook);
+
+      // Forms and pages do not render without the basic elements defined in
+      // system_element_info().
+      case 'element_info':
+      // Forms do not render without the basic elements in
+      // drupal_common_theme() called from system_theme().
+      case 'theme':
+      // Allow access to stream wrappers.
+      case 'stream_wrappers':
+        return array('system');
+
+      // Those are needed by user_access() to check access on update.php.
+      case 'entity_type_build':
+      case 'entity_load':
+      case 'user_role_load':
+        return array();
+
+      // t() in system_stream_wrappers() needs this. Other schema calls aren't
+      // supported.
+      case 'schema':
+        return array('locale');
+
+      default:
+        throw new \LogicException("Invoking hooks $hook is not supported during updates");
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function install(array $module_list, $enable_dependencies = TRUE) {
+    $schema_store = \Drupal::keyValue('system.schema');
+    $old_schema = array();
+    foreach ($module_list as $module) {
+      // Check for initial schema and install it.
+      module_load_install($module);
+      $function = $module . '_schema_0';
+      if (function_exists($function)) {
+        $schema = $function();
+        foreach ($schema as $table => $spec) {
+          db_create_table($table, $spec);
+        }
+      }
+
+      // Enable the module with a weight of 0.
+      $extension_config = \Drupal::config('core.extension');
+      $extension_config
+        ->set("module.$module", 0)
+        ->set('module', module_config_sort($extension_config->get('module')))
+        ->save();
+
+      $current_schema = $schema_store->get($module);
+      // Set the schema version if the module was not just disabled before.
+      if ($current_schema === NULL || $current_schema === SCHEMA_UNINSTALLED) {
+        // Change the schema version to the given value (defaults to 0), so any
+        // module updates since the module's inception are executed in a core
+        // upgrade.
+        $schema_store->set($module, 0);
+        $old_schema[$module] = SCHEMA_UNINSTALLED;
+      }
+      else {
+        $old_schema[$module] = $current_schema;
+      }
+
+      // Copy the default configuration of the module into the active storage.
+      // The default configuration is not altered in any way, and since the module
+      // is just being installed, none of its configuration can exist already, so
+      // this is a plain copy operation from one storage to another.
+      $module_config_path = drupal_get_path('module', $module) . '/'. InstallStorage::CONFIG_INSTALL_DIRECTORY;
+      if (is_dir($module_config_path)) {
+        $module_filestorage = new FileStorage($module_config_path);
+        $config_storage = \Drupal::service('config.storage');
+        foreach ($module_filestorage->listAll() as $config_name) {
+          // If this file already exists, something in the upgrade path went
+          // completely wrong and we want to know.
+          if ($config_storage->exists($config_name)) {
+            throw new ConfigException(format_string('Default configuration file @name of @module module unexpectedly exists already before the module was installed.', array(
+              '@module' => $module,
+              '@name' => $config_name,
+            )));
+          }
+          $config_storage->write($config_name, $module_filestorage->read($config_name));
+        }
+      }
+
+      // system_list_reset() is in module.inc but that would only be available
+      // once the variable bootstrap is done.
+      require_once DRUPAL_ROOT . '/core/includes/module.inc';
+      system_list_reset();
+      $this->moduleList[$module] = drupal_get_filename('module', $module);
+      $this->load($module);
+      drupal_classloader_register($module, dirname($this->moduleList[$module]));
+      // @todo Figure out what to do about hook_install() and hook_enable().
+    }
+    return $old_schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
+    throw new \LogicException('Uninstalling modules is not supported during updates');
+  }
+
+}
diff --git a/core/modules/action/config/action.settings.yml b/core/modules/action/config/install/action.settings.yml
similarity index 100%
rename from core/modules/action/config/action.settings.yml
rename to core/modules/action/config/install/action.settings.yml
diff --git a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
similarity index 100%
rename from core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml
rename to core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
diff --git a/core/modules/aggregator/config/aggregator.settings.yml b/core/modules/aggregator/config/install/aggregator.settings.yml
similarity index 100%
rename from core/modules/aggregator/config/aggregator.settings.yml
rename to core/modules/aggregator/config/install/aggregator.settings.yml
diff --git a/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
similarity index 100%
rename from core/modules/aggregator/config/views.view.aggregator_rss_feed.yml
rename to core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/config/aggregator_test.settings.yml b/core/modules/aggregator/tests/modules/aggregator_test/config/install/aggregator_test.settings.yml
similarity index 100%
rename from core/modules/aggregator/tests/modules/aggregator_test/config/aggregator_test.settings.yml
rename to core/modules/aggregator/tests/modules/aggregator_test/config/install/aggregator_test.settings.yml
diff --git a/core/modules/block/custom_block/config/custom_block.type.basic.yml b/core/modules/block/custom_block/config/install/custom_block.type.basic.yml
similarity index 100%
rename from core/modules/block/custom_block/config/custom_block.type.basic.yml
rename to core/modules/block/custom_block/config/install/custom_block.type.basic.yml
diff --git a/core/modules/block/custom_block/config/entity.view_mode.custom_block.full.yml b/core/modules/block/custom_block/config/install/entity.view_mode.custom_block.full.yml
similarity index 100%
rename from core/modules/block/custom_block/config/entity.view_mode.custom_block.full.yml
rename to core/modules/block/custom_block/config/install/entity.view_mode.custom_block.full.yml
diff --git a/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml b/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml
similarity index 100%
rename from core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
rename to core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml
diff --git a/core/modules/book/config/book.settings.yml b/core/modules/book/config/install/book.settings.yml
similarity index 100%
rename from core/modules/book/config/book.settings.yml
rename to core/modules/book/config/install/book.settings.yml
diff --git a/core/modules/book/config/entity.view_mode.node.print.yml b/core/modules/book/config/install/entity.view_mode.node.print.yml
similarity index 100%
rename from core/modules/book/config/entity.view_mode.node.print.yml
rename to core/modules/book/config/install/entity.view_mode.node.print.yml
diff --git a/core/modules/book/config/node.type.book.yml b/core/modules/book/config/install/node.type.book.yml
similarity index 100%
rename from core/modules/book/config/node.type.book.yml
rename to core/modules/book/config/install/node.type.book.yml
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml
similarity index 100%
rename from core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml
rename to core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.mobile.yml
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml
similarity index 100%
rename from core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml
rename to core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.narrow.yml
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml
similarity index 100%
rename from core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml
rename to core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.tv.yml
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml
similarity index 100%
rename from core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml
rename to core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint.theme.breakpoint_test_theme.wide.yml
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml
similarity index 100%
rename from core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml
rename to core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.breakpoint_test_theme.yml
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml b/core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml
similarity index 100%
rename from core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml
rename to core/modules/breakpoint/tests/themes/breakpoint_test_theme/config/install/breakpoint.breakpoint_group.theme.breakpoint_test_theme.test.yml
diff --git a/core/modules/comment/config/entity.view_mode.comment.full.yml b/core/modules/comment/config/install/entity.view_mode.comment.full.yml
similarity index 100%
rename from core/modules/comment/config/entity.view_mode.comment.full.yml
rename to core/modules/comment/config/install/entity.view_mode.comment.full.yml
diff --git a/core/modules/comment/config/system.action.comment_publish_action.yml b/core/modules/comment/config/install/system.action.comment_publish_action.yml
similarity index 100%
rename from core/modules/comment/config/system.action.comment_publish_action.yml
rename to core/modules/comment/config/install/system.action.comment_publish_action.yml
diff --git a/core/modules/comment/config/system.action.comment_save_action.yml b/core/modules/comment/config/install/system.action.comment_save_action.yml
similarity index 100%
rename from core/modules/comment/config/system.action.comment_save_action.yml
rename to core/modules/comment/config/install/system.action.comment_save_action.yml
diff --git a/core/modules/comment/config/system.action.comment_unpublish_action.yml b/core/modules/comment/config/install/system.action.comment_unpublish_action.yml
similarity index 100%
rename from core/modules/comment/config/system.action.comment_unpublish_action.yml
rename to core/modules/comment/config/install/system.action.comment_unpublish_action.yml
diff --git a/core/modules/comment/config/views.view.comments_recent.yml b/core/modules/comment/config/install/views.view.comments_recent.yml
similarity index 100%
rename from core/modules/comment/config/views.view.comments_recent.yml
rename to core/modules/comment/config/install/views.view.comments_recent.yml
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
index f10a120..dc6de36 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\Config\ConfigNameException;
+use Drupal\Core\Config\InstallStorage;
 use Drupal\simpletest\DrupalUnitTestBase;
 use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Config\DatabaseStorage;
@@ -196,7 +197,7 @@ public function testDataTypes() {
     $storage = new DatabaseStorage($this->container->get('database'), 'config');
     $name = 'config_test.types';
     $config = $this->container->get('config.factory')->get($name);
-    $original_content = file_get_contents(drupal_get_path('module', 'config_test') . "/config/$name.yml");
+    $original_content = file_get_contents(drupal_get_path('module', 'config_test') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.yml");
     $this->verbose('<pre>' . $original_content . "\n" . var_export($storage->read($name), TRUE));
 
     // Verify variable data types are intact.
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php
index 7116bea..776daa4 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\config\Tests;
 
+use Drupal\Core\Config\InstallStorage;
 use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Config\FileStorage;
 
@@ -122,7 +123,7 @@ function testInstallProfileConfigOverwrite() {
     // Verify that the original data matches. We have to read the module config
     // file directly, because the install profile default system.cron.yml
     // configuration file was used to create the active configuration.
-    $config_dir = drupal_get_path('module', 'system') . '/config';
+    $config_dir = drupal_get_path('module', 'system') . '/'. InstallStorage::CONFIG_INSTALL_DIRECTORY;
     $this->assertTrue(is_dir($config_dir));
     $source_storage = new FileStorage($config_dir);
     $data = $source_storage->read($config_name);
diff --git a/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php
index aa5b950..1ef3800 100644
--- a/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\config\Tests;
 
 use Drupal\config_test\TestInstallStorage;
+use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\Schema\Property;
 use Drupal\Core\Config\TypedConfigManager;
 use Drupal\Core\TypedData\Type\BooleanInterface;
@@ -69,7 +70,7 @@ public function testDefaultConfig() {
     // every module, profile and theme.
     $typed_config = new TypedConfigManager(
       \Drupal::service('config.storage'),
-      new TestInstallStorage('config/schema'),
+      new TestInstallStorage(InstallStorage::CONFIG_SCHEMA_DIRECTORY),
       \Drupal::service('cache.config')
     );
 
diff --git a/core/modules/config/tests/config_integration_test/config/config_integration_test.settings.yml b/core/modules/config/tests/config_integration_test/config/install/config_integration_test.settings.yml
similarity index 100%
rename from core/modules/config/tests/config_integration_test/config/config_integration_test.settings.yml
rename to core/modules/config/tests/config_integration_test/config/install/config_integration_test.settings.yml
diff --git a/core/modules/config/tests/config_integration_test/config/config_test.dynamic.config_integration_test.yml b/core/modules/config/tests/config_integration_test/config/install/config_test.dynamic.config_integration_test.yml
similarity index 100%
rename from core/modules/config/tests/config_integration_test/config/config_test.dynamic.config_integration_test.yml
rename to core/modules/config/tests/config_integration_test/config/install/config_test.dynamic.config_integration_test.yml
diff --git a/core/modules/config/tests/config_other_module_config/config/config_test.dynamic.other_module.yml b/core/modules/config/tests/config_other_module_config/config/install/config_test.dynamic.other_module.yml
similarity index 100%
rename from core/modules/config/tests/config_other_module_config/config/config_test.dynamic.other_module.yml
rename to core/modules/config/tests/config_other_module_config/config/install/config_test.dynamic.other_module.yml
diff --git a/core/modules/config/tests/config_override_test/config/system.cron.yml b/core/modules/config/tests/config_override_test/config/install/system.cron.yml
similarity index 100%
rename from core/modules/config/tests/config_override_test/config/system.cron.yml
rename to core/modules/config/tests/config_override_test/config/install/system.cron.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.dynamic.dotted.default.yml b/core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.default.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.dynamic.dotted.default.yml
rename to core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.default.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.no_status.default.yml b/core/modules/config/tests/config_test/config/install/config_test.no_status.default.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.no_status.default.yml
rename to core/modules/config/tests/config_test/config/install/config_test.no_status.default.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.noschema.yml b/core/modules/config/tests/config_test/config/install/config_test.noschema.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.noschema.yml
rename to core/modules/config/tests/config_test/config/install/config_test.noschema.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.schema_in_install.yml b/core/modules/config/tests/config_test/config/install/config_test.schema_in_install.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.schema_in_install.yml
rename to core/modules/config/tests/config_test/config/install/config_test.schema_in_install.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.someschema.somemodule.section_one.subsection.yml b/core/modules/config/tests/config_test/config/install/config_test.someschema.somemodule.section_one.subsection.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.someschema.somemodule.section_one.subsection.yml
rename to core/modules/config/tests/config_test/config/install/config_test.someschema.somemodule.section_one.subsection.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.someschema.somemodule.section_two.subsection.yml b/core/modules/config/tests/config_test/config/install/config_test.someschema.somemodule.section_two.subsection.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.someschema.somemodule.section_two.subsection.yml
rename to core/modules/config/tests/config_test/config/install/config_test.someschema.somemodule.section_two.subsection.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.someschema.with_parents.yml b/core/modules/config/tests/config_test/config/install/config_test.someschema.with_parents.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.someschema.with_parents.yml
rename to core/modules/config/tests/config_test/config/install/config_test.someschema.with_parents.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.someschema.yml b/core/modules/config/tests/config_test/config/install/config_test.someschema.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.someschema.yml
rename to core/modules/config/tests/config_test/config/install/config_test.someschema.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.system.yml b/core/modules/config/tests/config_test/config/install/config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/config_test.system.yml
diff --git a/core/modules/config/tests/config_test/config/config_test.types.yml b/core/modules/config/tests/config_test/config/install/config_test.types.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/config_test.types.yml
rename to core/modules/config/tests/config_test/config/install/config_test.types.yml
diff --git a/core/modules/config/tests/config_test/config/language.config.de.config_test.system.yml b/core/modules/config/tests/config_test/config/install/language.config.de.config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/language.config.de.config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/language.config.de.config_test.system.yml
diff --git a/core/modules/config/tests/config_test/config/language.config.en.config_test.system.yml b/core/modules/config/tests/config_test/config/install/language.config.en.config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/language.config.en.config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/language.config.en.config_test.system.yml
diff --git a/core/modules/config/tests/config_test/config/language.config.fr.config_test.system.yml b/core/modules/config/tests/config_test/config/install/language.config.fr.config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/config_test/config/language.config.fr.config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/language.config.fr.config_test.system.yml
diff --git a/core/modules/config/tests/config_test_invalid_name/config/invalid_object_name.yml b/core/modules/config/tests/config_test_invalid_name/config/install/invalid_object_name.yml
similarity index 100%
rename from core/modules/config/tests/config_test_invalid_name/config/invalid_object_name.yml
rename to core/modules/config/tests/config_test_invalid_name/config/install/invalid_object_name.yml
diff --git a/core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.info.yml b/core/modules/config/tests/config_test_invalid_name/install
similarity index 100%
rename from core/modules/config/tests/config_test_invalid_name/config_test_invalid_name.info.yml
rename to core/modules/config/tests/config_test_invalid_name/install
diff --git a/core/modules/contact/config/contact.category.feedback.yml b/core/modules/contact/config/install/contact.category.feedback.yml
similarity index 100%
rename from core/modules/contact/config/contact.category.feedback.yml
rename to core/modules/contact/config/install/contact.category.feedback.yml
diff --git a/core/modules/contact/config/contact.category.personal.yml b/core/modules/contact/config/install/contact.category.personal.yml
similarity index 100%
rename from core/modules/contact/config/contact.category.personal.yml
rename to core/modules/contact/config/install/contact.category.personal.yml
diff --git a/core/modules/contact/config/contact.settings.yml b/core/modules/contact/config/install/contact.settings.yml
similarity index 100%
rename from core/modules/contact/config/contact.settings.yml
rename to core/modules/contact/config/install/contact.settings.yml
diff --git a/core/modules/dblog/config/dblog.settings.yml b/core/modules/dblog/config/install/dblog.settings.yml
similarity index 100%
rename from core/modules/dblog/config/dblog.settings.yml
rename to core/modules/dblog/config/install/dblog.settings.yml
diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml b/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml
similarity index 100%
rename from core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml
rename to core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml
diff --git a/core/modules/field/config/field.settings.yml b/core/modules/field/config/install/field.settings.yml
similarity index 100%
rename from core/modules/field/config/field.settings.yml
rename to core/modules/field/config/install/field.settings.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/field.field.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.field_test_import.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/field.field.entity_test.field_test_import.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.field_test_import.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/field.field.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.field_test_import_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/field.field.entity_test.field_test_import_2.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.field_test_import_2.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import_2.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml
diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.test_bundle.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml
similarity index 100%
rename from core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.test_bundle.field_test_import_2.yml
rename to core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml
diff --git a/core/modules/field_ui/config/field_ui.settings.yml b/core/modules/field_ui/config/install/field_ui.settings.yml
similarity index 100%
rename from core/modules/field_ui/config/field_ui.settings.yml
rename to core/modules/field_ui/config/install/field_ui.settings.yml
diff --git a/core/modules/file/config/file.settings.yml b/core/modules/file/config/install/file.settings.yml
similarity index 100%
rename from core/modules/file/config/file.settings.yml
rename to core/modules/file/config/install/file.settings.yml
diff --git a/core/modules/file/config/views.view.files.yml b/core/modules/file/config/install/views.view.files.yml
similarity index 100%
rename from core/modules/file/config/views.view.files.yml
rename to core/modules/file/config/install/views.view.files.yml
diff --git a/core/modules/filter/config/filter.format.plain_text.yml b/core/modules/filter/config/install/filter.format.plain_text.yml
similarity index 100%
rename from core/modules/filter/config/filter.format.plain_text.yml
rename to core/modules/filter/config/install/filter.format.plain_text.yml
diff --git a/core/modules/filter/config/filter.settings.yml b/core/modules/filter/config/install/filter.settings.yml
similarity index 100%
rename from core/modules/filter/config/filter.settings.yml
rename to core/modules/filter/config/install/filter.settings.yml
diff --git a/core/modules/filter/tests/filter_test/config/filter.format.filter_test.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml
similarity index 100%
rename from core/modules/filter/tests/filter_test/config/filter.format.filter_test.yml
rename to core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml
diff --git a/core/modules/forum/config/entity.form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/entity.form_display.taxonomy_term.forums.default.yml
similarity index 100%
rename from core/modules/forum/config/entity.form_display.taxonomy_term.forums.default.yml
rename to core/modules/forum/config/install/entity.form_display.taxonomy_term.forums.default.yml
diff --git a/core/modules/forum/config/entity.view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/entity.view_display.taxonomy_term.forums.default.yml
similarity index 100%
rename from core/modules/forum/config/entity.view_display.taxonomy_term.forums.default.yml
rename to core/modules/forum/config/install/entity.view_display.taxonomy_term.forums.default.yml
diff --git a/core/modules/forum/config/field.field.taxonomy_term.forum_container.yml b/core/modules/forum/config/install/field.field.taxonomy_term.forum_container.yml
similarity index 100%
rename from core/modules/forum/config/field.field.taxonomy_term.forum_container.yml
rename to core/modules/forum/config/install/field.field.taxonomy_term.forum_container.yml
diff --git a/core/modules/forum/config/field.instance.taxonomy_term.forums.forum_container.yml b/core/modules/forum/config/install/field.instance.taxonomy_term.forums.forum_container.yml
similarity index 100%
rename from core/modules/forum/config/field.instance.taxonomy_term.forums.forum_container.yml
rename to core/modules/forum/config/install/field.instance.taxonomy_term.forums.forum_container.yml
diff --git a/core/modules/forum/config/forum.settings.yml b/core/modules/forum/config/install/forum.settings.yml
similarity index 100%
rename from core/modules/forum/config/forum.settings.yml
rename to core/modules/forum/config/install/forum.settings.yml
diff --git a/core/modules/forum/config/node.type.forum.yml b/core/modules/forum/config/install/node.type.forum.yml
similarity index 100%
rename from core/modules/forum/config/node.type.forum.yml
rename to core/modules/forum/config/install/node.type.forum.yml
diff --git a/core/modules/forum/config/rdf.mapping.node.forum.yml b/core/modules/forum/config/install/rdf.mapping.node.forum.yml
similarity index 100%
rename from core/modules/forum/config/rdf.mapping.node.forum.yml
rename to core/modules/forum/config/install/rdf.mapping.node.forum.yml
diff --git a/core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml b/core/modules/forum/config/install/rdf.mapping.taxonomy_term.forums.yml
similarity index 100%
rename from core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml
rename to core/modules/forum/config/install/rdf.mapping.taxonomy_term.forums.yml
diff --git a/core/modules/forum/config/taxonomy.vocabulary.forums.yml b/core/modules/forum/config/install/taxonomy.vocabulary.forums.yml
similarity index 100%
rename from core/modules/forum/config/taxonomy.vocabulary.forums.yml
rename to core/modules/forum/config/install/taxonomy.vocabulary.forums.yml
diff --git a/core/modules/image/config/image.settings.yml b/core/modules/image/config/install/image.settings.yml
similarity index 100%
rename from core/modules/image/config/image.settings.yml
rename to core/modules/image/config/install/image.settings.yml
diff --git a/core/modules/image/config/image.style.large.yml b/core/modules/image/config/install/image.style.large.yml
similarity index 100%
rename from core/modules/image/config/image.style.large.yml
rename to core/modules/image/config/install/image.style.large.yml
diff --git a/core/modules/image/config/image.style.medium.yml b/core/modules/image/config/install/image.style.medium.yml
similarity index 100%
rename from core/modules/image/config/image.style.medium.yml
rename to core/modules/image/config/install/image.style.medium.yml
diff --git a/core/modules/image/config/image.style.thumbnail.yml b/core/modules/image/config/install/image.style.thumbnail.yml
similarity index 100%
rename from core/modules/image/config/image.style.thumbnail.yml
rename to core/modules/image/config/install/image.style.thumbnail.yml
diff --git a/core/modules/language/config/language.entity.en.yml b/core/modules/language/config/install/language.entity.en.yml
similarity index 100%
rename from core/modules/language/config/language.entity.en.yml
rename to core/modules/language/config/install/language.entity.en.yml
diff --git a/core/modules/language/config/language.entity.und.yml b/core/modules/language/config/install/language.entity.und.yml
similarity index 100%
rename from core/modules/language/config/language.entity.und.yml
rename to core/modules/language/config/install/language.entity.und.yml
diff --git a/core/modules/language/config/language.entity.zxx.yml b/core/modules/language/config/install/language.entity.zxx.yml
similarity index 100%
rename from core/modules/language/config/language.entity.zxx.yml
rename to core/modules/language/config/install/language.entity.zxx.yml
diff --git a/core/modules/language/config/language.mappings.yml b/core/modules/language/config/install/language.mappings.yml
similarity index 100%
rename from core/modules/language/config/language.mappings.yml
rename to core/modules/language/config/install/language.mappings.yml
diff --git a/core/modules/language/config/language.negotiation.yml b/core/modules/language/config/install/language.negotiation.yml
similarity index 100%
rename from core/modules/language/config/language.negotiation.yml
rename to core/modules/language/config/install/language.negotiation.yml
diff --git a/core/modules/language/config/language.types.yml b/core/modules/language/config/install/language.types.yml
similarity index 100%
rename from core/modules/language/config/language.types.yml
rename to core/modules/language/config/install/language.types.yml
diff --git a/core/modules/locale/config/locale.settings.yml b/core/modules/locale/config/install/locale.settings.yml
similarity index 100%
rename from core/modules/locale/config/locale.settings.yml
rename to core/modules/locale/config/install/locale.settings.yml
diff --git a/core/modules/locale/config/tour.tour.locale.yml b/core/modules/locale/config/install/tour.tour.locale.yml
similarity index 100%
rename from core/modules/locale/config/tour.tour.locale.yml
rename to core/modules/locale/config/install/tour.tour.locale.yml
diff --git a/core/modules/locale/tests/modules/locale_test/config/language.config.de.locale_test.translation.yml b/core/modules/locale/tests/modules/locale_test/config/install/language.config.de.locale_test.translation.yml
similarity index 100%
rename from core/modules/locale/tests/modules/locale_test/config/language.config.de.locale_test.translation.yml
rename to core/modules/locale/tests/modules/locale_test/config/install/language.config.de.locale_test.translation.yml
diff --git a/core/modules/locale/tests/modules/locale_test/config/locale_test.no_translation.yml b/core/modules/locale/tests/modules/locale_test/config/install/locale_test.no_translation.yml
similarity index 100%
rename from core/modules/locale/tests/modules/locale_test/config/locale_test.no_translation.yml
rename to core/modules/locale/tests/modules/locale_test/config/install/locale_test.no_translation.yml
diff --git a/core/modules/locale/tests/modules/locale_test/config/locale_test.translation.yml b/core/modules/locale/tests/modules/locale_test/config/install/locale_test.translation.yml
similarity index 100%
rename from core/modules/locale/tests/modules/locale_test/config/locale_test.translation.yml
rename to core/modules/locale/tests/modules/locale_test/config/install/locale_test.translation.yml
diff --git a/core/modules/menu_ui/config/menu_ui.settings.yml b/core/modules/menu_ui/config/install/menu_ui.settings.yml
similarity index 100%
rename from core/modules/menu_ui/config/menu_ui.settings.yml
rename to core/modules/menu_ui/config/install/menu_ui.settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_action_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_action_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_aggregator_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_aggregator_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_book_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_book_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_contact_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_contact_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_dblog_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_dblog_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_field_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_field_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_field_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_file_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_filter_format.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_filter_format.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_forum_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_forum_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_locale_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_menu_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_menu_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_node_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_node_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_search_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_search_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_simpletest_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_simpletest_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_statistics_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_syslog_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_syslog_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_cron.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_cron.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_file.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_file.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_filter.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_filter.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_image.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_image.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_image_gd.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_image_gd.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_maintenance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_maintenance.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_performance.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_rss.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_rss.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_site.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_site.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_system_theme.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_theme.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_system_theme.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_system_theme.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_taxonomy_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_taxonomy_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_text_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_text_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_update_settings.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_user_mail.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
similarity index 100%
rename from core/modules/migrate_drupal/config/migrate.migration.d6_user_role.yml
rename to core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
diff --git a/core/modules/node/config/entity.view_mode.node.full.yml b/core/modules/node/config/install/entity.view_mode.node.full.yml
similarity index 100%
rename from core/modules/node/config/entity.view_mode.node.full.yml
rename to core/modules/node/config/install/entity.view_mode.node.full.yml
diff --git a/core/modules/node/config/entity.view_mode.node.rss.yml b/core/modules/node/config/install/entity.view_mode.node.rss.yml
similarity index 100%
rename from core/modules/node/config/entity.view_mode.node.rss.yml
rename to core/modules/node/config/install/entity.view_mode.node.rss.yml
diff --git a/core/modules/node/config/entity.view_mode.node.search_index.yml b/core/modules/node/config/install/entity.view_mode.node.search_index.yml
similarity index 100%
rename from core/modules/node/config/entity.view_mode.node.search_index.yml
rename to core/modules/node/config/install/entity.view_mode.node.search_index.yml
diff --git a/core/modules/node/config/entity.view_mode.node.search_result.yml b/core/modules/node/config/install/entity.view_mode.node.search_result.yml
similarity index 100%
rename from core/modules/node/config/entity.view_mode.node.search_result.yml
rename to core/modules/node/config/install/entity.view_mode.node.search_result.yml
diff --git a/core/modules/node/config/entity.view_mode.node.teaser.yml b/core/modules/node/config/install/entity.view_mode.node.teaser.yml
similarity index 100%
rename from core/modules/node/config/entity.view_mode.node.teaser.yml
rename to core/modules/node/config/install/entity.view_mode.node.teaser.yml
diff --git a/core/modules/node/config/node.settings.yml b/core/modules/node/config/install/node.settings.yml
similarity index 100%
rename from core/modules/node/config/node.settings.yml
rename to core/modules/node/config/install/node.settings.yml
diff --git a/core/modules/node/config/search.page.node_search.yml b/core/modules/node/config/install/search.page.node_search.yml
similarity index 100%
rename from core/modules/node/config/search.page.node_search.yml
rename to core/modules/node/config/install/search.page.node_search.yml
diff --git a/core/modules/node/config/system.action.node_delete_action.yml b/core/modules/node/config/install/system.action.node_delete_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_delete_action.yml
rename to core/modules/node/config/install/system.action.node_delete_action.yml
diff --git a/core/modules/node/config/system.action.node_make_sticky_action.yml b/core/modules/node/config/install/system.action.node_make_sticky_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_make_sticky_action.yml
rename to core/modules/node/config/install/system.action.node_make_sticky_action.yml
diff --git a/core/modules/node/config/system.action.node_make_unsticky_action.yml b/core/modules/node/config/install/system.action.node_make_unsticky_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_make_unsticky_action.yml
rename to core/modules/node/config/install/system.action.node_make_unsticky_action.yml
diff --git a/core/modules/node/config/system.action.node_promote_action.yml b/core/modules/node/config/install/system.action.node_promote_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_promote_action.yml
rename to core/modules/node/config/install/system.action.node_promote_action.yml
diff --git a/core/modules/node/config/system.action.node_publish_action.yml b/core/modules/node/config/install/system.action.node_publish_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_publish_action.yml
rename to core/modules/node/config/install/system.action.node_publish_action.yml
diff --git a/core/modules/node/config/system.action.node_save_action.yml b/core/modules/node/config/install/system.action.node_save_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_save_action.yml
rename to core/modules/node/config/install/system.action.node_save_action.yml
diff --git a/core/modules/node/config/system.action.node_unpromote_action.yml b/core/modules/node/config/install/system.action.node_unpromote_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_unpromote_action.yml
rename to core/modules/node/config/install/system.action.node_unpromote_action.yml
diff --git a/core/modules/node/config/system.action.node_unpublish_action.yml b/core/modules/node/config/install/system.action.node_unpublish_action.yml
similarity index 100%
rename from core/modules/node/config/system.action.node_unpublish_action.yml
rename to core/modules/node/config/install/system.action.node_unpublish_action.yml
diff --git a/core/modules/node/config/views.view.archive.yml b/core/modules/node/config/install/views.view.archive.yml
similarity index 100%
rename from core/modules/node/config/views.view.archive.yml
rename to core/modules/node/config/install/views.view.archive.yml
diff --git a/core/modules/node/config/views.view.content.yml b/core/modules/node/config/install/views.view.content.yml
similarity index 100%
rename from core/modules/node/config/views.view.content.yml
rename to core/modules/node/config/install/views.view.content.yml
diff --git a/core/modules/node/config/views.view.content_recent.yml b/core/modules/node/config/install/views.view.content_recent.yml
similarity index 100%
rename from core/modules/node/config/views.view.content_recent.yml
rename to core/modules/node/config/install/views.view.content_recent.yml
diff --git a/core/modules/node/config/views.view.frontpage.yml b/core/modules/node/config/install/views.view.frontpage.yml
similarity index 100%
rename from core/modules/node/config/views.view.frontpage.yml
rename to core/modules/node/config/install/views.view.frontpage.yml
diff --git a/core/modules/node/config/views.view.glossary.yml b/core/modules/node/config/install/views.view.glossary.yml
similarity index 100%
rename from core/modules/node/config/views.view.glossary.yml
rename to core/modules/node/config/install/views.view.glossary.yml
diff --git a/core/modules/node/tests/modules/node_test_config/config/node.type.default.yml b/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml
similarity index 100%
rename from core/modules/node/tests/modules/node_test_config/config/node.type.default.yml
rename to core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml
diff --git a/core/modules/rest/config/rest.settings.yml b/core/modules/rest/config/install/rest.settings.yml
similarity index 100%
rename from core/modules/rest/config/rest.settings.yml
rename to core/modules/rest/config/install/rest.settings.yml
diff --git a/core/modules/search/config/search.settings.yml b/core/modules/search/config/install/search.settings.yml
similarity index 100%
rename from core/modules/search/config/search.settings.yml
rename to core/modules/search/config/install/search.settings.yml
diff --git a/core/modules/search/tests/modules/search_extra_type/config/search.page.dummy_search_type.yml b/core/modules/search/tests/modules/search_extra_type/config/install/search.page.dummy_search_type.yml
similarity index 100%
rename from core/modules/search/tests/modules/search_extra_type/config/search.page.dummy_search_type.yml
rename to core/modules/search/tests/modules/search_extra_type/config/install/search.page.dummy_search_type.yml
diff --git a/core/modules/shortcut/config/shortcut.set.default.yml b/core/modules/shortcut/config/install/shortcut.set.default.yml
similarity index 100%
rename from core/modules/shortcut/config/shortcut.set.default.yml
rename to core/modules/shortcut/config/install/shortcut.set.default.yml
diff --git a/core/modules/simpletest/config/simpletest.settings.yml b/core/modules/simpletest/config/install/simpletest.settings.yml
similarity index 100%
rename from core/modules/simpletest/config/simpletest.settings.yml
rename to core/modules/simpletest/config/install/simpletest.settings.yml
diff --git a/core/modules/statistics/config/statistics.settings.yml b/core/modules/statistics/config/install/statistics.settings.yml
similarity index 100%
rename from core/modules/statistics/config/statistics.settings.yml
rename to core/modules/statistics/config/install/statistics.settings.yml
diff --git a/core/modules/syslog/config/syslog.settings.yml b/core/modules/syslog/config/install/syslog.settings.yml
similarity index 100%
rename from core/modules/syslog/config/syslog.settings.yml
rename to core/modules/syslog/config/install/syslog.settings.yml
diff --git a/core/modules/system/config/system.authorize.yml b/core/modules/system/config/install/system.authorize.yml
similarity index 100%
rename from core/modules/system/config/system.authorize.yml
rename to core/modules/system/config/install/system.authorize.yml
diff --git a/core/modules/system/config/system.cron.yml b/core/modules/system/config/install/system.cron.yml
similarity index 100%
rename from core/modules/system/config/system.cron.yml
rename to core/modules/system/config/install/system.cron.yml
diff --git a/core/modules/system/config/system.date.yml b/core/modules/system/config/install/system.date.yml
similarity index 100%
rename from core/modules/system/config/system.date.yml
rename to core/modules/system/config/install/system.date.yml
diff --git a/core/modules/system/config/system.date_format.fallback.yml b/core/modules/system/config/install/system.date_format.fallback.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.fallback.yml
rename to core/modules/system/config/install/system.date_format.fallback.yml
diff --git a/core/modules/system/config/system.date_format.html_date.yml b/core/modules/system/config/install/system.date_format.html_date.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_date.yml
rename to core/modules/system/config/install/system.date_format.html_date.yml
diff --git a/core/modules/system/config/system.date_format.html_datetime.yml b/core/modules/system/config/install/system.date_format.html_datetime.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_datetime.yml
rename to core/modules/system/config/install/system.date_format.html_datetime.yml
diff --git a/core/modules/system/config/system.date_format.html_month.yml b/core/modules/system/config/install/system.date_format.html_month.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_month.yml
rename to core/modules/system/config/install/system.date_format.html_month.yml
diff --git a/core/modules/system/config/system.date_format.html_time.yml b/core/modules/system/config/install/system.date_format.html_time.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_time.yml
rename to core/modules/system/config/install/system.date_format.html_time.yml
diff --git a/core/modules/system/config/system.date_format.html_week.yml b/core/modules/system/config/install/system.date_format.html_week.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_week.yml
rename to core/modules/system/config/install/system.date_format.html_week.yml
diff --git a/core/modules/system/config/system.date_format.html_year.yml b/core/modules/system/config/install/system.date_format.html_year.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_year.yml
rename to core/modules/system/config/install/system.date_format.html_year.yml
diff --git a/core/modules/system/config/system.date_format.html_yearless_date.yml b/core/modules/system/config/install/system.date_format.html_yearless_date.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.html_yearless_date.yml
rename to core/modules/system/config/install/system.date_format.html_yearless_date.yml
diff --git a/core/modules/system/config/system.date_format.long.yml b/core/modules/system/config/install/system.date_format.long.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.long.yml
rename to core/modules/system/config/install/system.date_format.long.yml
diff --git a/core/modules/system/config/system.date_format.medium.yml b/core/modules/system/config/install/system.date_format.medium.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.medium.yml
rename to core/modules/system/config/install/system.date_format.medium.yml
diff --git a/core/modules/system/config/system.date_format.short.yml b/core/modules/system/config/install/system.date_format.short.yml
similarity index 100%
rename from core/modules/system/config/system.date_format.short.yml
rename to core/modules/system/config/install/system.date_format.short.yml
diff --git a/core/modules/system/config/system.file.yml b/core/modules/system/config/install/system.file.yml
similarity index 100%
rename from core/modules/system/config/system.file.yml
rename to core/modules/system/config/install/system.file.yml
diff --git a/core/modules/system/config/system.filter.yml b/core/modules/system/config/install/system.filter.yml
similarity index 100%
rename from core/modules/system/config/system.filter.yml
rename to core/modules/system/config/install/system.filter.yml
diff --git a/core/modules/system/config/system.image.gd.yml b/core/modules/system/config/install/system.image.gd.yml
similarity index 100%
rename from core/modules/system/config/system.image.gd.yml
rename to core/modules/system/config/install/system.image.gd.yml
diff --git a/core/modules/system/config/system.image.yml b/core/modules/system/config/install/system.image.yml
similarity index 100%
rename from core/modules/system/config/system.image.yml
rename to core/modules/system/config/install/system.image.yml
diff --git a/core/modules/system/config/system.logging.yml b/core/modules/system/config/install/system.logging.yml
similarity index 100%
rename from core/modules/system/config/system.logging.yml
rename to core/modules/system/config/install/system.logging.yml
diff --git a/core/modules/system/config/system.mail.yml b/core/modules/system/config/install/system.mail.yml
similarity index 100%
rename from core/modules/system/config/system.mail.yml
rename to core/modules/system/config/install/system.mail.yml
diff --git a/core/modules/system/config/system.maintenance.yml b/core/modules/system/config/install/system.maintenance.yml
similarity index 100%
rename from core/modules/system/config/system.maintenance.yml
rename to core/modules/system/config/install/system.maintenance.yml
diff --git a/core/modules/system/config/system.menu.account.yml b/core/modules/system/config/install/system.menu.account.yml
similarity index 100%
rename from core/modules/system/config/system.menu.account.yml
rename to core/modules/system/config/install/system.menu.account.yml
diff --git a/core/modules/system/config/system.menu.admin.yml b/core/modules/system/config/install/system.menu.admin.yml
similarity index 100%
rename from core/modules/system/config/system.menu.admin.yml
rename to core/modules/system/config/install/system.menu.admin.yml
diff --git a/core/modules/system/config/system.menu.footer.yml b/core/modules/system/config/install/system.menu.footer.yml
similarity index 100%
rename from core/modules/system/config/system.menu.footer.yml
rename to core/modules/system/config/install/system.menu.footer.yml
diff --git a/core/modules/system/config/system.menu.main.yml b/core/modules/system/config/install/system.menu.main.yml
similarity index 100%
rename from core/modules/system/config/system.menu.main.yml
rename to core/modules/system/config/install/system.menu.main.yml
diff --git a/core/modules/system/config/system.menu.tools.yml b/core/modules/system/config/install/system.menu.tools.yml
similarity index 100%
rename from core/modules/system/config/system.menu.tools.yml
rename to core/modules/system/config/install/system.menu.tools.yml
diff --git a/core/modules/system/config/system.menu.yml b/core/modules/system/config/install/system.menu.yml
similarity index 100%
rename from core/modules/system/config/system.menu.yml
rename to core/modules/system/config/install/system.menu.yml
diff --git a/core/modules/system/config/system.performance.yml b/core/modules/system/config/install/system.performance.yml
similarity index 100%
rename from core/modules/system/config/system.performance.yml
rename to core/modules/system/config/install/system.performance.yml
diff --git a/core/modules/system/config/system.rss.yml b/core/modules/system/config/install/system.rss.yml
similarity index 100%
rename from core/modules/system/config/system.rss.yml
rename to core/modules/system/config/install/system.rss.yml
diff --git a/core/modules/system/config/system.site.yml b/core/modules/system/config/install/system.site.yml
similarity index 100%
rename from core/modules/system/config/system.site.yml
rename to core/modules/system/config/install/system.site.yml
diff --git a/core/modules/system/config/system.theme.global.yml b/core/modules/system/config/install/system.theme.global.yml
similarity index 100%
rename from core/modules/system/config/system.theme.global.yml
rename to core/modules/system/config/install/system.theme.global.yml
diff --git a/core/modules/system/config/system.theme.yml b/core/modules/system/config/install/system.theme.yml
similarity index 100%
rename from core/modules/system/config/system.theme.yml
rename to core/modules/system/config/install/system.theme.yml
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
index 12ee30c..0ce14fe 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Module;
 
+use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Config\FileStorage;
 use Drupal\simpletest\WebTestBase;
@@ -95,7 +96,7 @@ function assertModuleTablesDoNotExist($module) {
    *   TRUE if configuration has been installed, FALSE otherwise.
    */
   function assertModuleConfig($module) {
-    $module_config_dir = drupal_get_path('module', $module) . '/config';
+    $module_config_dir = drupal_get_path('module', $module) . '/'. InstallStorage::CONFIG_INSTALL_DIRECTORY;
     if (!is_dir($module_config_dir)) {
       return;
     }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php
index 8593bae..a398e5f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Theme;
 
+use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\simpletest\DrupalUnitTestBase;
 
@@ -54,7 +55,7 @@ function setUp() {
   function testDefaultConfig() {
     $name = 'test_basetheme';
     $path = $this->availableThemes[$name]->getPath();
-    $this->assertTrue(file_exists("$path/config/$name.settings.yml"));
+    $this->assertTrue(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
     $this->container->get('theme_handler')->enable(array($name));
     $this->assertIdentical(theme_get_setting('base', $name), 'only');
   }
@@ -65,7 +66,7 @@ function testDefaultConfig() {
   function testNoDefaultConfig() {
     $name = 'stark';
     $path = $this->availableThemes[$name]->getPath();
-    $this->assertFalse(file_exists("$path/config/$name.settings.yml"));
+    $this->assertFalse(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
     $this->container->get('theme_handler')->enable(array($name));
     $this->assertNotNull(theme_get_setting('features.favicon', $name));
   }
diff --git a/core/modules/system/tests/modules/entity_test/config/entity.view_mode.entity_test.full.yml b/core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.full.yml
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/config/entity.view_mode.entity_test.full.yml
rename to core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.full.yml
diff --git a/core/modules/system/tests/modules/entity_test/config/entity.view_mode.entity_test.test.yml b/core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.test.yml
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/config/entity.view_mode.entity_test.test.yml
rename to core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.test.yml
diff --git a/core/modules/system/tests/modules/image_test/config/system.image.test_toolkit.yml b/core/modules/system/tests/modules/image_test/config/install/system.image.test_toolkit.yml
similarity index 100%
rename from core/modules/system/tests/modules/image_test/config/system.image.test_toolkit.yml
rename to core/modules/system/tests/modules/image_test/config/install/system.image.test_toolkit.yml
diff --git a/core/modules/system/tests/modules/menu_test/config/language.config.nl.menu_test.menu_item.yml b/core/modules/system/tests/modules/menu_test/config/install/language.config.nl.menu_test.menu_item.yml
similarity index 100%
rename from core/modules/system/tests/modules/menu_test/config/language.config.nl.menu_test.menu_item.yml
rename to core/modules/system/tests/modules/menu_test/config/install/language.config.nl.menu_test.menu_item.yml
diff --git a/core/modules/system/tests/modules/menu_test/config/menu_test.menu_item.yml b/core/modules/system/tests/modules/menu_test/config/install/menu_test.menu_item.yml
similarity index 100%
rename from core/modules/system/tests/modules/menu_test/config/menu_test.menu_item.yml
rename to core/modules/system/tests/modules/menu_test/config/install/menu_test.menu_item.yml
diff --git a/core/modules/system/tests/modules/update_script_test/config/update_script_test.settings.yml b/core/modules/system/tests/modules/update_script_test/config/install/update_script_test.settings.yml
similarity index 100%
rename from core/modules/system/tests/modules/update_script_test/config/update_script_test.settings.yml
rename to core/modules/system/tests/modules/update_script_test/config/install/update_script_test.settings.yml
diff --git a/core/modules/system/tests/themes/test_basetheme/config/test_basetheme.settings.yml b/core/modules/system/tests/themes/test_basetheme/config/install/test_basetheme.settings.yml
similarity index 100%
rename from core/modules/system/tests/themes/test_basetheme/config/test_basetheme.settings.yml
rename to core/modules/system/tests/themes/test_basetheme/config/install/test_basetheme.settings.yml
diff --git a/core/modules/taxonomy/config/entity.view_mode.taxonomy_term.full.yml b/core/modules/taxonomy/config/install/entity.view_mode.taxonomy_term.full.yml
similarity index 100%
rename from core/modules/taxonomy/config/entity.view_mode.taxonomy_term.full.yml
rename to core/modules/taxonomy/config/install/entity.view_mode.taxonomy_term.full.yml
diff --git a/core/modules/taxonomy/config/taxonomy.settings.yml b/core/modules/taxonomy/config/install/taxonomy.settings.yml
similarity index 100%
rename from core/modules/taxonomy/config/taxonomy.settings.yml
rename to core/modules/taxonomy/config/install/taxonomy.settings.yml
diff --git a/core/modules/taxonomy/config/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
similarity index 100%
rename from core/modules/taxonomy/config/views.view.taxonomy_term.yml
rename to core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
diff --git a/core/modules/text/config/text.settings.yml b/core/modules/text/config/install/text.settings.yml
similarity index 100%
rename from core/modules/text/config/text.settings.yml
rename to core/modules/text/config/install/text.settings.yml
diff --git a/core/modules/toolbar/config/breakpoint.breakpoint.module.toolbar.narrow.yml b/core/modules/toolbar/config/install/breakpoint.breakpoint.module.toolbar.narrow.yml
similarity index 100%
rename from core/modules/toolbar/config/breakpoint.breakpoint.module.toolbar.narrow.yml
rename to core/modules/toolbar/config/install/breakpoint.breakpoint.module.toolbar.narrow.yml
diff --git a/core/modules/toolbar/config/breakpoint.breakpoint.module.toolbar.standard.yml b/core/modules/toolbar/config/install/breakpoint.breakpoint.module.toolbar.standard.yml
similarity index 100%
rename from core/modules/toolbar/config/breakpoint.breakpoint.module.toolbar.standard.yml
rename to core/modules/toolbar/config/install/breakpoint.breakpoint.module.toolbar.standard.yml
diff --git a/core/modules/toolbar/config/breakpoint.breakpoint.module.toolbar.wide.yml b/core/modules/toolbar/config/install/breakpoint.breakpoint.module.toolbar.wide.yml
similarity index 100%
rename from core/modules/toolbar/config/breakpoint.breakpoint.module.toolbar.wide.yml
rename to core/modules/toolbar/config/install/breakpoint.breakpoint.module.toolbar.wide.yml
diff --git a/core/modules/toolbar/config/breakpoint.breakpoint_group.module.toolbar.toolbar.yml b/core/modules/toolbar/config/install/breakpoint.breakpoint_group.module.toolbar.toolbar.yml
similarity index 100%
rename from core/modules/toolbar/config/breakpoint.breakpoint_group.module.toolbar.toolbar.yml
rename to core/modules/toolbar/config/install/breakpoint.breakpoint_group.module.toolbar.toolbar.yml
diff --git a/core/modules/tour/tests/tour_test/config/language.config.it.tour.tour.tour-test.yml b/core/modules/tour/tests/tour_test/config/install/language.config.it.tour.tour.tour-test.yml
similarity index 100%
rename from core/modules/tour/tests/tour_test/config/language.config.it.tour.tour.tour-test.yml
rename to core/modules/tour/tests/tour_test/config/install/language.config.it.tour.tour.tour-test.yml
diff --git a/core/modules/tour/tests/tour_test/config/tour.tour.tour-test-2.yml b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml
similarity index 100%
rename from core/modules/tour/tests/tour_test/config/tour.tour.tour-test-2.yml
rename to core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml
diff --git a/core/modules/tour/tests/tour_test/config/tour.tour.tour-test.yml b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml
similarity index 100%
rename from core/modules/tour/tests/tour_test/config/tour.tour.tour-test.yml
rename to core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml
diff --git a/core/modules/tracker/config/tracker.settings.yml b/core/modules/tracker/config/install/tracker.settings.yml
similarity index 100%
rename from core/modules/tracker/config/tracker.settings.yml
rename to core/modules/tracker/config/install/tracker.settings.yml
diff --git a/core/modules/update/config/update.settings.yml b/core/modules/update/config/install/update.settings.yml
similarity index 100%
rename from core/modules/update/config/update.settings.yml
rename to core/modules/update/config/install/update.settings.yml
diff --git a/core/modules/update/tests/modules/update_test/config/update_test.settings.yml b/core/modules/update/tests/modules/update_test/config/install/update_test.settings.yml
similarity index 100%
rename from core/modules/update/tests/modules/update_test/config/update_test.settings.yml
rename to core/modules/update/tests/modules/update_test/config/install/update_test.settings.yml
diff --git a/core/modules/user/config/entity.form_mode.user.register.yml b/core/modules/user/config/install/entity.form_mode.user.register.yml
similarity index 100%
rename from core/modules/user/config/entity.form_mode.user.register.yml
rename to core/modules/user/config/install/entity.form_mode.user.register.yml
diff --git a/core/modules/user/config/entity.view_mode.user.compact.yml b/core/modules/user/config/install/entity.view_mode.user.compact.yml
similarity index 100%
rename from core/modules/user/config/entity.view_mode.user.compact.yml
rename to core/modules/user/config/install/entity.view_mode.user.compact.yml
diff --git a/core/modules/user/config/entity.view_mode.user.full.yml b/core/modules/user/config/install/entity.view_mode.user.full.yml
similarity index 100%
rename from core/modules/user/config/entity.view_mode.user.full.yml
rename to core/modules/user/config/install/entity.view_mode.user.full.yml
diff --git a/core/modules/user/config/rdf.mapping.user.user.yml b/core/modules/user/config/install/rdf.mapping.user.user.yml
similarity index 100%
rename from core/modules/user/config/rdf.mapping.user.user.yml
rename to core/modules/user/config/install/rdf.mapping.user.user.yml
diff --git a/core/modules/user/config/search.page.user_search.yml b/core/modules/user/config/install/search.page.user_search.yml
similarity index 100%
rename from core/modules/user/config/search.page.user_search.yml
rename to core/modules/user/config/install/search.page.user_search.yml
diff --git a/core/modules/user/config/system.action.user_block_user_action.yml b/core/modules/user/config/install/system.action.user_block_user_action.yml
similarity index 100%
rename from core/modules/user/config/system.action.user_block_user_action.yml
rename to core/modules/user/config/install/system.action.user_block_user_action.yml
diff --git a/core/modules/user/config/system.action.user_cancel_user_action.yml b/core/modules/user/config/install/system.action.user_cancel_user_action.yml
similarity index 100%
rename from core/modules/user/config/system.action.user_cancel_user_action.yml
rename to core/modules/user/config/install/system.action.user_cancel_user_action.yml
diff --git a/core/modules/user/config/system.action.user_unblock_user_action.yml b/core/modules/user/config/install/system.action.user_unblock_user_action.yml
similarity index 100%
rename from core/modules/user/config/system.action.user_unblock_user_action.yml
rename to core/modules/user/config/install/system.action.user_unblock_user_action.yml
diff --git a/core/modules/user/config/user.flood.yml b/core/modules/user/config/install/user.flood.yml
similarity index 100%
rename from core/modules/user/config/user.flood.yml
rename to core/modules/user/config/install/user.flood.yml
diff --git a/core/modules/user/config/user.mail.yml b/core/modules/user/config/install/user.mail.yml
similarity index 100%
rename from core/modules/user/config/user.mail.yml
rename to core/modules/user/config/install/user.mail.yml
diff --git a/core/modules/user/config/user.role.anonymous.yml b/core/modules/user/config/install/user.role.anonymous.yml
similarity index 100%
rename from core/modules/user/config/user.role.anonymous.yml
rename to core/modules/user/config/install/user.role.anonymous.yml
diff --git a/core/modules/user/config/user.role.authenticated.yml b/core/modules/user/config/install/user.role.authenticated.yml
similarity index 100%
rename from core/modules/user/config/user.role.authenticated.yml
rename to core/modules/user/config/install/user.role.authenticated.yml
diff --git a/core/modules/user/config/user.settings.yml b/core/modules/user/config/install/user.settings.yml
similarity index 100%
rename from core/modules/user/config/user.settings.yml
rename to core/modules/user/config/install/user.settings.yml
diff --git a/core/modules/user/config/views.view.user_admin_people.yml b/core/modules/user/config/install/views.view.user_admin_people.yml
similarity index 100%
rename from core/modules/user/config/views.view.user_admin_people.yml
rename to core/modules/user/config/install/views.view.user_admin_people.yml
diff --git a/core/modules/user/config/views.view.who_s_new.yml b/core/modules/user/config/install/views.view.who_s_new.yml
similarity index 100%
rename from core/modules/user/config/views.view.who_s_new.yml
rename to core/modules/user/config/install/views.view.who_s_new.yml
diff --git a/core/modules/user/config/views.view.who_s_online.yml b/core/modules/user/config/install/views.view.who_s_online.yml
similarity index 100%
rename from core/modules/user/config/views.view.who_s_online.yml
rename to core/modules/user/config/install/views.view.who_s_online.yml
diff --git a/core/modules/views/config/views.settings.yml b/core/modules/views/config/install/views.settings.yml
similarity index 100%
rename from core/modules/views/config/views.settings.yml
rename to core/modules/views/config/install/views.settings.yml
diff --git a/core/modules/views_ui/config/tour.tour.views-ui.yml b/core/modules/views_ui/config/install/tour.tour.views-ui.yml
similarity index 100%
rename from core/modules/views_ui/config/tour.tour.views-ui.yml
rename to core/modules/views_ui/config/install/tour.tour.views-ui.yml
diff --git a/core/profiles/minimal/config/block.block.stark_admin.yml b/core/profiles/minimal/config/install/block.block.stark_admin.yml
similarity index 100%
rename from core/profiles/minimal/config/block.block.stark_admin.yml
rename to core/profiles/minimal/config/install/block.block.stark_admin.yml
diff --git a/core/profiles/minimal/config/block.block.stark_login.yml b/core/profiles/minimal/config/install/block.block.stark_login.yml
similarity index 100%
rename from core/profiles/minimal/config/block.block.stark_login.yml
rename to core/profiles/minimal/config/install/block.block.stark_login.yml
diff --git a/core/profiles/minimal/config/block.block.stark_tools.yml b/core/profiles/minimal/config/install/block.block.stark_tools.yml
similarity index 100%
rename from core/profiles/minimal/config/block.block.stark_tools.yml
rename to core/profiles/minimal/config/install/block.block.stark_tools.yml
diff --git a/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
rename to core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
diff --git a/core/profiles/standard/config/block.block.bartik_content.yml b/core/profiles/standard/config/install/block.block.bartik_content.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_content.yml
rename to core/profiles/standard/config/install/block.block.bartik_content.yml
diff --git a/core/profiles/standard/config/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_footer.yml
rename to core/profiles/standard/config/install/block.block.bartik_footer.yml
diff --git a/core/profiles/standard/config/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_help.yml
rename to core/profiles/standard/config/install/block.block.bartik_help.yml
diff --git a/core/profiles/standard/config/block.block.bartik_login.yml b/core/profiles/standard/config/install/block.block.bartik_login.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_login.yml
rename to core/profiles/standard/config/install/block.block.bartik_login.yml
diff --git a/core/profiles/standard/config/block.block.bartik_powered.yml b/core/profiles/standard/config/install/block.block.bartik_powered.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_powered.yml
rename to core/profiles/standard/config/install/block.block.bartik_powered.yml
diff --git a/core/profiles/standard/config/block.block.bartik_search.yml b/core/profiles/standard/config/install/block.block.bartik_search.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_search.yml
rename to core/profiles/standard/config/install/block.block.bartik_search.yml
diff --git a/core/profiles/standard/config/block.block.bartik_tools.yml b/core/profiles/standard/config/install/block.block.bartik_tools.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.bartik_tools.yml
rename to core/profiles/standard/config/install/block.block.bartik_tools.yml
diff --git a/core/profiles/standard/config/block.block.seven_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.seven_breadcrumbs.yml
rename to core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml
diff --git a/core/profiles/standard/config/block.block.seven_content.yml b/core/profiles/standard/config/install/block.block.seven_content.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.seven_content.yml
rename to core/profiles/standard/config/install/block.block.seven_content.yml
diff --git a/core/profiles/standard/config/block.block.seven_help.yml b/core/profiles/standard/config/install/block.block.seven_help.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.seven_help.yml
rename to core/profiles/standard/config/install/block.block.seven_help.yml
diff --git a/core/profiles/standard/config/block.block.seven_login.yml b/core/profiles/standard/config/install/block.block.seven_login.yml
similarity index 100%
rename from core/profiles/standard/config/block.block.seven_login.yml
rename to core/profiles/standard/config/install/block.block.seven_login.yml
diff --git a/core/profiles/standard/config/editor.editor.basic_html.yml b/core/profiles/standard/config/install/editor.editor.basic_html.yml
similarity index 100%
rename from core/profiles/standard/config/editor.editor.basic_html.yml
rename to core/profiles/standard/config/install/editor.editor.basic_html.yml
diff --git a/core/profiles/standard/config/editor.editor.full_html.yml b/core/profiles/standard/config/install/editor.editor.full_html.yml
similarity index 100%
rename from core/profiles/standard/config/editor.editor.full_html.yml
rename to core/profiles/standard/config/install/editor.editor.full_html.yml
diff --git a/core/profiles/standard/config/entity.form_display.node.article.default.yml b/core/profiles/standard/config/install/entity.form_display.node.article.default.yml
similarity index 100%
rename from core/profiles/standard/config/entity.form_display.node.article.default.yml
rename to core/profiles/standard/config/install/entity.form_display.node.article.default.yml
diff --git a/core/profiles/standard/config/entity.form_display.user.user.default.yml b/core/profiles/standard/config/install/entity.form_display.user.user.default.yml
similarity index 100%
rename from core/profiles/standard/config/entity.form_display.user.user.default.yml
rename to core/profiles/standard/config/install/entity.form_display.user.user.default.yml
diff --git a/core/profiles/standard/config/entity.view_display.node.article.default.yml b/core/profiles/standard/config/install/entity.view_display.node.article.default.yml
similarity index 100%
rename from core/profiles/standard/config/entity.view_display.node.article.default.yml
rename to core/profiles/standard/config/install/entity.view_display.node.article.default.yml
diff --git a/core/profiles/standard/config/entity.view_display.node.article.teaser.yml b/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml
similarity index 100%
rename from core/profiles/standard/config/entity.view_display.node.article.teaser.yml
rename to core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml
diff --git a/core/profiles/standard/config/entity.view_display.user.user.compact.yml b/core/profiles/standard/config/install/entity.view_display.user.user.compact.yml
similarity index 100%
rename from core/profiles/standard/config/entity.view_display.user.user.compact.yml
rename to core/profiles/standard/config/install/entity.view_display.user.user.compact.yml
diff --git a/core/profiles/standard/config/entity.view_display.user.user.default.yml b/core/profiles/standard/config/install/entity.view_display.user.user.default.yml
similarity index 100%
rename from core/profiles/standard/config/entity.view_display.user.user.default.yml
rename to core/profiles/standard/config/install/entity.view_display.user.user.default.yml
diff --git a/core/profiles/standard/config/field.field.node.field_image.yml b/core/profiles/standard/config/install/field.field.node.field_image.yml
similarity index 100%
rename from core/profiles/standard/config/field.field.node.field_image.yml
rename to core/profiles/standard/config/install/field.field.node.field_image.yml
diff --git a/core/profiles/standard/config/field.field.node.field_tags.yml b/core/profiles/standard/config/install/field.field.node.field_tags.yml
similarity index 100%
rename from core/profiles/standard/config/field.field.node.field_tags.yml
rename to core/profiles/standard/config/install/field.field.node.field_tags.yml
diff --git a/core/profiles/standard/config/field.field.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user_picture.yml
similarity index 100%
rename from core/profiles/standard/config/field.field.user.user_picture.yml
rename to core/profiles/standard/config/install/field.field.user.user_picture.yml
diff --git a/core/profiles/standard/config/field.instance.node.article.field_image.yml b/core/profiles/standard/config/install/field.instance.node.article.field_image.yml
similarity index 100%
rename from core/profiles/standard/config/field.instance.node.article.field_image.yml
rename to core/profiles/standard/config/install/field.instance.node.article.field_image.yml
diff --git a/core/profiles/standard/config/field.instance.node.article.field_tags.yml b/core/profiles/standard/config/install/field.instance.node.article.field_tags.yml
similarity index 100%
rename from core/profiles/standard/config/field.instance.node.article.field_tags.yml
rename to core/profiles/standard/config/install/field.instance.node.article.field_tags.yml
diff --git a/core/profiles/standard/config/field.instance.user.user.user_picture.yml b/core/profiles/standard/config/install/field.instance.user.user.user_picture.yml
similarity index 100%
rename from core/profiles/standard/config/field.instance.user.user.user_picture.yml
rename to core/profiles/standard/config/install/field.instance.user.user.user_picture.yml
diff --git a/core/profiles/standard/config/filter.format.basic_html.yml b/core/profiles/standard/config/install/filter.format.basic_html.yml
similarity index 100%
rename from core/profiles/standard/config/filter.format.basic_html.yml
rename to core/profiles/standard/config/install/filter.format.basic_html.yml
diff --git a/core/profiles/standard/config/filter.format.full_html.yml b/core/profiles/standard/config/install/filter.format.full_html.yml
similarity index 100%
rename from core/profiles/standard/config/filter.format.full_html.yml
rename to core/profiles/standard/config/install/filter.format.full_html.yml
diff --git a/core/profiles/standard/config/filter.format.restricted_html.yml b/core/profiles/standard/config/install/filter.format.restricted_html.yml
similarity index 100%
rename from core/profiles/standard/config/filter.format.restricted_html.yml
rename to core/profiles/standard/config/install/filter.format.restricted_html.yml
diff --git a/core/profiles/standard/config/node.type.article.yml b/core/profiles/standard/config/install/node.type.article.yml
similarity index 100%
rename from core/profiles/standard/config/node.type.article.yml
rename to core/profiles/standard/config/install/node.type.article.yml
diff --git a/core/profiles/standard/config/node.type.page.yml b/core/profiles/standard/config/install/node.type.page.yml
similarity index 100%
rename from core/profiles/standard/config/node.type.page.yml
rename to core/profiles/standard/config/install/node.type.page.yml
diff --git a/core/profiles/standard/config/rdf.mapping.comment.node__comment.yml b/core/profiles/standard/config/install/rdf.mapping.comment.node__comment.yml
similarity index 100%
rename from core/profiles/standard/config/rdf.mapping.comment.node__comment.yml
rename to core/profiles/standard/config/install/rdf.mapping.comment.node__comment.yml
diff --git a/core/profiles/standard/config/rdf.mapping.node.article.yml b/core/profiles/standard/config/install/rdf.mapping.node.article.yml
similarity index 100%
rename from core/profiles/standard/config/rdf.mapping.node.article.yml
rename to core/profiles/standard/config/install/rdf.mapping.node.article.yml
diff --git a/core/profiles/standard/config/rdf.mapping.node.page.yml b/core/profiles/standard/config/install/rdf.mapping.node.page.yml
similarity index 100%
rename from core/profiles/standard/config/rdf.mapping.node.page.yml
rename to core/profiles/standard/config/install/rdf.mapping.node.page.yml
diff --git a/core/profiles/standard/config/rdf.mapping.taxonomy_term.tags.yml b/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
similarity index 100%
rename from core/profiles/standard/config/rdf.mapping.taxonomy_term.tags.yml
rename to core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
diff --git a/core/profiles/standard/config/system.cron.yml b/core/profiles/standard/config/install/system.cron.yml
similarity index 100%
rename from core/profiles/standard/config/system.cron.yml
rename to core/profiles/standard/config/install/system.cron.yml
diff --git a/core/profiles/standard/config/taxonomy.vocabulary.tags.yml b/core/profiles/standard/config/install/taxonomy.vocabulary.tags.yml
similarity index 100%
rename from core/profiles/standard/config/taxonomy.vocabulary.tags.yml
rename to core/profiles/standard/config/install/taxonomy.vocabulary.tags.yml
diff --git a/core/profiles/standard/config/user.role.administrator.yml b/core/profiles/standard/config/install/user.role.administrator.yml
similarity index 100%
rename from core/profiles/standard/config/user.role.administrator.yml
rename to core/profiles/standard/config/install/user.role.administrator.yml
diff --git a/core/profiles/testing/config/locale.settings.yml b/core/profiles/testing/config/install/locale.settings.yml
similarity index 100%
rename from core/profiles/testing/config/locale.settings.yml
rename to core/profiles/testing/config/install/locale.settings.yml
diff --git a/core/profiles/testing/config/system.cron.yml b/core/profiles/testing/config/install/system.cron.yml
similarity index 100%
rename from core/profiles/testing/config/system.cron.yml
rename to core/profiles/testing/config/install/system.cron.yml
diff --git a/core/themes/bartik/config/bartik.settings.yml b/core/themes/bartik/config/install/bartik.settings.yml
similarity index 100%
rename from core/themes/bartik/config/bartik.settings.yml
rename to core/themes/bartik/config/install/bartik.settings.yml
diff --git a/core/themes/bartik/config/breakpoint.breakpoint.theme.bartik.mobile.yml b/core/themes/bartik/config/install/breakpoint.breakpoint.theme.bartik.mobile.yml
similarity index 100%
rename from core/themes/bartik/config/breakpoint.breakpoint.theme.bartik.mobile.yml
rename to core/themes/bartik/config/install/breakpoint.breakpoint.theme.bartik.mobile.yml
diff --git a/core/themes/bartik/config/breakpoint.breakpoint.theme.bartik.narrow.yml b/core/themes/bartik/config/install/breakpoint.breakpoint.theme.bartik.narrow.yml
similarity index 100%
rename from core/themes/bartik/config/breakpoint.breakpoint.theme.bartik.narrow.yml
rename to core/themes/bartik/config/install/breakpoint.breakpoint.theme.bartik.narrow.yml
diff --git a/core/themes/bartik/config/breakpoint.breakpoint.theme.bartik.wide.yml b/core/themes/bartik/config/install/breakpoint.breakpoint.theme.bartik.wide.yml
similarity index 100%
rename from core/themes/bartik/config/breakpoint.breakpoint.theme.bartik.wide.yml
rename to core/themes/bartik/config/install/breakpoint.breakpoint.theme.bartik.wide.yml
diff --git a/core/themes/bartik/config/breakpoint.breakpoint_group.theme.bartik.bartik.yml b/core/themes/bartik/config/install/breakpoint.breakpoint_group.theme.bartik.bartik.yml
similarity index 100%
rename from core/themes/bartik/config/breakpoint.breakpoint_group.theme.bartik.bartik.yml
rename to core/themes/bartik/config/install/breakpoint.breakpoint_group.theme.bartik.bartik.yml
diff --git a/core/themes/seven/config/seven.breakpoints.yml b/core/themes/seven/config/install/seven.breakpoints.yml
similarity index 100%
rename from core/themes/seven/config/seven.breakpoints.yml
rename to core/themes/seven/config/install/seven.breakpoints.yml
diff --git a/core/themes/stark/config/stark.breakpoints.yml b/core/themes/stark/config/install/stark.breakpoints.yml
similarity index 100%
rename from core/themes/stark/config/stark.breakpoints.yml
rename to core/themes/stark/config/install/stark.breakpoints.yml