diff --git a/core/lib/Drupal/Component/Archiver/ArchiverException.php b/core/lib/Drupal/Component/Archiver/ArchiverException.php
deleted file mode 100644
index 0ef91b5..0000000
--- a/core/lib/Drupal/Component/Archiver/ArchiverException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Component\Archiver\ArchiverException.
- */
-
-namespace Drupal\Component\Archiver;
-
-/**
- * Defines an exception class for Drupal\Component\Archiver\ArchiverInterface.
- */
-class ArchiverException extends \Exception {}
-
diff --git a/core/lib/Drupal/Component/Archiver/ArchiveTar.php b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
similarity index 99%
rename from core/lib/Drupal/Component/Archiver/ArchiveTar.php
rename to core/lib/Drupal/Core/Archiver/ArchiveTar.php
index a125450..b891f92 100644
--- a/core/lib/Drupal/Component/Archiver/ArchiveTar.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
@@ -40,7 +40,7 @@
  * @link        http://pear.php.net/package/Archive_Tar
  */
 
-namespace Drupal\Component\Archiver;
+namespace Drupal\Core\Archiver;
 
 //require_once 'PEAR.php';
 //
diff --git a/core/lib/Drupal/Core/Archiver/ArchiverException.php b/core/lib/Drupal/Core/Archiver/ArchiverException.php
new file mode 100644
index 0000000..af10ca2
--- /dev/null
+++ b/core/lib/Drupal/Core/Archiver/ArchiverException.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Core\Archiver\ArchiverException.
+ */
+
+namespace Drupal\Core\Archiver;
+
+/**
+ * Defines an exception class for Drupal\Core\Archiver\ArchiverInterface.
+ */
+class ArchiverException extends \Exception {}
+
diff --git a/core/lib/Drupal/Component/Archiver/ArchiverInterface.php b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
similarity index 82%
rename from core/lib/Drupal/Component/Archiver/ArchiverInterface.php
rename to core/lib/Drupal/Core/Archiver/ArchiverInterface.php
index 1aa363a..13d82dc 100644
--- a/core/lib/Drupal/Component/Archiver/ArchiverInterface.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Archiver\ArchiverInterface.
+ * Definition of Drupal\Core\Archiver\ArchiverInterface.
  */
 
-namespace Drupal\Component\Archiver;
+namespace Drupal\Core\Archiver;
 
 /**
  * Defines the common interface for all Archiver classes.
@@ -19,7 +19,7 @@
    *   The full system path of the file or directory to add. Only local files
    *   and directories are supported.
    *
-   * @return \Drupal\Component\Archiver\ArchiverInterface
+   * @return \Drupal\Core\Archiver\ArchiverInterface
    *   The called object.
    */
   public function add($file_path);
@@ -30,7 +30,7 @@ public function add($file_path);
    * @param string $path
    *   The file name relative to the root of the archive to remove.
    *
-   * @return \Drupal\Component\Archiver\ArchiverInterface
+   * @return \Drupal\Core\Archiver\ArchiverInterface
    *   The called object.
    */
   public function remove($path);
@@ -45,7 +45,7 @@ public function remove($path);
    *   relative to the root of the archive. If not specified, all files
    *   in the archive will be extracted.
    *
-   * @return \Drupal\Component\Archiver\ArchiverInterface
+   * @return \Drupal\Core\Archiver\ArchiverInterface
    *   The called object.
    */
   public function extract($path, array $files = array());
diff --git a/core/lib/Drupal/Component/Archiver/Tar.php b/core/lib/Drupal/Core/Archiver/Tar.php
similarity index 79%
rename from core/lib/Drupal/Component/Archiver/Tar.php
rename to core/lib/Drupal/Core/Archiver/Tar.php
index b1c0059..3b8c09e 100644
--- a/core/lib/Drupal/Component/Archiver/Tar.php
+++ b/core/lib/Drupal/Core/Archiver/Tar.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Archiver\Tar.
+ * Definition of Drupal\Core\Archiver\Tar.
  */
 
-namespace Drupal\Component\Archiver;
+namespace Drupal\Core\Archiver;
 
 /**
  * Defines a archiver implementation for .tar files.
@@ -15,7 +15,7 @@ class Tar implements ArchiverInterface {
   /**
    * The underlying ArchiveTar instance that does the heavy lifting.
    *
-   * @var \Drupal\Component\Archiver\ArchiveTar
+   * @var \Drupal\Core\Archiver\ArchiveTar
    */
   protected $tar;
 
@@ -27,14 +27,14 @@ class Tar implements ArchiverInterface {
    *   are supported. If the file does not yet exist, it will be created if
    *   appropriate.
    *
-   * @throws \Drupal\Component\Archiver\ArchiverException
+   * @throws \Drupal\Core\Archiver\ArchiverException
    */
   public function __construct($file_path) {
     $this->tar = new ArchiveTar($file_path);
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::add().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::add().
    */
   public function add($file_path) {
     $this->tar->add($file_path);
@@ -43,7 +43,7 @@ public function add($file_path) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::remove().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::remove().
    */
   public function remove($file_path) {
     // @todo Archive_Tar doesn't have a remove operation
@@ -55,7 +55,7 @@ public function remove($file_path) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::extract().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::extract().
    */
   public function extract($path, array $files = array()) {
     if ($files) {
@@ -69,7 +69,7 @@ public function extract($path, array $files = array()) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::listContents().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::listContents().
    */
   public function listContents() {
     $files = array();
diff --git a/core/lib/Drupal/Component/Archiver/Zip.php b/core/lib/Drupal/Core/Archiver/Zip.php
similarity index 81%
rename from core/lib/Drupal/Component/Archiver/Zip.php
rename to core/lib/Drupal/Core/Archiver/Zip.php
index 67ea76d..38c75fd 100644
--- a/core/lib/Drupal/Component/Archiver/Zip.php
+++ b/core/lib/Drupal/Core/Archiver/Zip.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Archiver\Zip.
+ * Definition of Drupal\Core\Archiver\Zip.
  */
 
-namespace Drupal\Component\Archiver;
+namespace Drupal\Core\Archiver;
 
 /**
  * Defines a archiver implementation for .zip files.
@@ -29,7 +29,7 @@ class Zip implements ArchiverInterface {
    *   are supported. If the file does not yet exist, it will be created if
    *   appropriate.
    *
-   * @throws \Drupal\Component\Archiver\ArchiverException
+   * @throws \Drupal\Core\Archiver\ArchiverException
    */
   public function __construct($file_path) {
     $this->zip = new \ZipArchive();
@@ -39,7 +39,7 @@ public function __construct($file_path) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::add().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::add().
    */
   public function add($file_path) {
     $this->zip->addFile($file_path);
@@ -48,7 +48,7 @@ public function add($file_path) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::remove().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::remove().
    */
   public function remove($file_path) {
     $this->zip->deleteName($file_path);
@@ -57,7 +57,7 @@ public function remove($file_path) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::extract().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::extract().
    */
   public function extract($path, Array $files = array()) {
     if ($files) {
@@ -71,7 +71,7 @@ public function extract($path, Array $files = array()) {
   }
 
   /**
-   * Implements Drupal\Component\Archiver\ArchiveInterface::listContents().
+   * Implements Drupal\Core\Archiver\ArchiveInterface::listContents().
    */
   public function listContents() {
     $files = array();
diff --git a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php b/core/modules/config/lib/Drupal/config/Controller/ConfigController.php
index 18f6287..25cc485 100644
--- a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php
+++ b/core/modules/config/lib/Drupal/config/Controller/ConfigController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\config\Controller;
 
-use Drupal\Component\Archiver\ArchiveTar;
+use Drupal\Core\Archiver\ArchiveTar;
 use Drupal\Core\Config\ConfigManagerInterface;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php b/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php
index bb5f4ed..52dfc5b 100644
--- a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php
+++ b/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\config\Form;
 
+use Drupal\Core\Archiver\ArchiveTar;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Form\FormBase;
-use Drupal\Component\Archiver\ArchiveTar;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php
index 45776e5..cd486fe 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\config\Tests;
 
+use Drupal\Core\Archiver\Tar;
 use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Archiver\Tar;
 
 /**
  * Tests exporting configuration from active store in files.
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
index faf1fd3..eb797ea 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\system\Plugin\Archiver;
 
-use Drupal\Component\Archiver\Tar as BaseTar;
+use Drupal\Core\Archiver\Tar as BaseTar;
 
 /**
  * Defines an archiver implementation for .tar files.
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
index 2e908b4..16cb488 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\system\Plugin\Archiver;
 
-use Drupal\Component\Archiver\Zip as BaseZip;
+use Drupal\Core\Archiver\Zip as BaseZip;
 
 /**
  * Defines an archiver implementation for .zip files.