diff --git a/crm_core/contact/src/Tests/EventProcessingTest.php b/crm/src/Tests/EventProcessingTest.php
similarity index 97%
rename from crm_core/contact/src/Tests/EventProcessingTest.php
rename to crm/src/Tests/EventProcessingTest.php
index 0755935..5dea8c3 100644
--- a/crm_core/contact/src/Tests/EventProcessingTest.php
+++ b/crm/src/Tests/EventProcessingTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\collect_crm_core_contact\Tests\EventProcessingTest.
+ * Contains \Drupal\collect_crm\Tests\EventProcessingTest.
  */
 
-namespace Drupal\collect_crm_core_contact\Tests;
+namespace Drupal\collect_crm\Tests;
 
 use Drupal\collect\CollectContainerInterface;
 use Drupal\collect\Entity\Container;
@@ -44,7 +44,8 @@ class EventProcessingTest extends KernelTestBase {
     'crm_core_activity',
     'crm_core_match',
     'crm_core_default_matching_engine',
-    'collect_crm_core_contact',
+    'collect_crm',
+    'collect_common',
   );
 
   /**
@@ -82,7 +83,7 @@ class EventProcessingTest extends KernelTestBase {
     $this->installConfig(array(
       'crm_core_contact',
       'crm_core_activity',
-      'collect_crm_core_contact',
+      'collect_crm',
       'collect',
     ));
 
diff --git a/crm_core/contact/src/Tests/ProcessContactTest.php b/crm/src/Tests/ProcessContactTest.php
similarity index 90%
rename from crm_core/contact/src/Tests/ProcessContactTest.php
rename to crm/src/Tests/ProcessContactTest.php
index 158dd3d..6524823 100644
--- a/crm_core/contact/src/Tests/ProcessContactTest.php
+++ b/crm/src/Tests/ProcessContactTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\collect_crm_core_contact\Tests\ProcessContactTest\ProcessContactTest.
+ * Contains \Drupal\collect_crm\Tests\ProcessContactTest\ProcessContactTest.
  */
 
-namespace Drupal\collect_crm_core_contact\Tests;
+namespace Drupal\collect_crm\Tests;
 
 use Drupal\collect\Entity\Container;
 use Drupal\crm_core_activity\Entity\ActivityType;
@@ -27,7 +27,7 @@ class ProcessContactTest extends WebTestBase {
    * @var array
    */
   public static $modules = [
-    'collect_crm_core_contact',
+    'collect_crm',
     'crm_core_activity_ui',
     'entity_test',
     // @todo Remove node dependency after https://www.drupal.org/node/2308745
@@ -64,7 +64,7 @@ class ProcessContactTest extends WebTestBase {
    * Tests setting up contact matching through the processing configuration UI.
    *
    * An entity is created for a dummy entity type with a name and an email
-   * field. A CollectJSON schema is created to handle it, and its processing is
+   * field. A CollectJSON model is created to handle it, and its processing is
    * set up to match CRM Contacts from containers and create a CRM Activity
    * record. The post-processing is then triggered, and the resulting Contacts
    * and the Activity are asserted.
@@ -102,12 +102,12 @@ class ProcessContactTest extends WebTestBase {
     $this->drupalPostForm(NULL, ['operation' => 'single', 'entity' => 'Cookie (' . $entity->id() . ')'], t('Capture'));
     $this->assertText('The Test entity entity has been captured');
 
-    // Create suggested schema.
-    $this->clickLink('Set up a Collect JSON schema');
+    // Create suggested model.
+    $this->clickLink(t('Set up a @plugin model', ['@plugin' => t('Collect JSON')]));
     $this->drupalPostForm(NULL, ['label' => 'User entity', 'id' => 'user_entity'], t('Save'));
 
-    // Edit schema processing workflow.
-    $this->drupalGet('admin/structure/collect-schemas/user_entity/processing');
+    // Edit model processing workflow.
+    $this->drupalGet('admin/structure/collect/model/manage/user_entity/processing');
     $this->drupalPostForm(NULL, ['processor_add_select' => 'contact_matcher'], t('Add'));
     $this->drupalPostForm(NULL, ['processor_add_select' => 'contact_matcher'], t('Add'));
     $this->drupalPostForm(NULL, ['processor_add_select' => 'activity_creator'], t('Add'));
@@ -125,9 +125,9 @@ class ProcessContactTest extends WebTestBase {
     ], t('Save'));
     $this->drupalPostForm(NULL, [
       // The donor is identified by email.
-      'processors[' . $contact_matcher_from_uuid . '][settings][fields][contact_mail][schema_property]' => 'donor',
+      'processors[' . $contact_matcher_from_uuid . '][settings][fields][contact_mail][model_property]' => 'donor',
       // The recipient is identified by name.
-      'processors[' . $contact_matcher_to_uuid . '][settings][fields][name][schema_property]' => 'recipient',
+      'processors[' . $contact_matcher_to_uuid . '][settings][fields][name][model_property]' => 'recipient',
     ], t('Save'));
 
     // Execute processing on the entity container.
@@ -206,15 +206,15 @@ class ProcessContactTest extends WebTestBase {
     $this->drupalPostForm('admin/content/collect/capture', ['entity_type' => 'node'], t('Select entity type'));
     $this->drupalPostForm(NULL, ['operation' => 'single', 'entity' => 'Foo (' . $entity->id() . ')'], t('Capture'));
 
-    // Create suggested schema.
-    $this->clickLink('Set up a Collect JSON schema');
+    // Create suggested model.
+    $this->clickLink(t('Set up a @plugin model', ['@plugin' => t('Collect JSON')]));
     $this->drupalPostForm(NULL, [
       'label' => 'Content entity',
       'id' => 'collect_json_node_article'
     ], t('Save'));
 
     // Add a new contact matcher processor.
-    $this->drupalGet('admin/structure/collect-schemas/collect_json_node_article/processing');
+    $this->drupalGet('admin/structure/collect/model/manage/collect_json_node_article/processing');
     $this->drupalPostForm(NULL, ['processor_add_select' => 'contact_matcher'], t('Add'));
     list($contact_matcher_uuid) = $this->getProcessorKeys();
     $this->drupalPostForm(NULL, [
@@ -260,14 +260,14 @@ class ProcessContactTest extends WebTestBase {
     $author->save();
     $author_container = \Drupal::service('collect.capture_entity')->capture($author);
     $this->drupalGet($author_container->url());
-    $this->clickLink(t('Set up a @plugin schema', ['@plugin' => t('Collect JSON')]));
+    $this->clickLink(t('Set up a @plugin model', ['@plugin' => t('Collect JSON')]));
     $this->drupalPostForm(NULL, ['label' => 'User', 'id' => 'user'], t('Save'));
-    $this->drupalPostAjaxForm('admin/structure/collect-schemas/user/processing', ['processor_add_select' => 'contact_matcher'], ['op' => t('Add')]);
+    $this->drupalPostAjaxForm('admin/structure/collect/model/manage/user/processing', ['processor_add_select' => 'contact_matcher'], ['op' => t('Add')]);
     list($contact_matcher_uuid) = $this->getProcessorKeys();
     $this->drupalPostForm(NULL, ['processors[' . $contact_matcher_uuid . '][settings][contact_type]' => 'individual'], t('Save'));
     $this->drupalPostForm(NULL, [
-      'processors[' . $contact_matcher_uuid . '][settings][fields][name][schema_property]' => 'name',
-      'processors[' . $contact_matcher_uuid . '][settings][fields][contact_mail][schema_property]' => 'mail',
+      'processors[' . $contact_matcher_uuid . '][settings][fields][name][model_property]' => 'name',
+      'processors[' . $contact_matcher_uuid . '][settings][fields][contact_mail][model_property]' => 'mail',
     ], t('Save'));
     \Drupal::service('collect.postprocessor')->process($author_container);
     $this->drupalGet('crm-core/contact');
diff --git a/crm_core/contact/tests/src/Unit/EventSubscriberTest.php b/crm/tests/src/Unit/EventSubscriberTest.php
similarity index 97%
rename from crm_core/contact/tests/src/Unit/EventSubscriberTest.php
rename to crm/tests/src/Unit/EventSubscriberTest.php
index fa235ed..18d2717 100644
--- a/crm_core/contact/tests/src/Unit/EventSubscriberTest.php
+++ b/crm/tests/src/Unit/EventSubscriberTest.php
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Tests\collect_crm_core_contact\Unit\EventSubscriberTest.
+ * Contains \Drupal\Tests\collect_crm\Unit\EventSubscriberTest.
  */
 
-namespace Drupal\Tests\collect_crm_core_contact\Unit;
+namespace Drupal\Tests\collect_crm\Unit;
 
 use Drupal\collect\Event\CollectEvent;
-use Drupal\collect_crm_core_contact\EventSubscriber;
+use Drupal\collect_crm\EventSubscriber;
 use Drupal\Tests\UnitTestCase;
 
 if (!defined('DATETIME_DATETIME_STORAGE_FORMAT') && !defined('DATETIME_STORAGE_TIMEZONE')) {
@@ -17,6 +17,8 @@ if (!defined('DATETIME_DATETIME_STORAGE_FORMAT') && !defined('DATETIME_STORAGE_T
 /**
  * Tests the processing of contact form submissions.
  *
+ * @coversDefaultClass Drupal\collect_crm\EventSubscriber
+ *
  * @group collect
  */
 class EventSubscriberTest extends UnitTestCase {
@@ -24,7 +26,7 @@ class EventSubscriberTest extends UnitTestCase {
   /**
    * The tested event subscriber.
    *
-   * @var \Drupal\collect_crm_core_contact\EventSubscriber
+   * @var \Drupal\collect_crm\EventSubscriber
    */
   protected $subscriber;
 
diff --git a/crm_core/contact/tests/src/Unit/fixture.json b/crm/tests/src/Unit/fixture.json
similarity index 100%
rename from crm_core/contact/tests/src/Unit/fixture.json
rename to crm/tests/src/Unit/fixture.json