diff --git a/packages/core/src/data_sources/model/data_collection/ComponentDataCollectionView.ts b/packages/core/src/data_sources/model/data_collection/ComponentDataCollectionView.ts
deleted file mode 100644
index 9b3f88a84..000000000
--- a/packages/core/src/data_sources/model/data_collection/ComponentDataCollectionView.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import ComponentView from '../../../dom_components/view/ComponentView';
-import ComponentDataCollection from './ComponentDataCollection';
-
-export default class ComponentDataCollectionView extends ComponentView<ComponentDataCollection> {}
diff --git a/packages/core/src/data_sources/model/data_collection/ComponentDataCollectionVariableView.ts b/packages/core/src/data_sources/view/ComponentDataCollectionVariableView.ts
similarity index 70%
rename from packages/core/src/data_sources/model/data_collection/ComponentDataCollectionVariableView.ts
rename to packages/core/src/data_sources/view/ComponentDataCollectionVariableView.ts
index efd9af99a..fbdea261d 100644
--- a/packages/core/src/data_sources/model/data_collection/ComponentDataCollectionVariableView.ts
+++ b/packages/core/src/data_sources/view/ComponentDataCollectionVariableView.ts
@@ -1,6 +1,6 @@
-import ComponentView from '../../../dom_components/view/ComponentView';
-import DynamicVariableListenerManager from '../DataVariableListenerManager';
-import ComponentDataCollectionVariable from './ComponentDataCollectionVariable';
+import ComponentView from '../../dom_components/view/ComponentView';
+import DynamicVariableListenerManager from '../model/DataVariableListenerManager';
+import ComponentDataCollectionVariable from '../model/data_collection/ComponentDataCollectionVariable';
 
 export default class ComponentDataCollectionVariableView extends ComponentView<ComponentDataCollectionVariable> {
   collectionVariableListener?: DynamicVariableListenerManager;
diff --git a/packages/core/src/data_sources/view/ComponentDataCollectionView.ts b/packages/core/src/data_sources/view/ComponentDataCollectionView.ts
new file mode 100644
index 000000000..c38627b0f
--- /dev/null
+++ b/packages/core/src/data_sources/view/ComponentDataCollectionView.ts
@@ -0,0 +1,4 @@
+import ComponentView from '../../dom_components/view/ComponentView';
+import ComponentDataCollection from '../model/data_collection/ComponentDataCollection';
+
+export default class ComponentDataCollectionView extends ComponentView<ComponentDataCollection> {}
diff --git a/packages/core/src/dom_components/index.ts b/packages/core/src/dom_components/index.ts
index ee202c248..224dfc585 100644
--- a/packages/core/src/dom_components/index.ts
+++ b/packages/core/src/dom_components/index.ts
@@ -53,7 +53,7 @@
  *
  * @module Components
  */
-import { debounce, isArray, isBoolean, isEmpty, isFunction, isString, isSymbol, result } from 'underscore';
+import { debounce, isArray, isEmpty, isFunction, isString, isSymbol, result } from 'underscore';
 import { ItemManagerModule } from '../abstract/Module';
 import { ObjectAny } from '../common';
 import EditorModel from '../editor/model/Editor';
@@ -129,10 +129,10 @@ import { DataConditionType } from '../data_sources/model/conditional_variables/D
 import ComponentDataCondition from '../data_sources/model/conditional_variables/ComponentDataCondition';
 import ComponentDataConditionView from '../data_sources/view/ComponentDataConditionView';
 import ComponentDataCollection from '../data_sources/model/data_collection/ComponentDataCollection';
-import ComponentDataCollectionView from '../data_sources/model/data_collection/ComponentDataCollectionView';
 import { DataCollectionType, DataCollectionVariableType } from '../data_sources/model/data_collection/constants';
 import ComponentDataCollectionVariable from '../data_sources/model/data_collection/ComponentDataCollectionVariable';
-import ComponentDataCollectionVariableView from '../data_sources/model/data_collection/ComponentDataCollectionVariableView';
+import ComponentDataCollectionVariableView from '../data_sources/view/ComponentDataCollectionVariableView';
+import ComponentDataCollectionView from '../data_sources/view/ComponentDataCollectionView';
 
 export type ComponentEvent =
   | 'component:create'