diff --git a/projects/common/element-component.directive.ts b/projects/common/element-component.directive.ts
index 74bd49eb09c7f3cc70cc142f38c83c5eb6fb48d3..0ae755a49103645cb6dc3099c3e32c69a71eded6 100644
--- a/projects/common/element-component.directive.ts
+++ b/projects/common/element-component.directive.ts
@@ -1,7 +1,7 @@
 import {
   Directive
 } from '@angular/core';
-import { UIElement } from './classes/uI-element';
+import { UIElement } from './models/uI-element';
 
 @Directive()
 export abstract class ElementComponent {
diff --git a/projects/common/element-components/audio.component.ts b/projects/common/element-components/audio.component.ts
index 98e86102d53ac5c130ab31b483e47cdc3cf2ffe8..dda243d1b6e2e5f78a41b2afad3640071918822e 100644
--- a/projects/common/element-components/audio.component.ts
+++ b/projects/common/element-components/audio.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { AudioElement } from '../classes/audio-element';
+import { AudioElement } from '../models/audio-element';
 
 @Component({
   selector: 'app-audio',
diff --git a/projects/common/element-components/button.component.ts b/projects/common/element-components/button.component.ts
index 7ece62f114a6e78c818f3cf05bc4bce138fe5c76..513f55f6ad99726f15749aa0ca49106e7205c264 100644
--- a/projects/common/element-components/button.component.ts
+++ b/projects/common/element-components/button.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { ButtonElement } from '../classes/button-element';
+import { ButtonElement } from '../models/button-element';
 
 @Component({
   selector: 'app-button',
diff --git a/projects/common/element-components/checkbox.component.ts b/projects/common/element-components/checkbox.component.ts
index 46926d93865847dc07fb96127431551ff4fae071..64c5cbccc76afa59955bb5667ec47f7872ac81ba 100644
--- a/projects/common/element-components/checkbox.component.ts
+++ b/projects/common/element-components/checkbox.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { ValidatorFn, Validators } from '@angular/forms';
 import { FormElementComponent } from '../form-element-component.directive';
-import { CheckboxElement } from '../classes/checkbox-element';
+import { CheckboxElement } from '../models/checkbox-element';
 
 @Component({
   selector: 'app-checkbox',
diff --git a/projects/common/element-components/dropdown.component.ts b/projects/common/element-components/dropdown.component.ts
index f69b6a4463e534ffe7c1bedf3ec9f10c3c30eee0..abc2658951129651accb694cdcbfe7c22255773b 100644
--- a/projects/common/element-components/dropdown.component.ts
+++ b/projects/common/element-components/dropdown.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { FormElementComponent } from '../form-element-component.directive';
-import { DropdownElement } from '../classes/dropdown-element';
+import { DropdownElement } from '../models/dropdown-element';
 
 @Component({
   selector: 'app-dropdown',
diff --git a/projects/common/element-components/image.component.ts b/projects/common/element-components/image.component.ts
index 26d414ef1fb0b1e3f79fb4bb55ccbcbf191dbb41..c5732bd9f3885b5e935f08f26b56bd3e6490b457 100644
--- a/projects/common/element-components/image.component.ts
+++ b/projects/common/element-components/image.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { ImageElement } from '../classes/image-element';
+import { ImageElement } from '../models/image-element';
 
 @Component({
   selector: 'app-image',
diff --git a/projects/common/element-components/pipes/error-transform.pipe.ts b/projects/common/element-components/pipes/error-transform.pipe.ts
index 55e393598a682acd83d2d4859078a62b385f6e8f..14d1e74fd0af269958edfa79d1c3a5573679f411 100644
--- a/projects/common/element-components/pipes/error-transform.pipe.ts
+++ b/projects/common/element-components/pipes/error-transform.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { ValidationErrors } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
-import { UIElement } from '../../classes/uI-element';
+import { UIElement } from '../../models/uI-element';
 
 @Pipe({
   name: 'errorTransform'
diff --git a/projects/common/element-components/radio-button-group.component.ts b/projects/common/element-components/radio-button-group.component.ts
index 4f5502e1f434fe47496cf7de9e98da7dd3eecd1f..5a54c91375a90c5af1e8abb3c56b24f7bf7f85b4 100644
--- a/projects/common/element-components/radio-button-group.component.ts
+++ b/projects/common/element-components/radio-button-group.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { FormElementComponent } from '../form-element-component.directive';
-import { RadioButtonGroupElement } from '../classes/radio-button-group-element';
+import { RadioButtonGroupElement } from '../models/radio-button-group-element';
 
 @Component({
   selector: 'app-radio-button-group',
diff --git a/projects/common/element-components/text-area.component.ts b/projects/common/element-components/text-area.component.ts
index 06c8304df2f6028351e38117f4fd7a36988031f6..2ed4261cf1fc9f5e62ee5c9a889836c461c42a59 100644
--- a/projects/common/element-components/text-area.component.ts
+++ b/projects/common/element-components/text-area.component.ts
@@ -1,6 +1,6 @@
 import { Component, Output, EventEmitter } from '@angular/core';
 import { FormElementComponent } from '../form-element-component.directive';
-import { TextAreaElement } from '../classes/text-area-element';
+import { TextAreaElement } from '../models/text-area-element';
 
 @Component({
   selector: 'app-text-area',
diff --git a/projects/common/element-components/text-field.component.ts b/projects/common/element-components/text-field.component.ts
index 860bd88f8c029797f99e9a653a60f515a764eaca..01926d3086c61ebef6627eebfff940eb9dddc538 100644
--- a/projects/common/element-components/text-field.component.ts
+++ b/projects/common/element-components/text-field.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { ValidatorFn, Validators } from '@angular/forms';
 import { FormElementComponent } from '../form-element-component.directive';
-import { TextFieldElement } from '../classes/text-field-element';
+import { TextFieldElement } from '../models/text-field-element';
 
 @Component({
   selector: 'app-text-field',
diff --git a/projects/common/element-components/text.component.ts b/projects/common/element-components/text.component.ts
index 75325cccc7c7b0e4c3702ed8e985171f222d2ded..e1f4b1d9ae9daac1484832aacac1dc69baeda998 100644
--- a/projects/common/element-components/text.component.ts
+++ b/projects/common/element-components/text.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ElementComponent } from '../element-component.directive';
-import { TextElement } from '../classes/text-element';
+import { TextElement } from '../models/text-element';
 
 @Component({
   selector: 'app-text',
diff --git a/projects/common/element-components/video.component.ts b/projects/common/element-components/video.component.ts
index 73d4e5311505af1ac30a8425ab92c871eee63eaa..fa70b500c2994888f58547482cde47ac1bf06bb4 100644
--- a/projects/common/element-components/video.component.ts
+++ b/projects/common/element-components/video.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { ElementComponent } from '../element-component.directive';
-import { VideoElement } from '../classes/video-element';
+import { VideoElement } from '../models/video-element';
 
 @Component({
   selector: 'app-video',
diff --git a/projects/common/form-element-component.directive.ts b/projects/common/form-element-component.directive.ts
index a0c2c0c623591f089476f6bcd299d0c0e7fd78ec..1703b60c8b9d9b9279356d7530ba8fbf97997a7c 100644
--- a/projects/common/form-element-component.directive.ts
+++ b/projects/common/form-element-component.directive.ts
@@ -9,7 +9,7 @@ import { pairwise, startWith, takeUntil } from 'rxjs/operators';
 import { FormService } from './form.service';
 import { ValueChangeElement } from './form';
 import { ElementComponent } from './element-component.directive';
-import { InputElement } from './classes/uI-element';
+import { InputElement } from './models/uI-element';
 
 @Directive()
 export abstract class FormElementComponent extends ElementComponent implements OnInit, OnDestroy {
diff --git a/projects/common/classes/audio-element.ts b/projects/common/models/audio-element.ts
similarity index 100%
rename from projects/common/classes/audio-element.ts
rename to projects/common/models/audio-element.ts
diff --git a/projects/common/classes/button-element.ts b/projects/common/models/button-element.ts
similarity index 100%
rename from projects/common/classes/button-element.ts
rename to projects/common/models/button-element.ts
diff --git a/projects/common/classes/checkbox-element.ts b/projects/common/models/checkbox-element.ts
similarity index 100%
rename from projects/common/classes/checkbox-element.ts
rename to projects/common/models/checkbox-element.ts
diff --git a/projects/common/classes/dropdown-element.ts b/projects/common/models/dropdown-element.ts
similarity index 100%
rename from projects/common/classes/dropdown-element.ts
rename to projects/common/models/dropdown-element.ts
diff --git a/projects/common/classes/image-element.ts b/projects/common/models/image-element.ts
similarity index 100%
rename from projects/common/classes/image-element.ts
rename to projects/common/models/image-element.ts
diff --git a/projects/common/classes/page.ts b/projects/common/models/page.ts
similarity index 100%
rename from projects/common/classes/page.ts
rename to projects/common/models/page.ts
diff --git a/projects/common/classes/radio-button-group-element.ts b/projects/common/models/radio-button-group-element.ts
similarity index 100%
rename from projects/common/classes/radio-button-group-element.ts
rename to projects/common/models/radio-button-group-element.ts
diff --git a/projects/common/classes/section.ts b/projects/common/models/section.ts
similarity index 100%
rename from projects/common/classes/section.ts
rename to projects/common/models/section.ts
diff --git a/projects/common/classes/text-area-element.ts b/projects/common/models/text-area-element.ts
similarity index 100%
rename from projects/common/classes/text-area-element.ts
rename to projects/common/models/text-area-element.ts
diff --git a/projects/common/classes/text-element.ts b/projects/common/models/text-element.ts
similarity index 100%
rename from projects/common/classes/text-element.ts
rename to projects/common/models/text-element.ts
diff --git a/projects/common/classes/text-field-element.ts b/projects/common/models/text-field-element.ts
similarity index 100%
rename from projects/common/classes/text-field-element.ts
rename to projects/common/models/text-field-element.ts
diff --git a/projects/common/classes/uI-element.ts b/projects/common/models/uI-element.ts
similarity index 100%
rename from projects/common/classes/uI-element.ts
rename to projects/common/models/uI-element.ts
diff --git a/projects/common/classes/unit.ts b/projects/common/models/unit.ts
similarity index 100%
rename from projects/common/classes/unit.ts
rename to projects/common/models/unit.ts
diff --git a/projects/common/classes/video-element.ts b/projects/common/models/video-element.ts
similarity index 100%
rename from projects/common/classes/video-element.ts
rename to projects/common/models/video-element.ts
diff --git a/projects/common/util/element.factory.ts b/projects/common/util/element.factory.ts
index f60533efc765d6c55e1909fa6a1450faa887e93b..7e8dabeee5b3a4a3297fc4375391e327234b143f 100644
--- a/projects/common/util/element.factory.ts
+++ b/projects/common/util/element.factory.ts
@@ -1,14 +1,14 @@
-import { UIElement } from '../classes/uI-element';
-import { TextElement } from '../classes/text-element';
-import { ButtonElement } from '../classes/button-element';
-import { TextFieldElement } from '../classes/text-field-element';
-import { TextAreaElement } from '../classes/text-area-element';
-import { CheckboxElement } from '../classes/checkbox-element';
-import { DropdownElement } from '../classes/dropdown-element';
-import { RadioButtonGroupElement } from '../classes/radio-button-group-element';
-import { ImageElement } from '../classes/image-element';
-import { AudioElement } from '../classes/audio-element';
-import { VideoElement } from '../classes/video-element';
+import { UIElement } from '../models/uI-element';
+import { TextElement } from '../models/text-element';
+import { ButtonElement } from '../models/button-element';
+import { TextFieldElement } from '../models/text-field-element';
+import { TextAreaElement } from '../models/text-area-element';
+import { CheckboxElement } from '../models/checkbox-element';
+import { DropdownElement } from '../models/dropdown-element';
+import { RadioButtonGroupElement } from '../models/radio-button-group-element';
+import { ImageElement } from '../models/image-element';
+import { AudioElement } from '../models/audio-element';
+import { VideoElement } from '../models/video-element';
 
 export function createElement(elementModel: UIElement, coordinates?: { x: number; y: number }): UIElement {
   let newElement: UIElement;
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
index 06d6878a9e4be629addf8d6f8b261c5cbf0b3a07..7bc47388cb91b9cfd8bcfd5af1661630956c513f 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts
@@ -12,7 +12,7 @@ import { FormElementComponent } from '../../../../../../../common/form-element-c
 import { ValueChangeElement } from '../../../../../../../common/form';
 import { ElementComponent } from '../../../../../../../common/element-component.directive';
 import { SelectionService } from '../../../../selection.service';
-import { InputElement, UIElement } from '../../../../../../../common/classes/uI-element';
+import { InputElement, UIElement } from '../../../../../../../common/models/uI-element';
 
 @Directive()
 export abstract class CanvasElementOverlay implements OnInit, OnDestroy {
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
index 661403c857c22e2c52a2eb088743a2844921b6ac..9699cea44de1b895563821dfc25d341d33d3ba8d 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas.component.ts
@@ -6,9 +6,9 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { UnitService } from '../../../../unit.service';
 import { SelectionService } from '../../../../selection.service';
-import { Page } from '../../../../../../../common/classes/page';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
-import { Section } from '../../../../../../../common/classes/section';
+import { Page } from '../../../../../../../common/models/page';
+import { UIElement } from '../../../../../../../common/models/uI-element';
+import { Section } from '../../../../../../../common/models/section';
 
 @Component({
   selector: 'app-page-canvas',
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
index e52173916b4da44db14e17e95c7e05384dd0b3de..ba120d8422e4beed64b4b032bbd79b9e75415351 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/dynamic-canvas-overlay.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { CdkDragMove } from '@angular/cdk/drag-drop';
 import { CanvasElementOverlay } from './canvas-element-overlay';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
+import { UIElement } from '../../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-dynamic-canvas-overlay',
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts
index e939d1fd54c4beba91cf4bee1368271207d0d101..7f3309cfd1c1c1a7f3129b64009360cdd50d1b68 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/section-dynamic.component.ts
@@ -4,7 +4,7 @@ import {
 import { CdkDragDrop } from '@angular/cdk/drag-drop/drag-events';
 import { DragItemData, DropListData } from './canvas.component';
 import { UnitService } from '../../../../unit.service';
-import { Section } from '../../../../../../../common/classes/section';
+import { Section } from '../../../../../../../common/models/section';
 
 @Component({
   selector: 'app-section-dynamic',
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts
index f4342b9c15d642bfdb58f1e7e2cba4a8f34e7ba8..920f2fb3907f3653be435b0203d9ade52f9af945 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/section-menu.component.ts
@@ -7,7 +7,7 @@ import { takeUntil } from 'rxjs/operators';
 import { UnitService } from '../../../../unit.service';
 import { DialogService } from '../../../../dialog.service';
 import { SelectionService } from '../../../../selection.service';
-import { Section } from '../../../../../../../common/classes/section';
+import { Section } from '../../../../../../../common/models/section';
 
 @Component({
   selector: 'app-section-menu',
diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts
index 5c2d2bf9bba774d115adeea3d66058d75c879a77..4284b6bdc407150b0c4709eccfe9111f4655f2ac 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/section-static.component.ts
@@ -2,7 +2,7 @@ import {
   Component, ElementRef, Input, ViewChild
 } from '@angular/core';
 import { UnitService } from '../../../../unit.service';
-import { Section } from '../../../../../../../common/classes/section';
+import { Section } from '../../../../../../../common/models/section';
 
 @Component({
   selector: 'app-section-static',
diff --git a/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts b/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts
index 06487976e7d4c3eb25ea0347052f63c2d571e480..7b0b9ce9c2ac2ebc87a644ef4ba11714d725ba2e 100644
--- a/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/page-view.component.ts
@@ -1,7 +1,7 @@
 import {
   Component, Input
 } from '@angular/core';
-import { Page } from '../../../../../../common/classes/page';
+import { Page } from '../../../../../../common/models/page';
 
 @Component({
   selector: 'app-page-view',
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
index e80886e55ee70ebfac7bc271adcecd29fd5d3488..147b8e53552a93468e5014a1c76c1306b548ba16 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
@@ -10,7 +10,7 @@ import { UnitService } from '../../../../unit.service';
 import { SelectionService } from '../../../../selection.service';
 import { MessageService } from '../../../../../../../common/message.service';
 import { FileService } from '../../../../../../../common/file.service';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
+import { UIElement } from '../../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-element-properties',
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
index 1fbd963abb24db0f01c39f64fd2e72bd8602b1dc..b3b3f6515beb6ecedc4d99490c1fed0cbb4618c3 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-sizing-properties.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { UnitService } from '../../../../unit.service';
 import { SelectionService } from '../../../../selection.service';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
+import { UIElement } from '../../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-element-sizing-properties',
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
index e891409af70c71e81d2387b0f6457d1997a0abf1..cb73eb851a6b6be00e610429090270284093294e 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-style-properties.component.ts
@@ -1,7 +1,7 @@
 import {
   Component, EventEmitter, Input, Output
 } from '@angular/core';
-import { UIElement } from '../../../../../../../common/classes/uI-element';
+import { UIElement } from '../../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-element-style-properties',
diff --git a/projects/editor/src/app/components/unit-view/unit-view.component.ts b/projects/editor/src/app/components/unit-view/unit-view.component.ts
index ee996937fc1cdced68b024c8edf1dc3d842d73c9..00702d2253ebbc5ce91348dd29b07e602645ab93 100644
--- a/projects/editor/src/app/components/unit-view/unit-view.component.ts
+++ b/projects/editor/src/app/components/unit-view/unit-view.component.ts
@@ -5,8 +5,8 @@ import { UnitService } from '../../unit.service';
 import { DialogService } from '../../dialog.service';
 import { SelectionService } from '../../selection.service';
 import { MessageService } from '../../../../../common/message.service';
-import { Page } from '../../../../../common/classes/page';
-import { Unit } from '../../../../../common/classes/unit';
+import { Page } from '../../../../../common/models/page';
+import { Unit } from '../../../../../common/models/unit';
 
 @Component({
   selector: 'app-unit-view',
diff --git a/projects/editor/src/app/selection.service.ts b/projects/editor/src/app/selection.service.ts
index e12d39a0b14b175320fdf3a7096ad03716d869e1..1f6ae279b02c1c15c6794000c9b23c4089d88fd7 100644
--- a/projects/editor/src/app/selection.service.ts
+++ b/projects/editor/src/app/selection.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { UIElement } from '../../../common/classes/uI-element';
+import { UIElement } from '../../../common/models/uI-element';
 
 @Injectable({
   providedIn: 'root'
diff --git a/projects/editor/src/app/unit.service.ts b/projects/editor/src/app/unit.service.ts
index bf63817a3b72af8c641f9b5df7e5d38cdafe6a74..49a2c31b87f49a32e58bf85f82344887377de5e8 100644
--- a/projects/editor/src/app/unit.service.ts
+++ b/projects/editor/src/app/unit.service.ts
@@ -6,11 +6,11 @@ import { MessageService } from '../../../common/message.service';
 import { IdService } from '../../../common/id.service';
 import { DialogService } from './dialog.service';
 import { VeronaAPIService } from './verona-api.service';
-import { Unit } from '../../../common/classes/unit';
-import { Page } from '../../../common/classes/page';
-import { Section } from '../../../common/classes/section';
-import { InputElement, UIElement } from '../../../common/classes/uI-element';
-import { TextElement } from '../../../common/classes/text-element';
+import { Unit } from '../../../common/models/unit';
+import { Page } from '../../../common/models/page';
+import { Section } from '../../../common/models/section';
+import { InputElement, UIElement } from '../../../common/models/uI-element';
+import { TextElement } from '../../../common/models/text-element';
 
 @Injectable({
   providedIn: 'root'
diff --git a/projects/player/src/app/app.component.ts b/projects/player/src/app/app.component.ts
index 9a91a7e7ae4e9572467cb56519e52a6dd2798a8f..dc281bafb9d4b923cf13bc8814fa38197fe6375f 100644
--- a/projects/player/src/app/app.component.ts
+++ b/projects/player/src/app/app.component.ts
@@ -3,7 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { MatDialog } from '@angular/material/dialog';
 import {
   Unit
-} from '../../../common/classes/unit';
+} from '../../../common/models/unit';
 import { VeronaSubscriptionService } from './services/verona-subscription.service';
 import { VeronaPostService } from './services/verona-post.service';
 import { NativeEventService } from './services/native-event.service';
@@ -12,7 +12,7 @@ import { PlayerConfig, VopStartCommand } from './models/verona';
 import { AlertDialogComponent } from './components/alert-dialog/alert-dialog.component';
 import { KeyboardService } from './services/keyboard.service';
 import { UnitStateService } from './services/unit-state.service';
-import { Page } from '../../../common/classes/page';
+import { Page } from '../../../common/models/page';
 
 @Component({
   selector: 'player-aspect',
diff --git a/projects/player/src/app/components/element/element.component.ts b/projects/player/src/app/components/element/element.component.ts
index 86e024c1694e5e35566717ec6fd31052c78d67da..37b9a6020b549e770e688df039ff99f20bbbe90d 100644
--- a/projects/player/src/app/components/element/element.component.ts
+++ b/projects/player/src/app/components/element/element.component.ts
@@ -13,7 +13,7 @@ import { FormService } from '../../../../../common/form.service';
 import { ValueChangeElement } from '../../../../../common/form';
 import { UnitStateService } from '../../services/unit-state.service';
 import { MarkingService } from '../../services/marking.service';
-import { UIElement } from '../../../../../common/classes/uI-element';
+import { UIElement } from '../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-element',
diff --git a/projects/player/src/app/components/layout/layout.component.ts b/projects/player/src/app/components/layout/layout.component.ts
index c020d2353ea18c4ff52ded0bf287c1015bde85d8..7ebc2619a6b170b187d96e284e74ad90197368ce 100644
--- a/projects/player/src/app/components/layout/layout.component.ts
+++ b/projects/player/src/app/components/layout/layout.component.ts
@@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { PlayerConfig } from '../../models/verona';
 import { KeyboardService } from '../../services/keyboard.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
 
 @Component({
   selector: 'app-layout',
diff --git a/projects/player/src/app/components/page/page.component.ts b/projects/player/src/app/components/page/page.component.ts
index 4e68b9ec9af8e3896a2493869e5922b06c2ae526..41085dc6ff24b3c14c8a9a51ea012a385267ba88 100644
--- a/projects/player/src/app/components/page/page.component.ts
+++ b/projects/player/src/app/components/page/page.component.ts
@@ -4,7 +4,7 @@ import {
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FormService } from '../../../../../common/form.service';
 import { UnitStateService } from '../../services/unit-state.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
 
 @Component({
   selector: 'app-page',
diff --git a/projects/player/src/app/components/player-state/player-state.component.ts b/projects/player/src/app/components/player-state/player-state.component.ts
index ed311d9072f8ddd52a93e076638260f2c76c968e..718e3a15be1f11983be70c95f0aafece27f0e74c 100644
--- a/projects/player/src/app/components/player-state/player-state.component.ts
+++ b/projects/player/src/app/components/player-state/player-state.component.ts
@@ -10,7 +10,7 @@ import {
   VopContinueCommand, VopGetStateRequest, VopPageNavigationCommand, VopStopCommand
 } from '../../models/verona';
 import { VeronaPostService } from '../../services/verona-post.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
 
 @Component({
   selector: 'app-player-state',
diff --git a/projects/player/src/app/components/section/section.component.ts b/projects/player/src/app/components/section/section.component.ts
index 0c1d7a9a9e0a7d760825a0dc1632016e19b31ff6..f863ea8ef3ec0362c407b9ab10ab66053931bb3c 100644
--- a/projects/player/src/app/components/section/section.component.ts
+++ b/projects/player/src/app/components/section/section.component.ts
@@ -3,7 +3,7 @@ import {
 } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FormService } from '../../../../../common/form.service';
-import { Section } from '../../../../../common/classes/section';
+import { Section } from '../../../../../common/models/section';
 
 @Component({
   selector: 'app-section',
diff --git a/projects/player/src/app/components/unit-state/unit-state.component.ts b/projects/player/src/app/components/unit-state/unit-state.component.ts
index 6d44f0f6455ca2784b1ecff708d9934807801881..86033293733337c05eaff8178570c2fa4aa638c1 100644
--- a/projects/player/src/app/components/unit-state/unit-state.component.ts
+++ b/projects/player/src/app/components/unit-state/unit-state.component.ts
@@ -20,7 +20,7 @@ import {
   PlayerConfig, Progress, UnitState, VopNavigationDeniedNotification
 } from '../../models/verona';
 import { UnitStateService } from '../../services/unit-state.service';
-import { Page } from '../../../../../common/classes/page';
+import { Page } from '../../../../../common/models/page';
 
 @Component({
   selector: 'app-unit-state',
diff --git a/projects/player/src/app/services/unit-state.service.ts b/projects/player/src/app/services/unit-state.service.ts
index 0de87d960c63fa2ddca8a3ad20f18cbf397e8b90..e0f42cdbc10897d463e1e10541b4853c88a7fe7f 100644
--- a/projects/player/src/app/services/unit-state.service.ts
+++ b/projects/player/src/app/services/unit-state.service.ts
@@ -7,7 +7,7 @@ import {
   UnitStateElementCodeStatusValue
 } from '../models/verona';
 import { ValueChangeElement } from '../../../../common/form';
-import { InputElement, InputElementValue } from '../../../../common/classes/uI-element';
+import { InputElement, InputElementValue } from '../../../../common/models/uI-element';
 
 @Injectable({
   providedIn: 'root'