diff --git a/core/modules/migrate_drupal/migration_templates/d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_book.yml
rename to core/modules/book/migration_templates/d6_book.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_book_settings.yml
rename to core/modules/book/migration_templates/d6_book_settings.yml
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Book.php b/core/modules/book/src/Plugin/migrate/destination/Book.php
similarity index 73%
rename from core/modules/migrate/src/Plugin/migrate/destination/Book.php
rename to core/modules/book/src/Plugin/migrate/destination/Book.php
index f6ff932..784e7a1 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Book.php
+++ b/core/modules/book/src/Plugin/migrate/destination/Book.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\Book.
+ * Contains \Drupal\book\Plugin\migrate\destination\Book.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\book\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Row;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Book.php b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Book.php
rename to core/modules/book/src/Plugin/migrate/source/d6/Book.php
index ed02351..a1ecbb6 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Book.php
+++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Book.
+ * Contains \Drupal\book\Plugin\migrate\source\d6\Book.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\book\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
rename to core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
index cf5a745..9ae1030 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
+++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBookConfigsTest.
+ * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\book\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to book.settings.yml.
  *
- * @group migrate_drupal
+ * @group book
  */
 class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
rename to core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
index 3ad54f1..ea7846e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
+++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBookTest.
+ * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\book\Tests\Migrate\d6;
 
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
  * Upgrade book structure.
  *
- * @group migrate_drupal
+ * @group book
  */
 class MigrateBookTest extends MigrateDrupal6TestBase {