diff --git a/configuration.drush.inc b/configuration.drush.inc
index d005a61..3159709 100644
--- a/configuration.drush.inc
+++ b/configuration.drush.inc
@@ -7,6 +7,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Implements of hook_drush_help()
@@ -179,7 +180,7 @@ function configuration_drush_command() {
  */
 function _get_component_and_identifier() {
   //get all of the components
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   foreach ($handlers as $component => $handler) {
     //get all identifiers from a component
     $identifiers = $handler::getAllIdentifiers($component);
@@ -241,12 +242,12 @@ function _configuration_get_tracked() {
     'Hash',
   );
   //get tracked file
-  $tracked = Configuration::trackedConfigurations();
+  $tracked = ConfigurationManagement::trackedConfigurations();
   //format the result
   foreach ($tracked as $component => $list) {
     foreach ($list as $identifier => $hash) {
       //check status
-      $configuration = Configuration::createConfigurationInstance($component);
+      $configuration = ConfigurationManagement::createConfigurationInstance($component);
       $content[] = array(
         'component' => $component,
         'identifier' => $identifier,
@@ -273,7 +274,7 @@ function _configuration_get_not_tracked() {
     'Component::Machine Name',
     'Identifier',
   );
-  $not_tracked = Configuration::nonTrackedConfigurations();
+  $not_tracked = ConfigurationManagement::nonTrackedConfigurations();
 
   if (empty($not_tracked)) {
     return drush_print('All components have been tracked');
@@ -297,7 +298,7 @@ function _configuration_get_identifiers() {
     }
   }
   $component = array_shift($args);
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   if (empty($handlers[$component])) {
     return drush_set_error('', dt('The component @component is not valid or the module to export the configuration is not installed.', array('@component' => $component)));
   }
@@ -311,7 +312,7 @@ function _configuration_get_identifiers() {
 }
 
 function _configuration_get_components() {
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   $rows = array();
   $rows[] = array(
     'Name',
@@ -338,7 +339,7 @@ function _configuration_export_to_datastore() {
   if (empty($args)) {
     return drush_set_error('', dt('No configurations were selected to export'));
   }
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   foreach ($args as $arg) {
     list($component, $identifier) = explode('.', $arg, 2);
     if (empty($handlers[$component])) {
@@ -354,7 +355,7 @@ function _configuration_export_to_datastore() {
   $export_optionals = !drush_get_option('exclude-optionals');
   $start_tracking = drush_get_option('start-tracking');
 
-  $result = Configuration::exportToDataStore($args, $export_dependencies, $export_optionals, $start_tracking);
+  $result = ConfigurationManagement::exportToDataStore($args, $export_dependencies, $export_optionals, $start_tracking);
   $hashes = $result->getInfo('hash');
   foreach ($result->getInfo('exported') as $id => $exported) {
     $rows[] = array(
@@ -380,7 +381,7 @@ function _configuration_revert_activestore() {
     return drush_set_error('', dt('No configurations were selected to revert'));
   }
 
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   foreach ($args as $arg) {
 
     list($component, $identifier) = explode('.', $arg, 2);
@@ -396,7 +397,7 @@ function _configuration_revert_activestore() {
   $rows = array();
   $revert_dependencies = !drush_get_option('exclude-dependencies');
   $revert_optionals = !drush_get_option('exclude-optionals');
-  $result = Configuration::revertActiveStore($args, $revert_dependencies, $revert_optionals);
+  $result = ConfigurationManagement::revertActiveStore($args, $revert_dependencies, $revert_optionals);
   foreach ($result->getInfo('imported') as $exported) {
     $rows[]['imported'] = $exported;
   }
@@ -418,7 +419,7 @@ function _configuration_start_tracking() {
     return drush_set_error('', dt('No configurations were selected to track'));
   }
 
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   foreach ($args as $arg) {
 
     list($component, $identifier) = explode('.', $arg, 2);
@@ -434,7 +435,7 @@ function _configuration_start_tracking() {
   $rows = array();
   $start_tracking_dependencies = !drush_get_option('exclude-dependencies');
   $start_tracking_optionals = !drush_get_option('exclude-optionals');
-  $result = Configuration::startTracking($args, $start_tracking_dependencies, $start_tracking_optionals);
+  $result = ConfigurationManagement::startTracking($args, $start_tracking_dependencies, $start_tracking_optionals);
   foreach ($result->getInfo('exported') as $tracking) {
     $rows[]['exported'] = $tracking;
   }
@@ -471,7 +472,7 @@ function _configuration_stop_tracking() {
   $rows = array();
   $stop_tracking_dependencies = !drush_get_option('exclude-dependencies');
   $stop_tracking_optionals = !drush_get_option('exclude-optionals');
-  $result = Configuration::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
+  $result = ConfigurationManagement::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
   foreach ($result->getInfo('untracked') as $untracked) {
     $rows[]['untracked'] = $untracked;
   }
@@ -500,7 +501,7 @@ function _configuration_import_load_configurations($action, $args) {
 
   if (drush_get_option(array('skip-enable-modules'), FALSE)) {
     if ($action == 'import') {
-      Configuration::importToActiveStore($args);
+      ConfigurationManagement::importToActiveStore($args);
     }
     else {
       configuration_load_configurations($args);
@@ -510,7 +511,7 @@ function _configuration_import_load_configurations($action, $args) {
     $import_dependencies = !drush_get_option('exclude-dependencies');
     $import_optionals = !drush_get_option('exclude-optionals');
     $start_tracking = drush_get_option('start-tracking');
-    $settings = Configuration::discoverRequiredModules($args, $import_dependencies, $import_optionals);
+    $settings = ConfigurationManagement::discoverRequiredModules($args, $import_dependencies, $import_optionals);
 
     $missing = $settings->getInfo('modules_missing');
     $to_install = $settings->getInfo('modules_to_install');
@@ -535,7 +536,7 @@ function _configuration_import_load_configurations($action, $args) {
         drupal_flush_all_caches();
       }
 
-      $import_results = Configuration::importToActiveStore($args, $import_dependencies, $import_optionals, $start_tracking);
+      $import_results = ConfigurationManagement::importToActiveStore($args, $import_dependencies, $import_optionals, $start_tracking);
       $rows = array();
       foreach ($import_results->getInfo('imported') as $imported) {
         $rows[]['identifier'] = $imported;
diff --git a/configuration.module b/configuration.module
index 6222142..2290403 100644
--- a/configuration.module
+++ b/configuration.module
@@ -51,6 +51,7 @@ define('CONFIGURATION_MODULE_TO_INSTALL', 0x0101);
 define('CONFIGURATION_MODULE_INSTALLED', 0x0102);
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Implements hook_stream_wrappers().
@@ -102,7 +103,7 @@ function configuration_configuration_handlers() {
  *   For $component == 'variable', $identifier = 'comment_controls_article'
  */
 function configuration_backup_to_staging($component, $identifier, $backup_dependencies = TRUE, $backup_optionals = TRUE) {
-  $configuration = Configuration::createConfigurationInstance($component . '.' . $identifier);
+  $configuration = ConfigurationManagement::createConfigurationInstance($component . '.' . $identifier);
   $backuped = array();
   $configuration->backupConfiguration($backuped, $backup_dependencies, $backup_optionals);
   return $backuped;
@@ -112,12 +113,12 @@ function configuration_backup_to_staging($component, $identifier, $backup_depend
  * Load a list of configurations from config:// into the staging area.
  */
 function configuration_load_configurations($list = array()) {
-  $handlers = Configuration::getConfigurationHandler();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   $components = array();
   foreach ($handlers as $component => $handler) {
     $components = array_merge($components, $handler::scanDataStore());
   }
-  $to_load = Configuration::importConfigurations($components, $list, TRUE, TRUE, FALSE);
+  $to_load = ConfigurationManagement::importConfigurations($components, $list, TRUE, TRUE, FALSE);
   foreach ($to_load as $config) {
     $config->saveToStaging();
   }
@@ -133,14 +134,14 @@ function configuration_load_configurations($list = array()) {
  *
  */
 function configuration_import_directory($path, $enable_modules = TRUE) {
-  Configuration::setStream($path);
+  ConfigurationManagement::setStream($path);
 
   $file_content = drupal_substr(file_get_contents($path . 'configurations.inc'), 6);
   // this line creates a $configurations array with a list of components.
   @eval($file_content);
 
   if ($enable_modules) {
-    $settings = Configuration::discoverRequiredModules($configurations);
+    $settings = ConfigurationManagement::discoverRequiredModules($configurations);
     $missing = $settings->getInfo('modules_missing');
     if (count($missing)) {
       $missing = implode(', ', $missing);
@@ -153,7 +154,7 @@ function configuration_import_directory($path, $enable_modules = TRUE) {
     }
   }
 
-  $result = Configuration::importToActiveStore($configurations);
+  $result = ConfigurationManagement::importToActiveStore($configurations);
   $imported = $result->getInfo('imported');
   if (is_array($imported) && count($imported) > 0) {
     return $imported;
diff --git a/lib/Drupal/configuration/Config/Configuration.php b/lib/Drupal/configuration/Config/Configuration.php
index 2cbe861..5264b5b 100644
--- a/lib/Drupal/configuration/Config/Configuration.php
+++ b/lib/Drupal/configuration/Config/Configuration.php
@@ -61,13 +61,6 @@ class Configuration {
    */
   protected $built;
 
-  /**
-   * The stream to use while importing and exporting configurations.
-   *
-   * @var string
-   */
-  static protected $stream = 'config://';
-
   public function __construct($identifier, $component = '') {
     $this->identifier = $identifier;
     $this->storage = static::getStorageInstance($component);
@@ -87,50 +80,16 @@ class Configuration {
   }
 
   /**
-   * Returns a Configuration Object of the type specified in the firt part of
-   * the $configuration_id.
-   *
-   * @param  string $configuration_id
-   *   A string that identified the configuration and its identifier. e.g
-   *   content_type.article
-   */
-  static public function createConfigurationInstance($configuration_id) {
-    list($component_name, $identifier) = explode('.', $configuration_id, 2);
-    $handler = Configuration::getConfigurationHandler($component_name);
-    return new $handler($identifier, $component_name);
-  }
-
-  /**
    * Returns a Storage Object ready to load or write configurations from the
    * disk.
    */
   static protected function getStorageInstance($component) {
     $storage = static::getStorageSystem($component);
     $return = new $storage();
-    $return::setStream(static::$stream);
     return $return;
   }
 
   /**
-   * Returns the current stream used to import and export configurations.
-   * Default value is config://
-   *
-   * @return string
-   */
-  public static function getStream() {
-    return static::$stream;
-  }
-
-  /**
-   * Set the stream to use while importing and exporting configurations.
-   *
-   * @param string $stream
-   */
-  public static function setStream($stream) {
-    static::$stream = $stream;
-  }
-
-  /**
    * Return TRUE if this class can handle multiple configurations componenets.
    */
   static public function multiComponent() {
@@ -145,35 +104,6 @@ class Configuration {
   }
 
   /**
-   * Returns a handler that manages the configurations for the given component.
-   */
-  public static function getConfigurationHandler($component = NULL, $skip_module_checking = FALSE) {
-    static $handlers;
-    static $map;
-    if (!isset($map)) {
-      $map = array();
-    }
-    if (!isset($handlers)) {
-      $handlers = module_invoke_all('configuration_handlers');
-    }
-    foreach ($handlers as $handler) {
-      if ($skip_module_checking || $handler::isActive()) {
-        foreach($handler::supportedComponents() as $component_name) {
-          $map[$component_name] = $handler;
-        }
-      }
-    }
-    if (empty($component)) {
-      return $map;
-    }
-    else {
-      if (!empty($map[$component])) {
-        return $map[$component];
-      }
-    }
-  }
-
-  /**
    * Returns the list of components available in the DataStore.
    */
   public static function scanDataStore($component) {
@@ -284,61 +214,6 @@ class Configuration {
   }
 
   /**
-   * Returns a list of modules required to import the configurations indicated
-   * in $list.
-   *
-   * @param  array   $list
-   *   The list of components that have to will be imported.
-   * @param  boolean $include_dependencies
-   *   If TRUE, modules required to load the dependencies of each configuration
-   *   dependency will be returned too.
-   * @param  boolean $include_optionals
-   *   If TRUE, modules required to load the optionals configurations of each
-   *   configuration will be returned too.
-   * @return ConfigIteratorSettings
-   *   A ConfigIteratorSettings object that contains the required modules to
-   *   install and the modules missing.
-   */
-  static public function discoverRequiredModules($list = array(), $include_dependencies = TRUE, $include_optionals = TRUE) {
-    $settings = new ConfigIteratorSettings(
-      array(
-        'build_callback' => 'loadFromStorage',
-        'callback' => 'discoverModules',
-        'process_dependencies' => $import_dependencies,
-        'process_optionals' => $import_optionals,
-        'info' => array(
-          'modules' => array(),
-          'modules_missing' => array(),
-          'modules_to_install' => array(),
-        )
-      )
-    );
-    foreach ($list as $component) {
-      $config = Configuration::createConfigurationInstance($component);
-
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->loadFromStorage();
-      $config->iterate($settings);
-    }
-
-    $missing = array();
-    $to_install = array();
-    foreach ($settings->getInfo('modules') as $module_name => $status) {
-      if ($status == CONFIGURATION_MODULE_MISSING) {
-        $missing[] = $module_name;
-      }
-      elseif ($status == CONFIGURATION_MODULE_TO_INSTALL) {
-        $to_install[] = $module_name;
-      }
-    }
-    $settings->setInfo('modules_to_install', array_unique($to_install));
-    $settings->setInfo('modules_missing', array_unique($missing));
-
-    return $settings;
-  }
-
-  /**
    * Internal function to discover what modules are required for the current
    * being proccessed configurations.
    *
@@ -352,69 +227,6 @@ class Configuration {
   }
 
   /**
-   * Includes a record of each configuration tracked in the
-   * configuration_staging table and export the configurations to the DataStore.
-   *
-   * @param  array   $list
-   *   The list of components that have to will be tracked.
-   * @param  boolean $track_dependencies
-   *   If TRUE, dependencies of each proccessed configuration will be tracked
-   *   too.
-   * @param  boolean $track_optionals
-   *   If TRUE, optionals configurations of each proccessed configuration will
-   *   be tracked too.
-   * @return ConfigIteratorSettings
-   *   An ConfigIteratorSettings object that contains the tracked
-   *   configurations.
-   */
-  static public function startTracking($list = array(), $track_dependencies = TRUE, $track_optionals = TRUE) {
-    return static::exportToDataStore($list, $track_dependencies, $track_optionals, TRUE);
-  }
-
-  /**
-   * Removes a record of each configuration that is not tracked anymore and
-   * deletes the configuration file in the DataStore.
-   *
-   * @param  array   $list
-   *   The list of components that have to will be tracked.
-   * @param  boolean $track_dependencies
-   *   If TRUE, dependencies of each proccessed configuration will not be
-   *   tracked anymore.
-   * @param  boolean $track_optionals
-   *   If TRUE, optionals configurations of each proccessed configuration will
-   *   not be tracked anymore.
-   * @return ConfigIteratorSettings
-   *   An ConfigIteratorSettings object that contains configurations that are
-   *   not tracked anymore.
-   */
-  static public function stopTracking($list = array(), $stop_track_dependencies = TRUE, $stop_track_optionals = TRUE) {
-    $settings = new ConfigIteratorSettings(
-      array(
-        'build_callback' => 'build',
-        'callback' => 'removeFromStaging',
-        'process_dependencies' => $stop_track_dependencies,
-        'process_optionals' => $stop_track_optionals,
-        'info' => array(
-          'untracked' => array(),
-        )
-      )
-    );
-
-    foreach ($list as $component) {
-      $config = Configuration::createConfigurationInstance($component);
-
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->build();
-      $config->iterate($settings);
-    }
-
-    //@TODO: Delete the file from the DataStore.
-
-    return $settings;
-  }
-
-  /**
    * Removes the configuration record from the configuration_staging table for
    * the current configuration.
    */
@@ -428,51 +240,6 @@ class Configuration {
   }
 
   /**
-   * Loads the configuration from the DataStore into the ActiveStore.
-   *
-   * @param  array   $list
-   *   The list of components that have to will be imported.
-   * @param  boolean $import_dependencies
-   *   If TRUE, dependencies of each proccessed configuration will be imported
-   *   too.
-   * @param  boolean $import_optionals
-   *   If TRUE, optionals configurations of each proccessed configuration will
-   *   be imported too.
-   * @param  boolean $start_tracking
-   *   If TRUE, after import the configuration, it will be also tracked.
-   * @return ConfigIteratorSettings
-   *   An ConfigIteratorSettings object that contains the imported
-   *   configurations.
-   */
-  static public function importToActiveStore($list = array(), $import_dependencies = TRUE, $import_optionals = TRUE, $start_tracking = FALSE) {
-    $settings = new ConfigIteratorSettings(
-      array(
-        'build_callback' => 'loadFromStorage',
-        'callback' => 'import',
-        'process_dependencies' => $import_dependencies,
-        'process_optionals' => $import_optionals,
-        'settings' => array(
-          'start_tracking' => $start_tracking,
-        ),
-        'info' => array(
-          'imported' => array(),
-        )
-      )
-    );
-
-    foreach ($list as $component) {
-      $config = Configuration::createConfigurationInstance($component);
-
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->loadFromStorage();
-      $config->iterate($settings);
-    }
-
-    return $settings;
-  }
-
-  /**
    * Load a configuration from the DataStore and save it into the ActiveStore.
    * This function is called from iterator().
    *
@@ -488,47 +255,6 @@ class Configuration {
   }
 
   /**
-   * Revert configurations configurations of the ActiveStore using the data
-   * of the staging area.
-   *
-   * @param  array   $list
-   *   The list of components that have to will be restored.
-   * @param  boolean $import_dependencies
-   *   If TRUE, dependencies of each proccessed configuration will be restored
-   *   too.
-   * @param  boolean $import_optionals
-   *   If TRUE, optionals configurations of each proccessed configuration will
-   *   be restored too.
-   * @return ConfigIteratorSettings
-   *   An ConfigIteratorSettings object that contains the restored
-   *   configurations.
-   */
-  static public function revertActiveStore($list = array(), $revert_dependencies = TRUE, $revert_optionals = TRUE) {
-    $settings = new ConfigIteratorSettings(
-      array(
-        'build_callback' => 'loadFromStaging',
-        'callback' => 'revert',
-        'process_dependencies' => $revert_dependencies,
-        'process_optionals' => $revert_optionals,
-        'info' => array(
-          'imported' => array(),
-        )
-      )
-    );
-
-    foreach ($list as $component) {
-      $config = Configuration::createConfigurationInstance($component);
-
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->loadFromStaging();
-      $config->iterate($settings);
-    }
-
-    return $settings;
-  }
-
-  /**
    * Revert a configuration from the staging area and save it into the
    * ActiveStore. This function is called from iterator().
    *
@@ -550,56 +276,6 @@ class Configuration {
     // Override
   }
 
-  /**
-   * Export the configuration from the ActiveStore to the DataStore.
-   *
-   * @param  array   $list
-   *   The list of components that have to will be exported.
-   * @param  boolean $import_dependencies
-   *   If TRUE, dependencies of each proccessed configuration will be exported
-   *   too.
-   * @param  boolean $import_optionals
-   *   If TRUE, optionals configurations of each proccessed configuration will
-   *   be exported too.
-   * @param  boolean $star_tracking
-   *   If TRUE, after export the configuration, it will be also tracked.
-   * @return ConfigIteratorSettings
-   *   An ConfigIteratorSettings object that contains the exported
-   *   configurations.
-   */
-  static public function exportToDataStore($list = array(), $export_dependencies = TRUE, $export_optionals = TRUE, $start_tracking = FALSE) {
-    $settings = new ConfigIteratorSettings(
-      array(
-        'build_callback' => 'build',
-        'callback' => 'export',
-        'process_dependencies' => $export_dependencies,
-        'process_optionals' => $export_optionals,
-        'settings' => array(
-          'start_tracking' => $start_tracking,
-        ),
-        'info' => array(
-          'exported' => array(),
-          'hash' => array(),
-        )
-      )
-    );
-
-    foreach ($list as $component) {
-      $config = Configuration::createConfigurationInstance($component);
-
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->build();
-      $config->iterate($settings);
-    }
-
-    if ($start_tracking) {
-      static::updateTrackingFile();
-    }
-
-    return $settings;
-  }
-
   public function export(ConfigIteratorSettings &$settings) {
     $this->build();
 
@@ -623,117 +299,6 @@ class Configuration {
   }
 
   /**
-   * Returns a list of configurations that are currently being tracked.
-   *
-   * @return array
-   */
-  static public function trackedConfigurations() {
-    $tracked = db_select('configuration_staging', 'cs')
-                  ->fields('cs', array('component', 'identifier', 'hash'))
-                  ->execute()
-                  ->fetchAll();
-
-    // Prepare the array to return
-    $handlers = Configuration::getConfigurationHandler();
-    $return = array();
-    foreach ($handlers as $component => $handler) {
-      $return[$component] = array();
-    }
-
-    foreach ($tracked as $object) {
-      // Only return tracked Configurations for supported components.
-      if (isset($return[$object->component])) {
-        $return[$object->component][$object->identifier] = $object->hash;
-      }
-    }
-    return $return;
-  }
-
-  /**
-   * Returns a list of configurations that are not currently being tracked.
-   *
-   * @return array
-   */
-  static public function nonTrackedConfigurations() {
-    $handlers = Configuration::getConfigurationHandler();
-
-    $tracked = Configuration::trackedConfigurations();
-    $non_tracked = array();
-
-    foreach (array_keys($handlers) as $component) {
-      $handler = Configuration::getConfigurationHandler($component);
-      $identifiers = $handler::getAllIdentifiers($component);
-      foreach ($identifiers as $identifier) {
-        if (empty($tracked[$component]) || empty($tracked[$component][$identifier])) {
-          $id = $component . '.' . $identifier;
-          $non_tracked[$component][$identifier] = $id;
-        }
-      }
-    }
-    return $non_tracked;
-  }
-
-  /**
-   * Returns a list of configurations available in the site without distinction
-   * of tracked and not tracked.
-   *
-   * @return array
-   */
-  static public function allConfigurations() {
-    $handlers = configuration_configuration_handlers();
-
-    $tracked = static::trackedConfigurations();
-    $all = array();
-
-    foreach ($handlers as $component => $handler) {
-      $identifiers = Configuration::getAllIdentifiers($component);
-      foreach ($identifiers as $identifier) {
-        $id = $component . '.' . $identifier;
-        if (!empty($tracked[$component][$identifier])) {
-          // Set the hash for the tracked configurations
-          $all[$component][$identifier] = $tracked[$component][$identifier];
-        }
-        else {
-          // Set FALSE for the non tracked configurations
-          $all[$component][$identifier] = FALSE;
-        }
-      }
-    }
-    return $all;
-  }
-
-  /**
-   * This function save into config://tracked.inc file the configurations that
-   * are currently tracked.
-   */
-  static public function updateTrackingFile() {
-    $tracked = static::trackedConfigurations();
-
-    $file = array();
-    foreach ($tracked as $component => $list) {
-      foreach ($list as $identifier => $hash) {
-        $file[$component . '.' . $identifier] = $hash;
-      }
-    }
-    $file_content = "<?php\n\n";
-    $file_content .= "// This file contains the current being tracked configurations.\n\n";
-    $file_content .= '$tracked = ' . var_export($file, TRUE) . ";\n";
-    file_put_contents(static::$stream . 'tracked.inc', $file_content);
-  }
-
-  /**
-   * Returns a list of files that are listed in the config://tracked.inc file.
-   */
-  static public function readTrackingFile() {
-    if (file_exists(static::$stream . 'tracked.inc')) {
-      $file_content = drupal_substr(file_get_contents(static::$stream . 'tracked.inc'), 6);
-      @eval($file_content);
-      return $tracked;
-    }
-    return array();
-  }
-
-  /**
    * Backup the configuration into the Staging Area.
    */
   public function backupConfiguration(&$already_backuped = array(), $backup_dependencies = TRUE, $backup_optionals = TRUE) {
@@ -1000,7 +565,7 @@ class Configuration {
    * to the current configuration that is being exported.
    */
   public function findDependencies() {
-    $handlers = Configuration::getConfigurationHandler();
+    $handlers = ConfigurationManagement::getConfigurationHandler();
     $stack = array();
     // Include this configuration to the stack to avoid add it again
     // in a circular dependency cycle
@@ -1114,55 +679,6 @@ class Configuration {
   }
 
   /**
-   * Download the entire configuration packaged up into tar file
-   */
-  public static function exportAsTar($list = array(), $export_dependencies = TRUE, $export_optionals = TRUE) {
-    $settings = new ConfigIteratorSettings(
-      array(
-        'build_callback' => 'build',
-        'callback' => 'printRaw',
-        'process_dependencies' => $export_dependencies,
-        'process_optionals' => $export_optionals,
-        'info' => array(
-          'exported' => array(),
-          'exported_files' => array(),
-          'hash' => array(),
-        )
-      )
-    );
-
-    $filename = 'configuration.' . time() . '.tar';
-
-    // Clear out output buffer to remove any garbage from tar output.
-    if (ob_get_level()) {
-      ob_end_clean();
-    }
-
-    drupal_add_http_header('Content-type', 'application/x-tar');
-    drupal_add_http_header('Content-Disposition', 'attachment; filename="' . $filename . '"');
-    drupal_send_headers();
-
-    foreach ($list as $component) {
-      $config = Configuration::createConfigurationInstance($component);
-
-      // Make sure the object is built before start to iterate on its
-      // dependencies.
-      $config->build();
-      $config->iterate($settings);
-    }
-
-    $exported = $settings->getInfo('exported');
-    $file_content = "<?php\n\n";
-    $file_content .= "// This file contains the list of configurations contained in this package.\n\n";
-    $file_content .= '$configurations = ' . var_export($exported, TRUE) . ";\n";
-
-    print static::createTarContent("configuration/configurations.inc", $file_content);
-
-    print pack("a1024", "");
-    exit;
-  }
-
-  /**
    * Print the configuration as plain text formatted to use in a tar file.
    *
    * @param  ConfigIteratorSettings $settings
@@ -1191,120 +707,6 @@ class Configuration {
   }
 
   /**
-   * Import configurations from a Tar file.
-   *
-   * @param  StdClass $file
-   *   A file object.
-   * @param  boolean $start_tracking
-   *   If TRUE, all the configurations provided in the Tar file will be imported
-   *   and automatically tracked.
-   *
-   * @return ConfigIteratorSettings
-   *   An ConfigIteratorSettings object that contains the imported
-   *   configurations.
-   */
-  static public function importToActiveStoreFromTar($uri, $start_tracking = FALSE) {
-    $path = 'temporary://';
-
-    $archive = archiver_get_archiver($uri);
-    $files = $archive->listContents();
-    foreach ($files as $filename) {
-      if (is_file($path . $filename)) {
-        file_unmanaged_delete($path . $filename);
-      }
-    }
-
-    $config_temp_path = 'temporary://' . 'config-tmp-' . time();
-    $archive->extract(drupal_realpath($config_temp_path));
-
-    $file_content = drupal_substr(file_get_contents($config_temp_path . '/configuration/configurations.inc'), 6);
-    @eval($file_content);
-
-    static::$stream = $config_temp_path . '/configuration/';
-
-    $settings = static::importToActiveStore($configurations, FALSE, FALSE, $start_tracking);
-
-    static::deteleTempConfigDir($config_temp_path);
-
-    return $settings;
-  }
-
-  static protected function deteleTempConfigDir($dir, $force = FALSE) {
-    // Allow to delete symlinks even if the target doesn't exist.
-    if (!is_link($dir) && !file_exists($dir)) {
-      return TRUE;
-    }
-    if (!is_dir($dir)) {
-      if ($force) {
-        // Force deletion of items with readonly flag.
-        @chmod($dir, 0777);
-      }
-      return unlink($dir);
-    }
-    foreach (scandir($dir) as $item) {
-      if ($item == '.' || $item == '..') {
-        continue;
-      }
-      if ($force) {
-        @chmod($dir, 0777);
-      }
-      if (!static::deteleTempConfigDir($dir . '/' . $item, $force)) {
-        return FALSE;
-      }
-    }
-    if ($force) {
-      // Force deletion of items with readonly flag.
-      @chmod($dir, 0777);
-    }
-    return rmdir($dir);
-  }
-
-  /**
-   * Tar creation function. Written by dmitrig01.
-   *
-   * @param $name
-   *   Filename of the file to be tarred.
-   * @param $contents
-   *   String contents of the file.
-   *
-   * @return
-   *   A string of the tar file contents.
-   */
-  protected static function createTarContent($name, $contents) {
-    $tar = '';
-    $binary_data_first = pack("a100a8a8a8a12A12",
-      $name,
-      '100644 ', // File permissions
-      '   765 ', // UID,
-      '   765 ', // GID,
-      sprintf("%11s ", decoct(drupal_strlen($contents))), // Filesize,
-      sprintf("%11s", decoct(REQUEST_TIME)) // Creation time
-    );
-    $binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12", '', '', '', '', '', '', '', '', '', '');
-
-    $checksum = 0;
-    for ($i = 0; $i < 148; $i++) {
-      $checksum += ord(drupal_substr($binary_data_first, $i, 1));
-    }
-    for ($i = 148; $i < 156; $i++) {
-      $checksum += ord(' ');
-    }
-    for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
-      $checksum += ord(drupal_substr($binary_data_last, $j, 1));
-    }
-
-    $tar .= $binary_data_first;
-    $tar .= pack("a8", sprintf("%6s ", decoct($checksum)));
-    $tar .= $binary_data_last;
-
-    $buffer = str_split($contents, 512);
-    foreach ($buffer as $item) {
-      $tar .= pack("a512", $item);
-    }
-    return $tar;
-  }
-
-  /**
    * This function will exectute a callback function over all the configurations
    * objects that it process.
    *
@@ -1340,7 +742,7 @@ class Configuration {
         else {
           $config = $settings->getFromCache($dependency);
           if (!$config) {
-            $config = Configuration::createConfigurationInstance($dependency);
+            $config = ConfigurationManagement::createConfigurationInstance($dependency);
           }
         }
         $config->{$build_callback}();
@@ -1370,7 +772,7 @@ class Configuration {
         }
         else {
           if (!$config) {
-            $config = Configuration::createConfigurationInstance($optional);
+            $config = ConfigurationManagement::createConfigurationInstance($optional);
           }
         }
         $config->{$build_callback}();
diff --git a/lib/Drupal/configuration/Config/ConfigurationManagement.php b/lib/Drupal/configuration/Config/ConfigurationManagement.php
new file mode 100644
index 0000000..090bdeb
--- /dev/null
+++ b/lib/Drupal/configuration/Config/ConfigurationManagement.php
@@ -0,0 +1,617 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\configuration\Config\Configuration.
+ */
+
+namespace Drupal\configuration\Config;
+
+use \StdClass;
+use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Utils\ConfigIteratorSettings;
+
+class ConfigurationManagement {
+
+  /**
+   * The stream to use while importing and exporting configurations.
+   *
+   * @var string
+   */
+  static protected $stream = 'config://';
+
+  /**
+   * Returns the current stream used to import and export configurations.
+   * Default value is config://
+   *
+   * @return string
+   */
+  public static function getStream() {
+    return static::$stream;
+  }
+
+  /**
+   * Set the stream to use while importing and exporting configurations.
+   *
+   * @param string $stream
+   */
+  public static function setStream($stream) {
+    static::$stream = $stream;
+  }
+
+  /**
+   * Returns a Configuration Object of the type specified in the firt part of
+   * the $configuration_id.
+   *
+   * @param  string $configuration_id
+   *   A string that identified the configuration and its identifier. e.g
+   *   content_type.article
+   */
+  static public function createConfigurationInstance($configuration_id) {
+    list($component_name, $identifier) = explode('.', $configuration_id, 2);
+    $handler = static::getConfigurationHandler($component_name);
+    return new $handler($identifier, $component_name);
+  }
+
+  /**
+   * Returns a handler that manages the configurations for the given component.
+   */
+  public static function getConfigurationHandler($component = NULL, $skip_module_checking = FALSE) {
+    static $handlers;
+    static $map;
+    if (!isset($map)) {
+      $map = array();
+    }
+    if (!isset($handlers)) {
+      $handlers = module_invoke_all('configuration_handlers');
+    }
+    foreach ($handlers as $handler) {
+      if ($skip_module_checking || $handler::isActive()) {
+        foreach($handler::supportedComponents() as $component_name) {
+          $map[$component_name] = $handler;
+        }
+      }
+    }
+    if (empty($component)) {
+      return $map;
+    }
+    else {
+      if (!empty($map[$component])) {
+        return $map[$component];
+      }
+    }
+  }
+
+  /**
+   * Returns a list of modules required to import the configurations indicated
+   * in $list.
+   *
+   * @param  array   $list
+   *   The list of components that have to will be imported.
+   * @param  boolean $include_dependencies
+   *   If TRUE, modules required to load the dependencies of each configuration
+   *   dependency will be returned too.
+   * @param  boolean $include_optionals
+   *   If TRUE, modules required to load the optionals configurations of each
+   *   configuration will be returned too.
+   * @return ConfigIteratorSettings
+   *   A ConfigIteratorSettings object that contains the required modules to
+   *   install and the modules missing.
+   */
+  static public function discoverRequiredModules($list = array(), $include_dependencies = TRUE, $include_optionals = TRUE) {
+    $settings = new ConfigIteratorSettings(
+      array(
+        'build_callback' => 'loadFromStorage',
+        'callback' => 'discoverModules',
+        'process_dependencies' => $import_dependencies,
+        'process_optionals' => $import_optionals,
+        'info' => array(
+          'modules' => array(),
+          'modules_missing' => array(),
+          'modules_to_install' => array(),
+        )
+      )
+    );
+    foreach ($list as $component) {
+      $config = static::createConfigurationInstance($component);
+
+      // Make sure the object is built before start to iterate on its
+      // dependencies.
+      $config->loadFromStorage();
+      $config->iterate($settings);
+    }
+
+    $missing = array();
+    $to_install = array();
+    foreach ($settings->getInfo('modules') as $module_name => $status) {
+      if ($status == CONFIGURATION_MODULE_MISSING) {
+        $missing[] = $module_name;
+      }
+      elseif ($status == CONFIGURATION_MODULE_TO_INSTALL) {
+        $to_install[] = $module_name;
+      }
+    }
+    $settings->setInfo('modules_to_install', array_unique($to_install));
+    $settings->setInfo('modules_missing', array_unique($missing));
+
+    return $settings;
+  }
+
+  /**
+   * Includes a record of each configuration tracked in the
+   * configuration_staging table and export the configurations to the DataStore.
+   *
+   * @param  array   $list
+   *   The list of components that have to will be tracked.
+   * @param  boolean $track_dependencies
+   *   If TRUE, dependencies of each proccessed configuration will be tracked
+   *   too.
+   * @param  boolean $track_optionals
+   *   If TRUE, optionals configurations of each proccessed configuration will
+   *   be tracked too.
+   * @return ConfigIteratorSettings
+   *   An ConfigIteratorSettings object that contains the tracked
+   *   configurations.
+   */
+  static public function startTracking($list = array(), $track_dependencies = TRUE, $track_optionals = TRUE) {
+    return static::exportToDataStore($list, $track_dependencies, $track_optionals, TRUE);
+  }
+
+  /**
+   * Removes a record of each configuration that is not tracked anymore and
+   * deletes the configuration file in the DataStore.
+   *
+   * @param  array   $list
+   *   The list of components that have to will be tracked.
+   * @param  boolean $track_dependencies
+   *   If TRUE, dependencies of each proccessed configuration will not be
+   *   tracked anymore.
+   * @param  boolean $track_optionals
+   *   If TRUE, optionals configurations of each proccessed configuration will
+   *   not be tracked anymore.
+   * @return ConfigIteratorSettings
+   *   An ConfigIteratorSettings object that contains configurations that are
+   *   not tracked anymore.
+   */
+  static public function stopTracking($list = array(), $stop_track_dependencies = TRUE, $stop_track_optionals = TRUE) {
+    $settings = new ConfigIteratorSettings(
+      array(
+        'build_callback' => 'build',
+        'callback' => 'removeFromStaging',
+        'process_dependencies' => $stop_track_dependencies,
+        'process_optionals' => $stop_track_optionals,
+        'info' => array(
+          'untracked' => array(),
+        )
+      )
+    );
+
+    foreach ($list as $component) {
+      $config = static::createConfigurationInstance($component);
+
+      // Make sure the object is built before start to iterate on its
+      // dependencies.
+      $config->build();
+      $config->iterate($settings);
+    }
+
+    //@TODO: Delete the file from the DataStore.
+
+    return $settings;
+  }
+
+  /**
+   * Loads the configuration from the DataStore into the ActiveStore.
+   *
+   * @param  array   $list
+   *   The list of components that have to will be imported.
+   * @param  boolean $import_dependencies
+   *   If TRUE, dependencies of each proccessed configuration will be imported
+   *   too.
+   * @param  boolean $import_optionals
+   *   If TRUE, optionals configurations of each proccessed configuration will
+   *   be imported too.
+   * @param  boolean $start_tracking
+   *   If TRUE, after import the configuration, it will be also tracked.
+   * @return ConfigIteratorSettings
+   *   An ConfigIteratorSettings object that contains the imported
+   *   configurations.
+   */
+  static public function importToActiveStore($list = array(), $import_dependencies = TRUE, $import_optionals = TRUE, $start_tracking = FALSE) {
+    $settings = new ConfigIteratorSettings(
+      array(
+        'build_callback' => 'loadFromStorage',
+        'callback' => 'import',
+        'process_dependencies' => $import_dependencies,
+        'process_optionals' => $import_optionals,
+        'settings' => array(
+          'start_tracking' => $start_tracking,
+        ),
+        'info' => array(
+          'imported' => array(),
+        )
+      )
+    );
+
+    foreach ($list as $component) {
+      $config = static::createConfigurationInstance($component);
+
+      // Make sure the object is built before start to iterate on its
+      // dependencies.
+      $config->loadFromStorage();
+      $config->iterate($settings);
+    }
+
+    return $settings;
+  }
+
+  /**
+   * Revert configurations configurations of the ActiveStore using the data
+   * of the staging area.
+   *
+   * @param  array   $list
+   *   The list of components that have to will be restored.
+   * @param  boolean $import_dependencies
+   *   If TRUE, dependencies of each proccessed configuration will be restored
+   *   too.
+   * @param  boolean $import_optionals
+   *   If TRUE, optionals configurations of each proccessed configuration will
+   *   be restored too.
+   * @return ConfigIteratorSettings
+   *   An ConfigIteratorSettings object that contains the restored
+   *   configurations.
+   */
+  static public function revertActiveStore($list = array(), $revert_dependencies = TRUE, $revert_optionals = TRUE) {
+    $settings = new ConfigIteratorSettings(
+      array(
+        'build_callback' => 'loadFromStaging',
+        'callback' => 'revert',
+        'process_dependencies' => $revert_dependencies,
+        'process_optionals' => $revert_optionals,
+        'info' => array(
+          'imported' => array(),
+        )
+      )
+    );
+
+    foreach ($list as $component) {
+      $config = static::createConfigurationInstance($component);
+
+      // Make sure the object is built before start to iterate on its
+      // dependencies.
+      $config->loadFromStaging();
+      $config->iterate($settings);
+    }
+
+    return $settings;
+  }
+
+  /**
+   * Export the configuration from the ActiveStore to the DataStore.
+   *
+   * @param  array   $list
+   *   The list of components that have to will be exported.
+   * @param  boolean $import_dependencies
+   *   If TRUE, dependencies of each proccessed configuration will be exported
+   *   too.
+   * @param  boolean $import_optionals
+   *   If TRUE, optionals configurations of each proccessed configuration will
+   *   be exported too.
+   * @param  boolean $star_tracking
+   *   If TRUE, after export the configuration, it will be also tracked.
+   * @return ConfigIteratorSettings
+   *   An ConfigIteratorSettings object that contains the exported
+   *   configurations.
+   */
+  static public function exportToDataStore($list = array(), $export_dependencies = TRUE, $export_optionals = TRUE, $start_tracking = FALSE) {
+    $settings = new ConfigIteratorSettings(
+      array(
+        'build_callback' => 'build',
+        'callback' => 'export',
+        'process_dependencies' => $export_dependencies,
+        'process_optionals' => $export_optionals,
+        'settings' => array(
+          'start_tracking' => $start_tracking,
+        ),
+        'info' => array(
+          'exported' => array(),
+          'hash' => array(),
+        )
+      )
+    );
+
+    foreach ($list as $component) {
+      $config = static::createConfigurationInstance($component);
+
+      // Make sure the object is built before start to iterate on its
+      // dependencies.
+      $config->build();
+      $config->iterate($settings);
+    }
+
+    if ($start_tracking) {
+      static::updateTrackingFile();
+    }
+
+    return $settings;
+  }
+
+  /**
+   * Returns a list of configurations that are currently being tracked.
+   *
+   * @return array
+   */
+  static public function trackedConfigurations() {
+    $tracked = db_select('configuration_staging', 'cs')
+                  ->fields('cs', array('component', 'identifier', 'hash'))
+                  ->execute()
+                  ->fetchAll();
+
+    // Prepare the array to return
+    $handlers = static::getConfigurationHandler();
+    $return = array();
+    foreach ($handlers as $component => $handler) {
+      $return[$component] = array();
+    }
+
+    foreach ($tracked as $object) {
+      // Only return tracked Configurations for supported components.
+      if (isset($return[$object->component])) {
+        $return[$object->component][$object->identifier] = $object->hash;
+      }
+    }
+    return $return;
+  }
+
+  /**
+   * Returns a list of configurations that are not currently being tracked.
+   *
+   * @return array
+   */
+  static public function nonTrackedConfigurations() {
+    $handlers = static::getConfigurationHandler();
+
+    $tracked = static::trackedConfigurations();
+    $non_tracked = array();
+
+    foreach (array_keys($handlers) as $component) {
+      $handler = static::getConfigurationHandler($component);
+      $identifiers = $handler::getAllIdentifiers($component);
+      foreach ($identifiers as $identifier) {
+        if (empty($tracked[$component]) || empty($tracked[$component][$identifier])) {
+          $id = $component . '.' . $identifier;
+          $non_tracked[$component][$identifier] = $id;
+        }
+      }
+    }
+    return $non_tracked;
+  }
+
+
+  /**
+   * Returns a list of configurations available in the site without distinction
+   * of tracked and not tracked.
+   *
+   * @return array
+   */
+  static public function allConfigurations() {
+    $handlers = static::getConfigurationHandler();
+
+    $tracked = static::trackedConfigurations();
+    $all = array();
+
+    foreach ($handlers as $component => $handler) {
+      $identifiers = $handler::getAllIdentifiers($component);
+      foreach ($identifiers as $identifier) {
+        $id = $component . '.' . $identifier;
+        if (!empty($tracked[$component][$identifier])) {
+          // Set the hash for the tracked configurations
+          $all[$component][$identifier] = $tracked[$component][$identifier];
+        }
+        else {
+          // Set FALSE for the non tracked configurations
+          $all[$component][$identifier] = FALSE;
+        }
+      }
+    }
+    return $all;
+  }
+
+  /**
+   * This function save into config://tracked.inc file the configurations that
+   * are currently tracked.
+   */
+  static public function updateTrackingFile() {
+    $tracked = static::trackedConfigurations();
+
+    $file = array();
+    foreach ($tracked as $component => $list) {
+      foreach ($list as $identifier => $hash) {
+        $file[$component . '.' . $identifier] = $hash;
+      }
+    }
+    $file_content = "<?php\n\n";
+    $file_content .= "// This file contains the current being tracked configurations.\n\n";
+    $file_content .= '$tracked = ' . var_export($file, TRUE) . ";\n";
+    file_put_contents(static::getStream() . 'tracked.inc', $file_content);
+  }
+
+  /**
+   * Returns a list of files that are listed in the config://tracked.inc file.
+   */
+  static public function readTrackingFile() {
+    if (file_exists(static::getStream() . 'tracked.inc')) {
+      $file_content = drupal_substr(file_get_contents(static::getStream() . 'tracked.inc'), 6);
+      @eval($file_content);
+      return $tracked;
+    }
+    return array();
+  }
+
+  /**
+   * Import configurations from a Tar file.
+   *
+   * @param  StdClass $file
+   *   A file object.
+   * @param  boolean $start_tracking
+   *   If TRUE, all the configurations provided in the Tar file will be imported
+   *   and automatically tracked.
+   *
+   * @return ConfigIteratorSettings
+   *   An ConfigIteratorSettings object that contains the imported
+   *   configurations.
+   */
+  static public function importToActiveStoreFromTar($uri, $start_tracking = FALSE) {
+    $path = 'temporary://';
+
+    $archive = archiver_get_archiver($uri);
+    $files = $archive->listContents();
+    foreach ($files as $filename) {
+      if (is_file($path . $filename)) {
+        file_unmanaged_delete($path . $filename);
+      }
+    }
+
+    $config_temp_path = 'temporary://' . 'config-tmp-' . time();
+    $archive->extract(drupal_realpath($config_temp_path));
+
+    $file_content = drupal_substr(file_get_contents($config_temp_path . '/configuration/configurations.inc'), 6);
+    @eval($file_content);
+
+    $old_stream = static::getStream();
+    static::setStream($config_temp_path . '/configuration/');
+
+    $settings = static::importToActiveStore($configurations, FALSE, FALSE, $start_tracking);
+
+    static::setStream($old_stream);
+
+    static::deteleTempConfigDir($config_temp_path);
+
+    return $settings;
+  }
+
+
+  /**
+   * Download the entire configuration packaged up into tar file
+   */
+  public static function exportAsTar($list = array(), $export_dependencies = TRUE, $export_optionals = TRUE) {
+    $settings = new ConfigIteratorSettings(
+      array(
+        'build_callback' => 'build',
+        'callback' => 'printRaw',
+        'process_dependencies' => $export_dependencies,
+        'process_optionals' => $export_optionals,
+        'info' => array(
+          'exported' => array(),
+          'exported_files' => array(),
+          'hash' => array(),
+        )
+      )
+    );
+
+    $filename = 'configuration.' . time() . '.tar';
+
+    // Clear out output buffer to remove any garbage from tar output.
+    if (ob_get_level()) {
+      ob_end_clean();
+    }
+
+    drupal_add_http_header('Content-type', 'application/x-tar');
+    drupal_add_http_header('Content-Disposition', 'attachment; filename="' . $filename . '"');
+    drupal_send_headers();
+
+    foreach ($list as $component) {
+      $config = static::createConfigurationInstance($component);
+
+      // Make sure the object is built before start to iterate on its
+      // dependencies.
+      $config->build();
+      $config->iterate($settings);
+    }
+
+    $exported = $settings->getInfo('exported');
+    $file_content = "<?php\n\n";
+    $file_content .= "// This file contains the list of configurations contained in this package.\n\n";
+    $file_content .= '$configurations = ' . var_export($exported, TRUE) . ";\n";
+
+    print static::createTarContent("configuration/configurations.inc", $file_content);
+
+    print pack("a1024", "");
+    exit;
+  }
+
+  static protected function deteleTempConfigDir($dir, $force = FALSE) {
+    // Allow to delete symlinks even if the target doesn't exist.
+    if (!is_link($dir) && !file_exists($dir)) {
+      return TRUE;
+    }
+    if (!is_dir($dir)) {
+      if ($force) {
+        // Force deletion of items with readonly flag.
+        @chmod($dir, 0777);
+      }
+      return unlink($dir);
+    }
+    foreach (scandir($dir) as $item) {
+      if ($item == '.' || $item == '..') {
+        continue;
+      }
+      if ($force) {
+        @chmod($dir, 0777);
+      }
+      if (!static::deteleTempConfigDir($dir . '/' . $item, $force)) {
+        return FALSE;
+      }
+    }
+    if ($force) {
+      // Force deletion of items with readonly flag.
+      @chmod($dir, 0777);
+    }
+    return rmdir($dir);
+  }
+
+  /**
+   * Tar creation function. Written by dmitrig01.
+   *
+   * @param $name
+   *   Filename of the file to be tarred.
+   * @param $contents
+   *   String contents of the file.
+   *
+   * @return
+   *   A string of the tar file contents.
+   */
+  protected static function createTarContent($name, $contents) {
+    $tar = '';
+    $binary_data_first = pack("a100a8a8a8a12A12",
+      $name,
+      '100644 ', // File permissions
+      '   765 ', // UID,
+      '   765 ', // GID,
+      sprintf("%11s ", decoct(drupal_strlen($contents))), // Filesize,
+      sprintf("%11s", decoct(REQUEST_TIME)) // Creation time
+    );
+    $binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12", '', '', '', '', '', '', '', '', '', '');
+
+    $checksum = 0;
+    for ($i = 0; $i < 148; $i++) {
+      $checksum += ord(drupal_substr($binary_data_first, $i, 1));
+    }
+    for ($i = 148; $i < 156; $i++) {
+      $checksum += ord(' ');
+    }
+    for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+      $checksum += ord(drupal_substr($binary_data_last, $j, 1));
+    }
+
+    $tar .= $binary_data_first;
+    $tar .= pack("a8", sprintf("%6s ", decoct($checksum)));
+    $tar .= $binary_data_last;
+
+    $buffer = str_split($contents, 512);
+    foreach ($buffer as $item) {
+      $tar .= pack("a512", $item);
+    }
+    return $tar;
+  }
+}
diff --git a/lib/Drupal/configuration/Config/FieldConfiguration.php b/lib/Drupal/configuration/Config/FieldConfiguration.php
index 08dc55f..fa580b7 100644
--- a/lib/Drupal/configuration/Config/FieldConfiguration.php
+++ b/lib/Drupal/configuration/Config/FieldConfiguration.php
@@ -89,11 +89,11 @@ class FieldConfiguration extends Configuration {
 
     $supported_handler = FALSE;
     if ($entity_type == 'node') {
-      $parent_config = Configuration::createConfigurationInstance('content_type.' . $bundle_name);
+      $parent_config = ConfigurationManagement::createConfigurationInstance('content_type.' . $bundle_name);
       $this->addToDependencies($parent_config);
     }
     elseif ($entity_type == 'vocabulary') {
-      $parent_config = Configuration::createConfigurationInstance('vocabulary.' . $bundle_name);
+      $parent_config = ConfigurationManagement::createConfigurationInstance('vocabulary.' . $bundle_name);
       $this->addToDependencies($parent_config);
     }
     parent::findDependencies();
diff --git a/lib/Drupal/configuration/Config/WysiwygConfiguration.php b/lib/Drupal/configuration/Config/WysiwygConfiguration.php
index 66b66ef..ec42768 100644
--- a/lib/Drupal/configuration/Config/WysiwygConfiguration.php
+++ b/lib/Drupal/configuration/Config/WysiwygConfiguration.php
@@ -8,6 +8,7 @@
 namespace Drupal\configuration\Config;
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 use Drupal\configuration\Utils\ConfigIteratorSettings;
 
 class WysiwygConfiguration extends Configuration {
@@ -76,7 +77,7 @@ class WysiwygConfiguration extends Configuration {
 
     $formats = filter_formats();
     if (isset($formats[$format])) {
-      $filter_format = Configuration::createConfigurationInstance('text_format.' . $format);
+      $filter_format = ConfigurationManagement::createConfigurationInstance('text_format.' . $format);
       $this->addToDependencies($filter_format);
     }
 
diff --git a/lib/Drupal/configuration/Storage/Storage.php b/lib/Drupal/configuration/Storage/Storage.php
index 43ecce2..41a5a15 100644
--- a/lib/Drupal/configuration/Storage/Storage.php
+++ b/lib/Drupal/configuration/Storage/Storage.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\configuration\Storage;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 class Storage {
 
@@ -27,14 +28,12 @@ class Storage {
 
   static public $file_extension = '';
 
-  static protected $stream = 'config://';
-
   /**
    * Returns TRUE if the file for a configuration exists
    * in the config:// directory.
    */
   static public function configFileExists($component, $identifier) {
-    return file_exists(static::$stream . $component . '.' . $identifier . '.' . static::$file_extension);
+    return file_exists(ConfigurationManagement::getStream() . $component . '.' . $identifier . '.' . static::$file_extension);
   }
 
   public function __construct() {
@@ -141,11 +140,4 @@ class Storage {
     return $this->hash;
   }
 
-  public static function setStream($stream) {
-    static::$stream = $stream;
-  }
-
-  public static function getStream() {
-    return static::$stream;
-  }
 }
diff --git a/lib/Drupal/configuration/Storage/StoragePhp.php b/lib/Drupal/configuration/Storage/StoragePhp.php
index c3ec4eb..55f62e7 100644
--- a/lib/Drupal/configuration/Storage/StoragePhp.php
+++ b/lib/Drupal/configuration/Storage/StoragePhp.php
@@ -8,6 +8,7 @@
 namespace Drupal\configuration\Storage;
 
 use Drupal\configuration\Storage\Storage;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 class StoragePhp extends Storage {
 
@@ -102,7 +103,7 @@ class StoragePhp extends Storage {
   }
 
   public function save() {
-    file_put_contents(static::$stream . $this->filename, $this->getDataToSave());
+    file_put_contents(ConfigurationManagement::getStream() . $this->filename, $this->getDataToSave());
     return $this;
   }
 
@@ -116,11 +117,11 @@ class StoragePhp extends Storage {
     if (empty($this->loaded)) {
       $this->loaded = TRUE;
       if (empty($file_content)) {
-        if (!file_exists(static::$stream . $this->filename)) {
+        if (!file_exists(ConfigurationManagement::getStream() . $this->filename)) {
           $this->data = NULL;
         }
         else {
-          $file_content = drupal_substr(file_get_contents(static::$stream . $this->filename), 6);
+          $file_content = drupal_substr(file_get_contents(ConfigurationManagement::getStream() . $this->filename), 6);
         }
       }
       if (!empty($file_content)) {
diff --git a/lib/Drupal/configuration/Utils/ConfigIteratorSettings.php b/lib/Drupal/configuration/Utils/ConfigIteratorSettings.php
index 1713438..8ef4ab5 100644
--- a/lib/Drupal/configuration/Utils/ConfigIteratorSettings.php
+++ b/lib/Drupal/configuration/Utils/ConfigIteratorSettings.php
@@ -16,7 +16,7 @@ class ConfigIteratorSettings {
   protected $build_callback;
 
   /**
-   * The Configuration::callback to call on every iteration.
+   * The ConfigurationManagement::callback to call on every iteration.
    */
   protected $callback;
 
diff --git a/tests/configuration.test b/tests/configuration.test
index 2dbedc5..dfb584f 100644
--- a/tests/configuration.test
+++ b/tests/configuration.test
@@ -5,6 +5,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -114,7 +115,7 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
   }
 
   public function testExportToDatastore() {
-    $results = Configuration::exportToDataStore(array('content_type.article'));
+    $results = ConfigurationManagement::exportToDataStore(array('content_type.article'));
     $exported = $results->getInfo('exported');
 
     foreach ($this->configurations as $config) {
@@ -126,11 +127,11 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
   }
 
   public function testStartAndStopTracking() {
-    $results = Configuration::startTracking(array('content_type.article'));
+    $results = ConfigurationManagement::startTracking(array('content_type.article'));
     $exported = $results->getInfo('exported');
 
-    $tracked = Configuration::trackedConfigurations();
-    $non_tracked = Configuration::nonTrackedConfigurations();
+    $tracked = ConfigurationManagement::trackedConfigurations();
+    $non_tracked = ConfigurationManagement::nonTrackedConfigurations();
     foreach ($this->configurations as $id) {
       list($component, $identifier) = explode('.', $id, 2);
       $this->assertTrue(!empty($tracked[$component][$identifier]), t('@id is being tracked', array('@id' => $id)));
@@ -140,12 +141,12 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
     $count_tracked = db_query("SELECT COUNT(component) FROM {configuration_staging}")->fetchField();
     $this->assertTrue($count_tracked == count($exported), t("@num of @total configurations have been tracked.", array('@num' => $count_tracked, '@total' => count($exported))));
 
-    $results = Configuration::stopTracking(array('content_type.article'));
+    $results = ConfigurationManagement::stopTracking(array('content_type.article'));
     $count_tracked = db_query("SELECT COUNT(component) FROM {configuration_staging}")->fetchField();
     $this->assertTrue(empty($count_tracked), "No configurations have been tracked.");
 
-    $tracked = Configuration::trackedConfigurations();
-    $non_tracked = Configuration::nonTrackedConfigurations();
+    $tracked = ConfigurationManagement::trackedConfigurations();
+    $non_tracked = ConfigurationManagement::nonTrackedConfigurations();
     foreach ($this->configurations as $id) {
       list($component, $identifier) = explode('.', $id, 2);
       $this->assertTrue(empty($tracked[$component][$identifier]), t('@id is not being tracked', array('@id' => $id)));
@@ -153,24 +154,24 @@ class ConfigurationApiTest extends ConfigurationWebTestCase {
   }
 
   public function testRevertActiveStore() {
-    $results = Configuration::startTracking(array('content_type.article'));
+    $results = ConfigurationManagement::startTracking(array('content_type.article'));
     $exported = $results->getInfo('exported');
 
-    $handler = Configuration::getConfigurationHandler('content_type');
+    $handler = ConfigurationManagement::getConfigurationHandler('content_type');
 
     $content_types = node_type_get_types();
     $article = $content_types['article'];
     $article->description = 'modified';
     node_type_save($article);
 
-    $modified_config = Configuration::createConfigurationInstance('content_type.article');
-    $original_config = Configuration::createConfigurationInstance('content_type.article');
+    $modified_config = ConfigurationManagement::createConfigurationInstance('content_type.article');
+    $original_config = ConfigurationManagement::createConfigurationInstance('content_type.article');
     $original_config->loadFromStaging();
     $modified_config->loadFromActiveStore();
 
     $this->assertTrue($original_config->getHash() != $modified_config->getHash(), "Hash for content type Article has changed after modify the content type.");
 
-    $results = Configuration::revertActiveStore(array('content_type.article'));
+    $results = ConfigurationManagement::revertActiveStore(array('content_type.article'));
     $modified_config->loadFromActiveStore();
 
     $this->assertTrue($original_config->getHash() == $modified_config->getHash(), "Configuration for content type Article has been reverted.");
@@ -220,7 +221,7 @@ class ConfigurationImportTestCase extends ConfigurationWebTestCase {
     }
 
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $this->configurations = array(
       'variable.node_options_article',
@@ -246,7 +247,7 @@ class ConfigurationImportTestCase extends ConfigurationWebTestCase {
   }
 
   public function testImportToActiveStore() {
-    $results = Configuration::importToActiveStore(array('content_type.article'));
+    $results = ConfigurationManagement::importToActiveStore(array('content_type.article'));
     $imported = $results->getInfo('imported');
 
     foreach ($this->configurations as $config) {
diff --git a/tests/handlers/content_types.test b/tests/handlers/content_types.test
index cae9944..a0479ea 100644
--- a/tests/handlers/content_types.test
+++ b/tests/handlers/content_types.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -45,10 +46,10 @@ class ConfigurationHandlerContentTypeTestCase extends ConfigurationWebTestCase {
 
   public function testImportToActiveStore() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'content_type.article';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -63,7 +64,7 @@ class ConfigurationHandlerContentTypeTestCase extends ConfigurationWebTestCase {
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
 
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
     $type = $this->drupalCreateContentType();
 
@@ -71,7 +72,7 @@ class ConfigurationHandlerContentTypeTestCase extends ConfigurationWebTestCase {
     $this->assertTrue($type_exists, 'The new content type has been created in the database.');
 
     $config = 'content_type.' . $type->type;
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -82,8 +83,8 @@ class ConfigurationHandlerContentTypeTestCase extends ConfigurationWebTestCase {
 
   public function testCheckModifications() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
-    $results = Configuration::importToActiveStore(array('content_type.article'), FALSE, FALSE, TRUE);
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    $results = ConfigurationManagement::importToActiveStore(array('content_type.article'), FALSE, FALSE, TRUE);
 
     drupal_flush_all_caches();
     $non_modified_article = node_type_load('article');
@@ -102,7 +103,7 @@ class ConfigurationHandlerContentTypeTestCase extends ConfigurationWebTestCase {
     $modified_article->description = 'modified';
     node_type_save($modified_article);
 
-    $results = Configuration::revertActiveStore(array('content_type.article'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('content_type.article'), FALSE, FALSE);
 
     drupal_flush_all_caches();
     $modified_article = node_type_load('article');
diff --git a/tests/handlers/field.test b/tests/handlers/field.test
index be662a2..cba789d 100644
--- a/tests/handlers/field.test
+++ b/tests/handlers/field.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -46,13 +47,13 @@ class ConfigurationHandlerFieldTestCase extends ConfigurationWebTestCase {
 
   public function testImportToActiveStore() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'content_type.article';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
 
     $config = 'field.node.body.article';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -79,7 +80,7 @@ class ConfigurationHandlerFieldTestCase extends ConfigurationWebTestCase {
     variable_set('configuration_config_path', $this->datastore_path);
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
     $web_user = $this->drupalCreateUser(
       array(
@@ -99,7 +100,7 @@ class ConfigurationHandlerFieldTestCase extends ConfigurationWebTestCase {
     $this->drupalPost(NULL, array(), t('Save'));
 
     $config = 'field.node.my_field.' . $type->type;
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -118,11 +119,11 @@ class ConfigurationHandlerFieldTestCase extends ConfigurationWebTestCase {
 
     $this->drupalLogin($web_user);
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
-    $results = Configuration::importToActiveStore(array('content_type.article'), FALSE, FALSE, TRUE);
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    $results = ConfigurationManagement::importToActiveStore(array('content_type.article'), FALSE, FALSE, TRUE);
 
     $config = 'field.node.body.article';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE, TRUE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE, TRUE);
 
     $object = db_select('configuration_staging', 'cs')
                         ->fields('cs')
@@ -136,7 +137,7 @@ class ConfigurationHandlerFieldTestCase extends ConfigurationWebTestCase {
     $edit['instance[label]'] = 'Modified';
     $this->drupalPost('admin/structure/types/manage/article/fields/body', $edit, t('Save settings'));
 
-    $results = Configuration::revertActiveStore(array('field.node.body.article'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('field.node.body.article'), FALSE, FALSE);
 
     list($component, $entity_type, $field_name, $bundle) = explode('.', $config);
     $field = field_info_instance($entity_type, $field_name, $bundle);
diff --git a/tests/handlers/image_styles.test b/tests/handlers/image_styles.test
index 56e4f7c..c29ce1b 100644
--- a/tests/handlers/image_styles.test
+++ b/tests/handlers/image_styles.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 use Drupal\configuration\Config\ImageStyleConfiguration;
 
 /**
@@ -45,10 +46,10 @@ class ConfigurationHandlerImageStyleTestCase extends ConfigurationWebTestCase {
 
   public function testImportToActiveStore() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'image_style.custom';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -62,7 +63,7 @@ class ConfigurationHandlerImageStyleTestCase extends ConfigurationWebTestCase {
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
 
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
     $web_user = $this->drupalCreateUser(
       array(
@@ -88,7 +89,7 @@ class ConfigurationHandlerImageStyleTestCase extends ConfigurationWebTestCase {
     $this->assertRaw(t('The image effect was successfully applied.'));
 
     $config = 'image_style.' . $style_name;
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -99,10 +100,10 @@ class ConfigurationHandlerImageStyleTestCase extends ConfigurationWebTestCase {
 
   public function testCheckModifications() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'image_style.custom';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE, TRUE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE, TRUE);
 
     $object = db_select('configuration_staging', 'cs')
                         ->fields('cs')
@@ -149,7 +150,7 @@ class ConfigurationHandlerImageStyleTestCase extends ConfigurationWebTestCase {
     $final_hash = $image_config->loadFromActiveStore()->buildHash()->getHash();
     $this->assertFalse($initial_hash == $final_hash, 'Image Style hash is not the same after modify the image.');
 
-    $results = Configuration::revertActiveStore(array('image_style.custom'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('image_style.custom'), FALSE, FALSE);
 
     drupal_static_reset('image_styles');
     $modified_image_style = image_style_load('custom');
diff --git a/tests/handlers/permissions.test b/tests/handlers/permissions.test
index 4e84b47..3c53901 100644
--- a/tests/handlers/permissions.test
+++ b/tests/handlers/permissions.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -47,9 +48,9 @@ class ConfigurationHandlerPermissionTestCase extends ConfigurationWebTestCase {
     $developer_rid = $this->drupalCreateRole(array(), 'developer');
 
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
     $config = 'permission.administer_content_types';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -64,10 +65,10 @@ class ConfigurationHandlerPermissionTestCase extends ConfigurationWebTestCase {
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
 
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
     $config = 'permission.administer_content_types';
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -82,8 +83,8 @@ class ConfigurationHandlerPermissionTestCase extends ConfigurationWebTestCase {
     $developer_rid = $this->drupalCreateRole(array(), 'developer');
 
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
-    $results = Configuration::importToActiveStore(array('permission.administer_content_types'), FALSE, FALSE, TRUE);
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    $results = ConfigurationManagement::importToActiveStore(array('permission.administer_content_types'), FALSE, FALSE, TRUE);
 
     $object = db_select('configuration_staging', 'cs')
                         ->fields('cs')
@@ -114,7 +115,7 @@ class ConfigurationHandlerPermissionTestCase extends ConfigurationWebTestCase {
 
     $this->assertTrue(empty($current_value), 'Developers cannot administer content types.');
 
-    $results = Configuration::revertActiveStore(array('permission.administer_content_types'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('permission.administer_content_types'), FALSE, FALSE);
 
     $current_value = $this->canDevelopersAdministerContentTypes($developer_rid);
 
diff --git a/tests/handlers/text_formats.test b/tests/handlers/text_formats.test
index 689d597..05f0e0c 100644
--- a/tests/handlers/text_formats.test
+++ b/tests/handlers/text_formats.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -43,10 +44,10 @@ class ConfigurationHandlerTextFormatTestCase extends ConfigurationWebTestCase {
 
   public function testImportToActiveStore() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'text_format.custom';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -59,7 +60,7 @@ class ConfigurationHandlerTextFormatTestCase extends ConfigurationWebTestCase {
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
 
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
     $custom_plain_text_format = array(
       'format' => 'custom_plain_text',
@@ -90,7 +91,7 @@ class ConfigurationHandlerTextFormatTestCase extends ConfigurationWebTestCase {
     $this->assertTrue($format_exists, "The text format was saved in the ActiveStore.");
 
     $config = 'text_format.custom_plain_text';
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -101,10 +102,10 @@ class ConfigurationHandlerTextFormatTestCase extends ConfigurationWebTestCase {
 
   public function testCheckModifications() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'text_format.custom';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE, TRUE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE, TRUE);
 
     $object = db_select('configuration_staging', 'cs')
                         ->fields('cs')
@@ -137,7 +138,7 @@ class ConfigurationHandlerTextFormatTestCase extends ConfigurationWebTestCase {
     $this->assertTrue($modified_filters['filter_html']->settings['allowed_html'] == '<a> <modified>', 'The filter settings for custom text format were modified');
     $this->assertTrue($modified_format->name == 'modified', 'The format name for custom text format was modified');
 
-    $results = Configuration::revertActiveStore(array('text_format.custom'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('text_format.custom'), FALSE, FALSE);
 
     filter_formats_reset();
     $modified_format = filter_format_load('custom');
diff --git a/tests/handlers/variables.test b/tests/handlers/variables.test
index 3df0b91..69ebdf2 100644
--- a/tests/handlers/variables.test
+++ b/tests/handlers/variables.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -43,10 +44,10 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
   public function testImportToActiveStore() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'variable.site_name';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -59,7 +60,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
 
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
     $variable_name = drupal_strtolower($this->randomName());
     variable_set($variable_name, $this->randomName());
@@ -68,7 +69,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
     $this->assertTrue($variable_exists, "The variable was saved in the ActiveStore.");
 
     $config = 'variable.' . $variable_name;
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -79,8 +80,8 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
   public function testCheckModifications() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
-    $results = Configuration::importToActiveStore(array('variable.site_name'), FALSE, FALSE, TRUE);
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    $results = ConfigurationManagement::importToActiveStore(array('variable.site_name'), FALSE, FALSE, TRUE);
 
     $object = db_select('configuration_staging', 'cs')
                         ->fields('cs')
@@ -106,7 +107,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
     $this->assertTrue(variable_get('site_name', '') == 'Modified', 'The variable for site name was modified');
 
-    $results = Configuration::revertActiveStore(array('variable.site_name'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('variable.site_name'), FALSE, FALSE);
 
     $current_value = variable_get('site_name', '');
 
diff --git a/tests/handlers/vocabularies.test b/tests/handlers/vocabularies.test
index cca2a2d..83532c8 100644
--- a/tests/handlers/vocabularies.test
+++ b/tests/handlers/vocabularies.test
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
@@ -44,10 +45,10 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
   public function testImportToActiveStore() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
 
     $config = 'vocabulary.tags';
-    $results = Configuration::importToActiveStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array($config), FALSE, FALSE);
     $imported = $results->getInfo('imported');
     $this->assertTrue(in_array($config, $imported), "Configuration for $config was imported.");
 
@@ -60,7 +61,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
     $config_path = variable_get('configuration_config_path', $this->datastore_path);
     file_prepare_directory($config_path);
 
-    Configuration::setStream($config_path);
+    ConfigurationManagement::setStream($config_path);
 
 
     $vocabulary = new stdClass();
@@ -76,7 +77,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
     $this->assertTrue($vocabulary_exists, "The vocabulary was saved in the ActiveStore.");
 
     $config = 'vocabulary.' . $vocabulary->machine_name;
-    $results = Configuration::exportToDataStore(array($config), FALSE, FALSE);
+    $results = ConfigurationManagement::exportToDataStore(array($config), FALSE, FALSE);
     $exported = $results->getInfo('exported');
     $this->assertTrue(in_array($config, $exported), "Configuration for $config was exported.");
 
@@ -87,8 +88,8 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
   public function testCheckModifications() {
     // Change the path from where the configurations are loaded.
-    Configuration::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
-    $results = Configuration::importToActiveStore(array('vocabulary.tags'), FALSE, FALSE, TRUE);
+    ConfigurationManagement::setStream(drupal_get_path('module', 'configuration') . '/tests/test_configs/');
+    $results = ConfigurationManagement::importToActiveStore(array('vocabulary.tags'), FALSE, FALSE, TRUE);
 
     $object = db_select('configuration_staging', 'cs')
                         ->fields('cs')
@@ -115,7 +116,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
     $this->assertRaw(t('Updated vocabulary %name.', array('%name' => 'Modified')), 'The vocabulary for site name was modified');
 
-    $results = Configuration::revertActiveStore(array('vocabulary.tags'), FALSE, FALSE);
+    $results = ConfigurationManagement::revertActiveStore(array('vocabulary.tags'), FALSE, FALSE);
     $current_vocabulary = taxonomy_vocabulary_load($vid);
 
     $this->assertEqual($original_vocabulary->name, $current_vocabulary->name, 'The vocabulary was suscessfully reverted.');
diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index 309f019..f8ab63e 100644
--- a/ui/configuration_ui.admin.inc
+++ b/ui/configuration_ui.admin.inc
@@ -6,6 +6,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 use Drupal\configuration\Utils\ConfigIteratorSettings;
 
 /**
@@ -23,7 +24,7 @@ function configuration_ui_tracking_form($form, &$form_state) {
     drupal_get_path('module', 'configuration_ui') . '/js/configuration_ui.js'
   );
 
-  $tracked = Configuration::trackedConfigurations();
+  $tracked = ConfigurationManagement::trackedConfigurations();
 
   foreach ($tracked as $component => $list) {
 
@@ -40,7 +41,7 @@ function configuration_ui_tracking_form($form, &$form_state) {
     }
 
     if (!empty($options)) {
-      $handler = Configuration::getConfigurationHandler($component);
+      $handler = ConfigurationManagement::getConfigurationHandler($component);
       $component_exists = TRUE;
       $form[$component] = array(
         '#type' => 'fieldset',
@@ -119,7 +120,7 @@ function configuration_ui_notracking_form($form, &$form_state) {
   $form['#attached']['css'] = array(
     drupal_get_path('module', 'configuration_ui') . '/theme/configuration.css'
   );
-  $non_tracked = Configuration::nonTrackedConfigurations();
+  $non_tracked = ConfigurationManagement::nonTrackedConfigurations();
 
   foreach ($non_tracked as $component => $list) {
     $options = array();
@@ -131,7 +132,7 @@ function configuration_ui_notracking_form($form, &$form_state) {
     }
 
     if (!empty($options)) {
-      $handler = Configuration::getConfigurationHandler($component);
+      $handler = ConfigurationManagement::getConfigurationHandler($component);
       $component_exists = TRUE;
       $form[$component] = array(
         '#type' => 'fieldset',
@@ -193,7 +194,7 @@ function configuration_ui_notracking_form($form, &$form_state) {
  * Menu Callback Form.
  */
 function configuration_ui_config_info($config_id) {
-  $config = Configuration::createConfigurationInstance($config_id);
+  $config = ConfigurationManagement::createConfigurationInstance($config_id);
 
   $config->loadFromActiveStore();
 
@@ -226,7 +227,7 @@ function configuration_ui_activate_form_submit($form, &$form_state) {
   $args = configuration_ui_get_form_components($form, $form_state);
   $revert_dependencies = $form_state['values']['include_dependencies'];
   $revert_optionals = $form_state['values']['include_optionals'];
-  $result = Configuration::revertActiveStore($args, $revert_dependencies, $revert_optionals);
+  $result = ConfigurationManagement::revertActiveStore($args, $revert_dependencies, $revert_optionals);
   $configurations = $result->getInfo('imported');
   if (!empty($configurations)) {
     foreach ($configurations as $configuration) {
@@ -242,7 +243,7 @@ function configuration_ui_stop_tracking_form_submit($form, &$form_state) {
   $args = configuration_ui_get_form_components($form, $form_state);
   $stop_tracking_dependencies = $form_state['values']['include_dependencies'];
   $stop_tracking_optionals = $form_state['values']['include_optionals'];
-  $result = Configuration::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
+  $result = ConfigurationManagement::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
 
   $configurations = $result->getInfo('untracked');
   if (!empty($configurations)) {
@@ -274,7 +275,7 @@ function configuration_ui_stop_tracking_single_confirm_submit($form, &$form_stat
     $args = array($form_state['values']['component_id']);
     $stop_tracking_dependencies = FALSE;
     $stop_tracking_optionals = FALSE;
-    $result = Configuration::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
+    $result = ConfigurationManagement::stopTracking($args, $stop_tracking_dependencies, $stop_tracking_optionals);
   }
   $form_state['redirect'] = 'admin/config/system/configuration';
 }
@@ -301,7 +302,7 @@ function configuration_ui_start_tracking_single_confirm_submit($form, &$form_sta
     $args = array($form_state['values']['component_id']);
     $start_tracking_dependencies = FALSE;
     $start_tracking_optionals = FALSE;
-    $result = Configuration::startTracking($args, $start_tracking_dependencies, $start_tracking_optionals);
+    $result = ConfigurationManagement::startTracking($args, $start_tracking_dependencies, $start_tracking_optionals);
   }
   $form_state['redirect'] = 'admin/config/system/configuration/notracking';
 }
@@ -313,7 +314,7 @@ function configuration_ui_export_to_datastore_form_submit($form, &$form_state) {
   $args = configuration_ui_get_form_components($form, $form_state);
   $export_dependencies = $form_state['values']['include_dependencies'];
   $export_optionals = $form_state['values']['include_optionals'];
-  $result = Configuration::exportToDataStore($args, $export_dependencies, $export_optionals);
+  $result = ConfigurationManagement::exportToDataStore($args, $export_dependencies, $export_optionals);
   $configurations = $result->getInfo('exported');
   if (!empty($configurations)) {
     foreach ($configurations as $configuration) {
@@ -329,7 +330,7 @@ function configuration_ui_start_tracking_form_submit($form, &$form_state) {
   $args = configuration_ui_get_form_components($form, $form_state);
   $start_tracking_dependencies = $form_state['values']['include_dependencies'];
   $start_tracking_optionals = $form_state['values']['include_optionals'];
-  $result = Configuration::startTracking($args, $start_tracking_dependencies, $start_tracking_optionals);
+  $result = ConfigurationManagement::startTracking($args, $start_tracking_dependencies, $start_tracking_optionals);
   $configurations = $result->getInfo('exported');
   if (!empty($configurations)) {
     foreach ($configurations as $configuration) {
@@ -395,7 +396,7 @@ function configuration_ui_export_form($form, &$form_state) {
     drupal_get_path('module', 'configuration_ui') . '/theme/configuration.css'
   );
 
-  $tracked = Configuration::allConfigurations();
+  $tracked = ConfigurationManagement::allConfigurations();
 
   foreach ($tracked as $component => $list) {
     $options = array();
@@ -410,7 +411,7 @@ function configuration_ui_export_form($form, &$form_state) {
 
     if (!empty($options)) {
       $component_exists = TRUE;
-      $handler = Configuration::getConfigurationHandler($component);
+      $handler = ConfigurationManagement::getConfigurationHandler($component);
       $form[$component] = array(
         '#type' => 'fieldset',
         '#group' => 'packages',
@@ -474,7 +475,7 @@ function configuration_ui_export_to_tar_file_form_submit($form, &$form_state) {
   $args = configuration_ui_get_form_components($form, $form_state);
   $export_dependencies = $form_state['values']['include_dependencies'];
   $export_optionals = $form_state['values']['include_optionals'];
-  Configuration::exportAsTar($args, $export_dependencies, $export_optionals);
+  ConfigurationManagement::exportAsTar($args, $export_dependencies, $export_optionals);
 }
 
 /**
@@ -484,7 +485,7 @@ function configuration_ui_import_form_submit($form, &$form_state) {
 
   $validators = array('file_validate_extensions' => array('tar'));
   if ($file = file_save_upload('import_configurations', $validators)) {
-    $settings = Configuration::importToActiveStoreFromTar($file->uri);
+    $settings = ConfigurationManagement::importToActiveStoreFromTar($file->uri);
 
     file_delete($file);
     drupal_set_message(t('The following configurations have been migrated into the ActiveStore:'));
diff --git a/ui/tests/configuration_ui.test b/ui/tests/configuration_ui.test
index e29f9f0..6215690 100644
--- a/ui/tests/configuration_ui.test
+++ b/ui/tests/configuration_ui.test
@@ -5,6 +5,7 @@
  */
 
 use Drupal\configuration\Config\Configuration;
+use Drupal\configuration\Config\ConfigurationManagement;
 
 /**
  * Base class for functional tests for configuration management.
