pages --> modules

duyouhua · Aug 20, 2018 · 0590dff · 0590dff
1 parent 7edd825
commit 0590dff
Show file tree

Hide file tree

Showing 259 changed files with 461 additions and 461 deletions.
diff --git a/...or/components/canvas/CanvasLayoutMixin.ts → ...or/components/canvas/CanvasLayoutMixin.ts b/...or/components/canvas/CanvasLayoutMixin.ts → ...or/components/canvas/CanvasLayoutMixin.ts
diff --git a/...es/editor/components/canvas/CanvasUtil.ts → ...es/editor/components/canvas/CanvasUtil.ts b/...es/editor/components/canvas/CanvasUtil.ts → ...es/editor/components/canvas/CanvasUtil.ts
@@ -1,5 +1,5 @@
-import { Command } from 'app/pages/editor/model/paths';
-import { MathUtil, Matrix, Point } from 'app/pages/editor/scripts/common';
+import { Command } from 'app/modules/editor/model/paths';
+import { MathUtil, Matrix, Point } from 'app/modules/editor/scripts/common';
 
 type Context = CanvasRenderingContext2D;
 

diff --git a/...or/components/canvas/PairSubPathHelper.ts → ...or/components/canvas/PairSubPathHelper.ts b/...or/components/canvas/PairSubPathHelper.ts → ...or/components/canvas/PairSubPathHelper.ts
@@ -1,6 +1,6 @@
-import { ActionMode, ActionSource, HoverType } from 'app/pages/editor/model/actionmode';
-import { Point } from 'app/pages/editor/scripts/common';
-import { ActionModeService } from 'app/pages/editor/services';
+import { ActionMode, ActionSource, HoverType } from 'app/modules/editor/model/actionmode';
+import { Point } from 'app/modules/editor/scripts/common';
+import { ActionModeService } from 'app/modules/editor/services';
 import * as _ from 'lodash';
 
 import { CanvasOverlayDirective } from './canvasoverlay.directive';

diff --git a/...itor/components/canvas/SegmentSplitter.ts → ...itor/components/canvas/SegmentSplitter.ts b/...itor/components/canvas/SegmentSplitter.ts → ...itor/components/canvas/SegmentSplitter.ts
@@ -1,7 +1,7 @@
-import { ActionMode, ActionSource } from 'app/pages/editor/model/actionmode';
-import { ProjectionOntoPath } from 'app/pages/editor/model/paths';
-import { Point } from 'app/pages/editor/scripts/common';
-import { ActionModeService } from 'app/pages/editor/services';
+import { ActionMode, ActionSource } from 'app/modules/editor/model/actionmode';
+import { ProjectionOntoPath } from 'app/modules/editor/model/paths';
+import { Point } from 'app/modules/editor/scripts/common';
+import { ActionModeService } from 'app/modules/editor/services';
 
 import { CanvasOverlayDirective } from './canvasoverlay.directive';
 

diff --git a/...itor/components/canvas/SelectionHelper.ts → ...itor/components/canvas/SelectionHelper.ts b/...itor/components/canvas/SelectionHelper.ts → ...itor/components/canvas/SelectionHelper.ts
@@ -1,8 +1,8 @@
-import { ActionSource, HoverType } from 'app/pages/editor/model/actionmode';
-import { LayerUtil } from 'app/pages/editor/model/layers';
-import { ProjectionOntoPath } from 'app/pages/editor/model/paths';
-import { MathUtil, Point } from 'app/pages/editor/scripts/common';
-import { ActionModeService } from 'app/pages/editor/services';
+import { ActionSource, HoverType } from 'app/modules/editor/model/actionmode';
+import { LayerUtil } from 'app/modules/editor/model/layers';
+import { ProjectionOntoPath } from 'app/modules/editor/model/paths';
+import { MathUtil, Point } from 'app/modules/editor/scripts/common';
+import { ActionModeService } from 'app/modules/editor/services';
 import * as _ from 'lodash';
 
 import { CanvasOverlayDirective } from './canvasoverlay.directive';

diff --git a/...editor/components/canvas/ShapeSplitter.ts → ...editor/components/canvas/ShapeSplitter.ts b/...editor/components/canvas/ShapeSplitter.ts → ...editor/components/canvas/ShapeSplitter.ts
@@ -1,7 +1,7 @@
-import { ActionMode } from 'app/pages/editor/model/actionmode';
-import { HitResult, ProjectionOntoPath } from 'app/pages/editor/model/paths';
-import { Point } from 'app/pages/editor/scripts/common';
-import { ActionModeService } from 'app/pages/editor/services';
+import { ActionMode } from 'app/modules/editor/model/actionmode';
+import { HitResult, ProjectionOntoPath } from 'app/modules/editor/model/paths';
+import { Point } from 'app/modules/editor/scripts/common';
+import { ActionModeService } from 'app/modules/editor/services';
 import * as _ from 'lodash';
 
 import { CanvasOverlayDirective } from './canvasoverlay.directive';

diff --git a/...itor/components/canvas/_canvas-theme.scss → ...itor/components/canvas/_canvas-theme.scss b/...itor/components/canvas/_canvas-theme.scss → ...itor/components/canvas/_canvas-theme.scss
diff --git a/...r/components/canvas/canvas.component.html → ...r/components/canvas/canvas.component.html b/...r/components/canvas/canvas.component.html → ...r/components/canvas/canvas.component.html
diff --git a/...r/components/canvas/canvas.component.scss → ...r/components/canvas/canvas.component.scss b/...r/components/canvas/canvas.component.scss → ...r/components/canvas/canvas.component.scss
diff --git a/...tor/components/canvas/canvas.component.ts → ...tor/components/canvas/canvas.component.ts b/...tor/components/canvas/canvas.component.ts → ...tor/components/canvas/canvas.component.ts
@@ -9,14 +9,14 @@ import {
   QueryList,
   ViewChildren,
 } from '@angular/core';
-import { ActionSource } from 'app/pages/editor/model/actionmode';
-import { MathUtil, Matrix } from 'app/pages/editor/scripts/common';
-import { DestroyableMixin } from 'app/pages/editor/scripts/mixins';
-import { ThemeService } from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
-import { isActionMode } from 'app/pages/editor/store/actionmode/selectors';
-import { getVectorLayer } from 'app/pages/editor/store/layers/selectors';
-import { getZoomPanInfo } from 'app/pages/editor/store/paper/selectors';
+import { ActionSource } from 'app/modules/editor/model/actionmode';
+import { MathUtil, Matrix } from 'app/modules/editor/scripts/common';
+import { DestroyableMixin } from 'app/modules/editor/scripts/mixins';
+import { ThemeService } from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
+import { isActionMode } from 'app/modules/editor/store/actionmode/selectors';
+import { getVectorLayer } from 'app/modules/editor/store/layers/selectors';
+import { getZoomPanInfo } from 'app/modules/editor/store/paper/selectors';
 import { environment } from 'environments/environment';
 import * as $ from 'jquery';
 import * as _ from 'lodash';

diff --git a/...nents/canvas/canvascontainer.directive.ts → ...nents/canvas/canvascontainer.directive.ts b/...nents/canvas/canvascontainer.directive.ts → ...nents/canvas/canvascontainer.directive.ts
diff --git a/...mponents/canvas/canvaslayers.directive.ts → ...mponents/canvas/canvaslayers.directive.ts b/...mponents/canvas/canvaslayers.directive.ts → ...mponents/canvas/canvaslayers.directive.ts
@@ -1,21 +1,21 @@
 import { AfterViewInit, Directive, ElementRef, Input } from '@angular/core';
-import { ActionSource } from 'app/pages/editor/model/actionmode';
+import { ActionSource } from 'app/modules/editor/model/actionmode';
 import {
   ClipPathLayer,
   Layer,
   LayerUtil,
   PathLayer,
   VectorLayer,
-} from 'app/pages/editor/model/layers';
-import { ColorUtil } from 'app/pages/editor/scripts/common';
-import { DestroyableMixin } from 'app/pages/editor/scripts/mixins';
-import { PlaybackService } from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
+} from 'app/modules/editor/model/layers';
+import { ColorUtil } from 'app/modules/editor/scripts/common';
+import { DestroyableMixin } from 'app/modules/editor/scripts/mixins';
+import { PlaybackService } from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
 import {
   getActionModeEndState,
   getActionModeStartState,
-} from 'app/pages/editor/store/actionmode/selectors';
-import { getHiddenLayerIds, getVectorLayer } from 'app/pages/editor/store/layers/selectors';
+} from 'app/modules/editor/store/actionmode/selectors';
+import { getHiddenLayerIds, getVectorLayer } from 'app/modules/editor/store/layers/selectors';
 import * as $ from 'jquery';
 import { combineLatest, merge } from 'rxjs';
 import { map } from 'rxjs/operators';

diff --git a/...ponents/canvas/canvasoverlay.directive.ts → ...ponents/canvas/canvasoverlay.directive.ts b/...ponents/canvas/canvasoverlay.directive.ts → ...ponents/canvas/canvasoverlay.directive.ts
@@ -6,7 +6,7 @@ import {
   HoverType,
   Selection,
   SelectionType,
-} from 'app/pages/editor/model/actionmode';
+} from 'app/modules/editor/model/actionmode';
 import {
   ClipPathLayer,
   GroupLayer,
@@ -15,25 +15,25 @@ import {
   MorphableLayer,
   PathLayer,
   VectorLayer,
-} from 'app/pages/editor/model/layers';
-import { Command, HitResult, Path, SubPath } from 'app/pages/editor/model/paths';
-import { MathUtil, Matrix, Point } from 'app/pages/editor/scripts/common';
-import { DestroyableMixin } from 'app/pages/editor/scripts/mixins';
+} from 'app/modules/editor/model/layers';
+import { Command, HitResult, Path, SubPath } from 'app/modules/editor/model/paths';
+import { MathUtil, Matrix, Point } from 'app/modules/editor/scripts/common';
+import { DestroyableMixin } from 'app/modules/editor/scripts/mixins';
 import {
   ActionModeService,
   LayerTimelineService,
   PlaybackService,
   ShortcutService,
-} from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
+} from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
 import {
   getActionMode,
   getActionModeEndState,
   getActionModeHover,
   getActionModeStartState,
-} from 'app/pages/editor/store/actionmode/selectors';
-import { getCanvasOverlayState } from 'app/pages/editor/store/common/selectors';
-import { getVectorLayer } from 'app/pages/editor/store/layers/selectors';
+} from 'app/modules/editor/store/actionmode/selectors';
+import { getCanvasOverlayState } from 'app/modules/editor/store/common/selectors';
+import { getVectorLayer } from 'app/modules/editor/store/layers/selectors';
 import * as $ from 'jquery';
 import * as _ from 'lodash';
 import { combineLatest ,  merge } from 'rxjs';

diff --git a/...omponents/canvas/canvaspaper.directive.ts → ...omponents/canvas/canvaspaper.directive.ts b/...omponents/canvas/canvaspaper.directive.ts → ...omponents/canvas/canvaspaper.directive.ts
@@ -1,9 +1,9 @@
 import { AfterViewInit, Directive, ElementRef, Input, OnDestroy } from '@angular/core';
-import { ActionSource } from 'app/pages/editor/model/actionmode';
-import { DestroyableMixin } from 'app/pages/editor/scripts/mixins';
-import { PaperProject } from 'app/pages/editor/scripts/paper';
-import { PaperService } from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
+import { ActionSource } from 'app/modules/editor/model/actionmode';
+import { DestroyableMixin } from 'app/modules/editor/scripts/mixins';
+import { PaperProject } from 'app/modules/editor/scripts/paper';
+import { PaperService } from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
 import * as $ from 'jquery';
 
 import { CanvasLayoutMixin } from './CanvasLayoutMixin';

diff --git a/...omponents/canvas/canvasruler.directive.ts → ...omponents/canvas/canvasruler.directive.ts b/...omponents/canvas/canvasruler.directive.ts → ...omponents/canvas/canvasruler.directive.ts
@@ -1,6 +1,6 @@
 import { Directive, ElementRef, Input } from '@angular/core';
-import { MathUtil, Point } from 'app/pages/editor/scripts/common';
-import { ThemeService } from 'app/pages/editor/services';
+import { MathUtil, Point } from 'app/modules/editor/scripts/common';
+import { ThemeService } from 'app/modules/editor/services';
 import * as $ from 'jquery';
 
 import { CanvasLayoutMixin } from './CanvasLayoutMixin';

diff --git a/...p/pages/editor/components/canvas/index.ts → ...modules/editor/components/canvas/index.ts b/...p/pages/editor/components/canvas/index.ts → ...modules/editor/components/canvas/index.ts
diff --git a/...tor/components/dialogs/_dialog-theme.scss → ...tor/components/dialogs/_dialog-theme.scss b/...tor/components/dialogs/_dialog-theme.scss → ...tor/components/dialogs/_dialog-theme.scss
diff --git a/...ents/dialogs/confirmdialog.component.scss → ...ents/dialogs/confirmdialog.component.scss b/...ents/dialogs/confirmdialog.component.scss → ...ents/dialogs/confirmdialog.component.scss
diff --git a/...onents/dialogs/confirmdialog.component.ts → ...onents/dialogs/confirmdialog.component.ts b/...onents/dialogs/confirmdialog.component.ts → ...onents/dialogs/confirmdialog.component.ts
diff --git a/...ponents/dialogs/demodialog.component.scss → ...ponents/dialogs/demodialog.component.scss b/...ponents/dialogs/demodialog.component.scss → ...ponents/dialogs/demodialog.component.scss
diff --git a/...omponents/dialogs/demodialog.component.ts → ...omponents/dialogs/demodialog.component.ts b/...omponents/dialogs/demodialog.component.ts → ...omponents/dialogs/demodialog.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { MatDialogRef } from '@angular/material';
-import { DEMO_INFOS } from 'app/pages/editor/scripts/demos';
+import { DEMO_INFOS } from 'app/modules/editor/scripts/demos';
 
 @Component({
   selector: 'app-demodialog',

diff --git a/...itor/components/dialogs/dialog.service.ts → ...itor/components/dialogs/dialog.service.ts b/...itor/components/dialogs/dialog.service.ts → ...itor/components/dialogs/dialog.service.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material';
-import { ConfirmDialogComponent } from 'app/pages/editor/components/dialogs/confirmdialog.component';
-import { DemoDialogComponent } from 'app/pages/editor/components/dialogs/demodialog.component';
+import { ConfirmDialogComponent } from 'app/modules/editor/components/dialogs/confirmdialog.component';
+import { DemoDialogComponent } from 'app/modules/editor/components/dialogs/demodialog.component';
 import {
   DropFilesAction,
   DropFilesDialogComponent,
-} from 'app/pages/editor/components/dialogs/dropfilesdialog.component';
-import { DemoInfo } from 'app/pages/editor/scripts/demos';
+} from 'app/modules/editor/components/dialogs/dropfilesdialog.component';
+import { DemoInfo } from 'app/modules/editor/scripts/demos';
 import { Observable } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })

diff --git a/...ts/dialogs/dropfilesdialog.component.scss → ...ts/dialogs/dropfilesdialog.component.scss b/...ts/dialogs/dropfilesdialog.component.scss → ...ts/dialogs/dropfilesdialog.component.scss
diff --git a/...ents/dialogs/dropfilesdialog.component.ts → ...ents/dialogs/dropfilesdialog.component.ts b/...ents/dialogs/dropfilesdialog.component.ts → ...ents/dialogs/dropfilesdialog.component.ts
diff --git a/.../pages/editor/components/dialogs/index.ts → ...odules/editor/components/dialogs/index.ts b/.../pages/editor/components/dialogs/index.ts → ...odules/editor/components/dialogs/index.ts
diff --git a/...s/layertimeline/_layerlisttree-theme.scss → ...s/layertimeline/_layerlisttree-theme.scss b/...s/layertimeline/_layerlisttree-theme.scss → ...s/layertimeline/_layerlisttree-theme.scss
diff --git a/...s/layertimeline/_layertimeline-theme.scss → ...s/layertimeline/_layertimeline-theme.scss b/...s/layertimeline/_layertimeline-theme.scss → ...s/layertimeline/_layertimeline-theme.scss
diff --git a/...timeline/_timelineanimationrow-theme.scss → ...timeline/_timelineanimationrow-theme.scss b/...timeline/_timelineanimationrow-theme.scss → ...timeline/_timelineanimationrow-theme.scss
diff --git a/...tor/components/layertimeline/constants.ts → ...tor/components/layertimeline/constants.ts b/...tor/components/layertimeline/constants.ts → ...tor/components/layertimeline/constants.ts
diff --git a/.../editor/components/layertimeline/index.ts → .../editor/components/layertimeline/index.ts b/.../editor/components/layertimeline/index.ts → .../editor/components/layertimeline/index.ts
diff --git a/...ayertimeline/layerlisttree.component.html → ...ayertimeline/layerlisttree.component.html b/...ayertimeline/layerlisttree.component.html → ...ayertimeline/layerlisttree.component.html
diff --git a/...ayertimeline/layerlisttree.component.scss → ...ayertimeline/layerlisttree.component.scss b/...ayertimeline/layerlisttree.component.scss → ...ayertimeline/layerlisttree.component.scss
diff --git a/.../layertimeline/layerlisttree.component.ts → .../layertimeline/layerlisttree.component.ts b/.../layertimeline/layerlisttree.component.ts → .../layertimeline/layerlisttree.component.ts
@@ -6,12 +6,12 @@ import {
   OnInit,
   Output,
 } from '@angular/core';
-import { ClipPathLayer, GroupLayer, Layer, PathLayer, VectorLayer } from 'app/pages/editor/model/layers';
-import { Animation, PathAnimationBlock } from 'app/pages/editor/model/timeline';
-import { ModelUtil } from 'app/pages/editor/scripts/common';
-import { ActionModeService } from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
-import { getLayerListTreeState } from 'app/pages/editor/store/common/selectors';
+import { ClipPathLayer, GroupLayer, Layer, PathLayer, VectorLayer } from 'app/modules/editor/model/layers';
+import { Animation, PathAnimationBlock } from 'app/modules/editor/model/timeline';
+import { ModelUtil } from 'app/modules/editor/scripts/common';
+import { ActionModeService } from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
+import { getLayerListTreeState } from 'app/modules/editor/store/common/selectors';
 import * as _ from 'lodash';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';

diff --git a/...ayertimeline/layertimeline.component.html → ...ayertimeline/layertimeline.component.html b/...ayertimeline/layertimeline.component.html → ...ayertimeline/layertimeline.component.html
diff --git a/...ayertimeline/layertimeline.component.scss → ...ayertimeline/layertimeline.component.scss b/...ayertimeline/layertimeline.component.scss → ...ayertimeline/layertimeline.component.scss
diff --git a/.../layertimeline/layertimeline.component.ts → .../layertimeline/layertimeline.component.ts b/.../layertimeline/layertimeline.component.ts → .../layertimeline/layertimeline.component.ts
@@ -8,39 +8,39 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
-import { DialogService } from 'app/pages/editor/components/dialogs';
-import { ProjectService } from 'app/pages/editor/components/project';
-import { ActionMode } from 'app/pages/editor/model/actionmode';
+import { DialogService } from 'app/modules/editor/components/dialogs';
+import { ProjectService } from 'app/modules/editor/components/project';
+import { ActionMode } from 'app/modules/editor/model/actionmode';
 import {
   ClipPathLayer,
   GroupLayer,
   Layer,
   LayerUtil,
   PathLayer,
   VectorLayer,
-} from 'app/pages/editor/model/layers';
-import { Animation, AnimationBlock } from 'app/pages/editor/model/timeline';
-import { ModelUtil } from 'app/pages/editor/scripts/common';
-import { Dragger } from 'app/pages/editor/scripts/dragger';
-import { IntervalTree } from 'app/pages/editor/scripts/intervals';
-import { DestroyableMixin } from 'app/pages/editor/scripts/mixins';
+} from 'app/modules/editor/model/layers';
+import { Animation, AnimationBlock } from 'app/modules/editor/model/timeline';
+import { ModelUtil } from 'app/modules/editor/scripts/common';
+import { Dragger } from 'app/modules/editor/scripts/dragger';
+import { IntervalTree } from 'app/modules/editor/scripts/intervals';
+import { DestroyableMixin } from 'app/modules/editor/scripts/mixins';
 import {
   ActionModeService,
   FileExportService,
   FileImportService,
   LayerTimelineService,
   PlaybackService,
   ThemeService,
-} from 'app/pages/editor/services';
-import { Shortcut, ShortcutService } from 'app/pages/editor/services/shortcut.service';
-import { Duration, SnackBarService } from 'app/pages/editor/services/snackbar.service';
-import { State, Store } from 'app/pages/editor/store';
-import { BatchAction } from 'app/pages/editor/store/batch/actions';
-import { getLayerTimelineState, isWorkspaceDirty } from 'app/pages/editor/store/common/selectors';
-import { SetSelectedLayers, SetVectorLayer } from 'app/pages/editor/store/layers/actions';
-import { getVectorLayer } from 'app/pages/editor/store/layers/selectors';
-import { ResetWorkspace } from 'app/pages/editor/store/reset/actions';
-import { getAnimation } from 'app/pages/editor/store/timeline/selectors';
+} from 'app/modules/editor/services';
+import { Shortcut, ShortcutService } from 'app/modules/editor/services/shortcut.service';
+import { Duration, SnackBarService } from 'app/modules/editor/services/snackbar.service';
+import { State, Store } from 'app/modules/editor/store';
+import { BatchAction } from 'app/modules/editor/store/batch/actions';
+import { getLayerTimelineState, isWorkspaceDirty } from 'app/modules/editor/store/common/selectors';
+import { SetSelectedLayers, SetVectorLayer } from 'app/modules/editor/store/layers/actions';
+import { getVectorLayer } from 'app/modules/editor/store/layers/selectors';
+import { ResetWorkspace } from 'app/modules/editor/store/reset/actions';
+import { getAnimation } from 'app/modules/editor/store/timeline/selectors';
 import { environment } from 'environments/environment';
 import * as $ from 'jquery';
 import * as _ from 'lodash';

diff --git a/...ertimeline/layertimelinegrid.directive.ts → ...ertimeline/layertimelinegrid.directive.ts b/...ertimeline/layertimelinegrid.directive.ts → ...ertimeline/layertimelinegrid.directive.ts
@@ -7,10 +7,10 @@ import {
   OnInit,
   Output,
 } from '@angular/core';
-import { Animation } from 'app/pages/editor/model/timeline';
-import { Dragger } from 'app/pages/editor/scripts/dragger';
-import { DestroyableMixin } from 'app/pages/editor/scripts/mixins';
-import { ShortcutService, ThemeService } from 'app/pages/editor/services';
+import { Animation } from 'app/modules/editor/model/timeline';
+import { Dragger } from 'app/modules/editor/scripts/dragger';
+import { DestroyableMixin } from 'app/modules/editor/scripts/mixins';
+import { ShortcutService, ThemeService } from 'app/modules/editor/services';
 import * as $ from 'jquery';
 import * as _ from 'lodash';
 import { filter } from 'rxjs/operators';

diff --git a/...eline/timelineanimationrow.component.html → ...eline/timelineanimationrow.component.html b/...eline/timelineanimationrow.component.html → ...eline/timelineanimationrow.component.html
diff --git a/...eline/timelineanimationrow.component.scss → ...eline/timelineanimationrow.component.scss b/...eline/timelineanimationrow.component.scss → ...eline/timelineanimationrow.component.scss
diff --git a/...imeline/timelineanimationrow.component.ts → ...imeline/timelineanimationrow.component.ts b/...imeline/timelineanimationrow.component.ts → ...imeline/timelineanimationrow.component.ts
@@ -6,12 +6,12 @@ import {
   OnInit,
   Output,
 } from '@angular/core';
-import { Layer } from 'app/pages/editor/model/layers';
-import { Animation, AnimationBlock } from 'app/pages/editor/model/timeline';
-import { ModelUtil } from 'app/pages/editor/scripts/common';
-import { ActionModeService } from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
-import { getTimelineAnimationRowState } from 'app/pages/editor/store/common/selectors';
+import { Layer } from 'app/modules/editor/model/layers';
+import { Animation, AnimationBlock } from 'app/modules/editor/model/timeline';
+import { ModelUtil } from 'app/modules/editor/scripts/common';
+import { ActionModeService } from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
+import { getTimelineAnimationRowState } from 'app/modules/editor/store/common/selectors';
 import * as _ from 'lodash';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';

diff --git a/.../components/playback/_playback-theme.scss → .../components/playback/_playback-theme.scss b/.../components/playback/_playback-theme.scss → .../components/playback/_playback-theme.scss
diff --git a/...pages/editor/components/playback/index.ts → ...dules/editor/components/playback/index.ts b/...pages/editor/components/playback/index.ts → ...dules/editor/components/playback/index.ts
diff --git a/...mponents/playback/playback.component.html → ...mponents/playback/playback.component.html b/...mponents/playback/playback.component.html → ...mponents/playback/playback.component.html
diff --git a/...mponents/playback/playback.component.scss → ...mponents/playback/playback.component.scss b/...mponents/playback/playback.component.scss → ...mponents/playback/playback.component.scss
diff --git a/...components/playback/playback.component.ts → ...components/playback/playback.component.ts b/...components/playback/playback.component.ts → ...components/playback/playback.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { PlaybackService } from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
-import { getPlaybackState } from 'app/pages/editor/store/playback/selectors';
+import { PlaybackService } from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
+import { getPlaybackState } from 'app/modules/editor/store/playback/selectors';
 import { Observable } from 'rxjs';
 
 @Component({

diff --git a/.../pages/editor/components/project/index.ts → ...odules/editor/components/project/index.ts b/.../pages/editor/components/project/index.ts → ...odules/editor/components/project/index.ts
diff --git a/...tor/components/project/project.service.ts → ...tor/components/project/project.service.ts b/...tor/components/project/project.service.ts → ...tor/components/project/project.service.ts
@@ -1,9 +1,9 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { VectorLayer } from 'app/pages/editor/model/layers';
-import { Animation } from 'app/pages/editor/model/timeline';
-import { ModelUtil } from 'app/pages/editor/scripts/common';
-import { FileExportService } from 'app/pages/editor/services/fileexport.service';
+import { VectorLayer } from 'app/modules/editor/model/layers';
+import { Animation } from 'app/modules/editor/model/timeline';
+import { ModelUtil } from 'app/modules/editor/scripts/common';
+import { FileExportService } from 'app/modules/editor/services/fileexport.service';
 
 // TODO: store hidden layer IDs and vector layer inside the animations?
 interface Project {

diff --git a/...onents/propertyinput/InspectedProperty.ts → ...onents/propertyinput/InspectedProperty.ts b/...onents/propertyinput/InspectedProperty.ts → ...onents/propertyinput/InspectedProperty.ts
@@ -1,4 +1,4 @@
-import { Property } from 'app/pages/editor/model/properties';
+import { Property } from 'app/modules/editor/model/properties';
 
 /**
  * Stores information about an inspected property.

diff --git a/...s/propertyinput/_propertyinput-theme.scss → ...s/propertyinput/_propertyinput-theme.scss b/...s/propertyinput/_propertyinput-theme.scss → ...s/propertyinput/_propertyinput-theme.scss
diff --git a/.../editor/components/propertyinput/index.ts → .../editor/components/propertyinput/index.ts b/.../editor/components/propertyinput/index.ts → .../editor/components/propertyinput/index.ts
diff --git a/...ropertyinput/propertyinput.component.html → ...ropertyinput/propertyinput.component.html b/...ropertyinput/propertyinput.component.html → ...ropertyinput/propertyinput.component.html
diff --git a/...ropertyinput/propertyinput.component.scss → ...ropertyinput/propertyinput.component.scss b/...ropertyinput/propertyinput.component.scss → ...ropertyinput/propertyinput.component.scss
diff --git a/.../propertyinput/propertyinput.component.ts → .../propertyinput/propertyinput.component.ts b/.../propertyinput/propertyinput.component.ts → .../propertyinput/propertyinput.component.ts
@@ -1,27 +1,27 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ActionMode } from 'app/pages/editor/model/actionmode';
+import { ActionMode } from 'app/modules/editor/model/actionmode';
 import {
   ClipPathLayer,
   GroupLayer,
   Layer,
   LayerUtil,
   PathLayer,
   VectorLayer,
-} from 'app/pages/editor/model/layers';
-import { FractionProperty, NameProperty, Option } from 'app/pages/editor/model/properties';
-import { Animation, PathAnimationBlock } from 'app/pages/editor/model/timeline';
-import { ColorUtil, ModelUtil } from 'app/pages/editor/scripts/common';
+} from 'app/modules/editor/model/layers';
+import { FractionProperty, NameProperty, Option } from 'app/modules/editor/model/properties';
+import { Animation, PathAnimationBlock } from 'app/modules/editor/model/timeline';
+import { ColorUtil, ModelUtil } from 'app/modules/editor/scripts/common';
 import {
   ActionModeService,
   LayerTimelineService,
   PlaybackService,
   ShortcutService,
   ThemeService,
-} from 'app/pages/editor/services';
-import { State, Store } from 'app/pages/editor/store';
-import { getPropertyInputState } from 'app/pages/editor/store/common/selectors';
-import { ThemeType } from 'app/pages/editor/store/theme/reducer';
-import { SetAnimation } from 'app/pages/editor/store/timeline/actions';
+} from 'app/modules/editor/services';
+import { State, Store } from 'app/modules/editor/store';
+import { getPropertyInputState } from 'app/modules/editor/store/common/selectors';
+import { ThemeType } from 'app/modules/editor/store/theme/reducer';
+import { SetAnimation } from 'app/modules/editor/store/timeline/actions';
 import * as $ from 'jquery';
 import * as _ from 'lodash';
 import { Observable ,  combineLatest } from 'rxjs';

diff --git a/...s/editor/components/root/_root-theme.scss → ...s/editor/components/root/_root-theme.scss b/...s/editor/components/root/_root-theme.scss → ...s/editor/components/root/_root-theme.scss
diff --git a/...r/components/root/droptarget.directive.ts → ...r/components/root/droptarget.directive.ts b/...r/components/root/droptarget.directive.ts → ...r/components/root/droptarget.directive.ts
diff --git a/...ditor/components/root/root.component.html → ...ditor/components/root/root.component.html b/...ditor/components/root/root.component.html → ...ditor/components/root/root.component.html
diff --git a/...ditor/components/root/root.component.scss → ...ditor/components/root/root.component.scss b/...ditor/components/root/root.component.scss → ...ditor/components/root/root.component.scss