diff --git a/modules/opencase_defaults/opencase_defaults.module b/modules/opencase_defaults/opencase_defaults.module
index 6c3f753..ea81782 100644
--- a/modules/opencase_defaults/opencase_defaults.module
+++ b/modules/opencase_defaults/opencase_defaults.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
+use Drupal\opencase\EntityTypeRelationsWidget;
 
 /**
  * Implements hook_help().
@@ -146,3 +147,21 @@ function opencase_defaults_actors_involved_callback() {
   return array_unique([$currently_viewed_actor_id, $author_linked_actor_id]);
 }
 
+/**
+ * Implements hook_form_ID_alter
+ */
+function opencase_defaults_form_oc_case_type_add_form_alter(&$form, $form_state) {
+  $widget = new EntityTypeRelationsWidget();
+  $widget->setup($form);
+}
+
+
+/**
+ * Implements hook_form_ID_alter
+ */
+function opencase_defaults_form_oc_case_type_edit_form_alter(&$form, $form_state) {
+  $widget = new EntityTypeRelationsWidget();
+  $widget->setup($form);
+  $widget->populate($form);
+}
+
diff --git a/src/EntityTypeRelations.php b/modules/opencase_defaults/src/EntityTypeRelations.php
similarity index 100%
rename from src/EntityTypeRelations.php
rename to modules/opencase_defaults/src/EntityTypeRelations.php
diff --git a/src/EntityTypeRelationsWidget.php b/modules/opencase_defaults/src/EntityTypeRelationsWidget.php
similarity index 100%
rename from src/EntityTypeRelationsWidget.php
rename to modules/opencase_defaults/src/EntityTypeRelationsWidget.php
diff --git a/opencase.module b/opencase.module
index c878c28..5ba503f 100644
--- a/opencase.module
+++ b/opencase.module
@@ -7,7 +7,6 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Access\AccessResult;
-use Drupal\opencase\EntityTypeRelationsWidget;
 
 /**
  * Implements hook_element_info_alter().
@@ -81,24 +80,6 @@ function opencase_theme() {
   ];
 }
 
-/**
- * Implements hook_form_ID_alter
- */
-function opencase_form_oc_case_type_add_form_alter(&$form, $form_state) {
-  $widget = new EntityTypeRelationsWidget();
-  $widget->setup($form);
-}
-
-
-/**
- * Implements hook_form_ID_alter
- */
-function opencase_form_oc_case_type_edit_form_alter(&$form, $form_state) {
-  $widget = new EntityTypeRelationsWidget();
-  $widget->setup($form);
-  $widget->populate($form);
-}
-
 /**
  * Implements hook_uninstall().
  * Removes configs.