diff --git a/projects/editor/src/app/app.module.ts b/projects/editor/src/app/app.module.ts
index 84c6339bd4ec6da521723459dbc1ed87a6064a70..757792aa6644fe3cea210763d5b448428dad8404 100644
--- a/projects/editor/src/app/app.module.ts
+++ b/projects/editor/src/app/app.module.ts
@@ -26,17 +26,17 @@ import { PropertiesComponent } from './components/unit-view/page-view/properties
 import { ConfirmationDialog, UnitViewComponent } from './components/unit-view/unit-view.component';
 import { PageViewComponent } from './components/unit-view/page-view/page-view.component';
 import { PageCanvasComponent } from './components/unit-view/page-view/canvas/page-canvas.component';
-import { ButtonComponent } from './components/unit-view/page-view/canvas/canvas-element-components/button.component';
-import { LabelComponent } from './components/unit-view/page-view/canvas/canvas-element-components/label.component';
-import { TextFieldComponent } from './components/unit-view/page-view/canvas/canvas-element-components/text-field.component';
+import { ButtonComponent } from '../../../common/element-components/button.component';
+import { LabelComponent } from '../../../common/element-components/label.component';
+import { TextFieldComponent } from '../../../common/element-components/text-field.component';
 import { CanvasToolbarComponent } from './components/unit-view/page-view/canvas/canvas.toolbar.component';
-import { ImageComponent } from './components/unit-view/page-view/canvas/canvas-element-components/image.component';
-import { AudioComponent } from './components/unit-view/page-view/canvas/canvas-element-components/audio.component';
-import { VideoComponent } from './components/unit-view/page-view/canvas/canvas-element-components/video.component';
-import { RadioButtonGroupComponent } from './components/unit-view/page-view/canvas/canvas-element-components/radio-button-group.component';
-import { CheckboxComponent } from './components/unit-view/page-view/canvas/canvas-element-components/checkbox.component';
-import { DropdownComponent } from './components/unit-view/page-view/canvas/canvas-element-components/dropdown.component';
-import { CorrectionComponent } from './components/unit-view/page-view/canvas/canvas-element-components/compound-components/correction.component';
+import { ImageComponent } from '../../../common/element-components/image.component';
+import { AudioComponent } from '../../../common/element-components/audio.component';
+import { VideoComponent } from '../../../common/element-components/video.component';
+import { RadioButtonGroupComponent } from '../../../common/element-components/radio-button-group.component';
+import { CheckboxComponent } from '../../../common/element-components/checkbox.component';
+import { DropdownComponent } from '../../../common/element-components/dropdown.component';
+import { CorrectionComponent } from '../../../common/element-components/compound-components/correction.component';
 import { CanvasSectionComponent } from './components/unit-view/page-view/canvas/canvas-section.component';
 import { CanvasSectionToolbarComponent } from './components/unit-view/page-view/canvas/canvas-section-toolbar.component';
 
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-section.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-section.component.ts
index a2b89eeb14fd60d9f4bd6a5ec4dc29d4316224e2..371991f4763c9351029df0760e153ad4f688549f 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-section.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-section.component.ts
@@ -5,18 +5,17 @@ import {
   ViewChild, ViewContainerRef
 } from '@angular/core';
 import { UnitPageSection, UnitUIElement } from '../../../../../../../common/unit';
-import { CanvasElementComponent } from './canvas-element-component.directive';
-import { UnitService } from '../../../../unit.service';
-import { LabelComponent } from './canvas-element-components/label.component';
-import { ButtonComponent } from './canvas-element-components/button.component';
-import { TextFieldComponent } from './canvas-element-components/text-field.component';
-import { CheckboxComponent } from './canvas-element-components/checkbox.component';
-import { DropdownComponent } from './canvas-element-components/dropdown.component';
-import { RadioButtonGroupComponent } from './canvas-element-components/radio-button-group.component';
-import { ImageComponent } from './canvas-element-components/image.component';
-import { AudioComponent } from './canvas-element-components/audio.component';
-import { VideoComponent } from './canvas-element-components/video.component';
-import { CorrectionComponent } from './canvas-element-components/compound-components/correction.component';
+import { CanvasElementComponent } from '../../../../../../../common/canvas-element-component.directive';
+import { LabelComponent } from '../../../../../../../common/element-components/label.component';
+import { ButtonComponent } from '../../../../../../../common/element-components/button.component';
+import { TextFieldComponent } from '../../../../../../../common/element-components/text-field.component';
+import { CheckboxComponent } from '../../../../../../../common/element-components/checkbox.component';
+import { DropdownComponent } from '../../../../../../../common/element-components/dropdown.component';
+import { RadioButtonGroupComponent } from '../../../../../../../common/element-components/radio-button-group.component';
+import { ImageComponent } from '../../../../../../../common/element-components/image.component';
+import { AudioComponent } from '../../../../../../../common/element-components/audio.component';
+import { VideoComponent } from '../../../../../../../common/element-components/video.component';
+import { CorrectionComponent } from '../../../../../../../common/element-components/compound-components/correction.component';
 
 @Component({
   selector: '[app-canvas-section]',
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/page-canvas.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/page-canvas.component.ts
index a8fff6c095c101fcf938065a9b7fd3666bf7c019..bf01d737ffc491b99566a4ebf0479b0f142dcf7b 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/page-canvas.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/page-canvas.component.ts
@@ -8,7 +8,7 @@ import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/dr
 import { UnitPage, UnitPageSection } from '../../../../../../../common/unit';
 import { UnitService } from '../../../../unit.service';
 import { CanvasSectionComponent } from './canvas-section.component';
-import { CanvasElementComponent } from './canvas-element-component.directive';
+import { CanvasElementComponent } from '../../../../../../../common/canvas-element-component.directive';
 
 @Component({
   selector: 'app-page-canvas',
diff --git a/projects/editor/src/app/unit.service.ts b/projects/editor/src/app/unit.service.ts
index bfc02d2cf61a94910587aef024e86a7c412611e0..f8815f7d8621817e19b1979469c89d3bd2201542 100644
--- a/projects/editor/src/app/unit.service.ts
+++ b/projects/editor/src/app/unit.service.ts
@@ -5,7 +5,7 @@ import {
 import {
   Unit, UnitPage, UnitUIElement
 } from '../../../common/unit';
-import { FileService } from './file.service';
+import { FileService } from '../../../common/file.service';
 import * as UnitFactory from './model/UnitFactory';
 
 @Injectable({