deprecate "common" folder, use standard structure (#514)

src/app/app.module.ts

@@ -52,22 +52,22 @@ import { SidenavComponent } from './components/sidenav/sidenav.component';
 import { AboutComponent } from './components/about/about.component';
 import { LocationLinkComponent } from './components/location-link/location-link.component';
 import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
-import { NodeCopyDirective } from './common/directives/node-copy.directive';
+import { NodeCopyDirective } from './directives/node-copy.directive';
-import { NodeDeleteDirective } from './common/directives/node-delete.directive';
+import { NodeDeleteDirective } from './directives/node-delete.directive';
-import { NodeMoveDirective } from './common/directives/node-move.directive';
+import { NodeMoveDirective } from './directives/node-move.directive';
-import { NodeRestoreDirective } from './common/directives/node-restore.directive';
+import { NodeRestoreDirective } from './directives/node-restore.directive';
-import { NodePermanentDeleteDirective } from './common/directives/node-permanent-delete.directive';
+import { NodePermanentDeleteDirective } from './directives/node-permanent-delete.directive';
-import { NodeUnshareDirective } from './common/directives/node-unshare.directive';
+import { NodeUnshareDirective } from './directives/node-unshare.directive';
-import { NodeVersionsDirective } from './common/directives/node-versions.directive';
+import { NodeVersionsDirective } from './directives/node-versions.directive';
 import { NodeVersionsDialogComponent } from './dialogs/node-versions/node-versions.dialog';
 import { LibraryDialogComponent } from './dialogs/library/library.dialog';
-import { ContentManagementService } from './common/services/content-management.service';
+import { ContentManagementService } from './services/content-management.service';
-import { NodeActionsService } from './common/services/node-actions.service';
+import { NodeActionsService } from './services/node-actions.service';
-import { NodePermissionService } from './common/services/node-permission.service';
+import { NodePermissionService } from './services/node-permission.service';
 import { SearchResultsComponent } from './components/search/search-results/search-results.component';
 import { SettingsComponent } from './components/settings/settings.component';
-import { ProfileResolver } from './common/services/profile.resolver';
+import { ProfileResolver } from './services/profile.resolver';
-import { ExperimentalGuard } from './common/services/experimental-guard.service';
+import { ExperimentalGuard } from './services/experimental-guard.service';
 
 import { InfoDrawerComponent } from './components/info-drawer/info-drawer.component';
 import { EditFolderDirective } from './directives/edit-folder.directive';
@@ -81,7 +81,7 @@ import { ExtensionsModule } from './extensions.module';
 import { CoreExtensionsModule } from './extensions/core.extensions.module';
 import { SearchResultsRowComponent } from './components/search/search-results-row/search-results-row.component';
 import { NodePermissionsDialogComponent } from './dialogs/node-permissions/node-permissions.dialog';
-import { NodePermissionsDirective } from './common/directives/node-permissions.directive';
+import { NodePermissionsDirective } from './directives/node-permissions.directive';
 import { PermissionsManagerComponent } from './components/permission-manager/permissions-manager.component';
 
 @NgModule({

src/app/app.routes.ts

@@ -43,8 +43,8 @@ import { GenericErrorComponent } from './components/generic-error/generic-error.
 import { SearchResultsComponent } from './components/search/search-results/search-results.component';
 import { SettingsComponent } from './components/settings/settings.component';
 
-import { ProfileResolver } from './common/services/profile.resolver';
+import { ProfileResolver } from './services/profile.resolver';
-import { ExperimentalGuard } from './common/services/experimental-guard.service';
+import { ExperimentalGuard } from './services/experimental-guard.service';
 
 export const APP_ROUTES: Routes = [
     {

src/app/components/favorites/favorites.component.spec.ts

@@ -33,7 +33,7 @@ import {
     NodeFavoriteDirective, DataTableComponent, AppConfigPipe
 } from '@alfresco/adf-core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 
 import { FavoritesComponent } from './favorites.component';
 import { AppTestingModule } from '../../testing/app-testing.module';

src/app/components/favorites/favorites.component.ts

@@ -32,7 +32,7 @@ import {
     PathElementEntity,
     PathInfo
 } from 'alfresco-js-api';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { AppStore } from '../../store/states/app.state';
 import { PageComponent } from '../page.component';
 import { ContentApiService } from '../../services/content-api.service';

src/app/components/files/files.component.spec.ts

@@ -32,8 +32,8 @@ import {
     DataTableComponent, UploadService, AppConfigPipe
 } from '@alfresco/adf-core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
-import { NodeActionsService } from '../../common/services/node-actions.service';
+import { NodeActionsService } from '../../services/node-actions.service';
 import { FilesComponent } from './files.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { ContentApiService } from '../../services/content-api.service';

src/app/components/files/files.component.ts

@@ -29,8 +29,8 @@ import { ActivatedRoute, Params, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging, PathElement, PathElementEntity } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Rx';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
-import { NodeActionsService } from '../../common/services/node-actions.service';
+import { NodeActionsService } from '../../services/node-actions.service';
 import { AppStore } from '../../store/states/app.state';
 import { PageComponent } from '../page.component';
 import { ContentApiService } from '../../services/content-api.service';

src/app/components/info-drawer/info-drawer.component.ts

@@ -25,7 +25,7 @@
 
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { NodePermissionService } from '../../common/services/node-permission.service';
+import { NodePermissionService } from '../../services/node-permission.service';
 import { ContentApiService } from '../../services/content-api.service';
 
 @Component({

src/app/components/layout/layout.component.ts

@@ -26,7 +26,7 @@
 import { Component, OnInit, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Observable, Subject } from 'rxjs/Rx';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { NodePermissionService } from '../../common/services/node-permission.service';
+import { NodePermissionService } from '../../services/node-permission.service';
 import { SidenavViewsManagerDirective } from './sidenav-views-manager.directive';
 import { Store } from '@ngrx/store';
 import { AppStore } from '../../store/states';

src/app/components/libraries/libraries.component.ts

@@ -32,7 +32,7 @@ import { Store } from '@ngrx/store';
 import { AppStore } from '../../store/states/app.state';
 import { DeleteLibraryAction, CreateLibraryAction } from '../../store/actions';
 import { SiteEntry } from 'alfresco-js-api';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { ContentApiService } from '../../services/content-api.service';
 import { ExtensionService } from '../../extensions/extension.service';
 

src/app/components/page.component.ts

@@ -37,7 +37,7 @@ import { SelectionState } from '../store/states/selection.state';
 import { Observable } from 'rxjs/Rx';
 import { ExtensionService } from '../extensions/extension.service';
 import { ContentActionExtension } from '../extensions/content-action.extension';
-import { ContentManagementService } from '../common/services/content-management.service';
+import { ContentManagementService } from '../services/content-management.service';
 
 export abstract class PageComponent implements OnInit, OnDestroy {
 

src/app/components/preview/preview.component.ts

@@ -33,7 +33,7 @@ import { PageComponent } from '../page.component';
 import { ContentApiService } from '../../services/content-api.service';
 import { ExtensionService } from '../../extensions/extension.service';
 import { OpenWithExtension } from '../../extensions/open-with.extension';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 @Component({
     selector: 'app-preview',
     templateUrl: 'preview.component.html',

src/app/components/recent-files/recent-files.component.spec.ts

@@ -30,7 +30,7 @@ import {
     TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe
 } from '@alfresco/adf-core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 
 import { RecentFilesComponent } from './recent-files.component';
 import { AppTestingModule } from '../../testing/app-testing.module';

src/app/components/recent-files/recent-files.component.ts

@@ -25,7 +25,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
 import { AppStore } from '../../store/states/app.state';

src/app/components/search/search-results/search-results.component.ts

@@ -32,7 +32,7 @@ import { Store } from '@ngrx/store';
 import { AppStore } from '../../../store/states/app.state';
 import { NavigateToFolder } from '../../../store/actions';
 import { ExtensionService } from '../../../extensions/extension.service';
-import { ContentManagementService } from '../../../common/services/content-management.service';
+import { ContentManagementService } from '../../../services/content-management.service';
 
 @Component({
   selector: 'aca-search-results',

src/app/components/shared-files/shared-files.component.spec.ts

@@ -30,7 +30,7 @@ import {
     TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe
 } from '@alfresco/adf-core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { SharedFilesComponent } from './shared-files.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { ExperimentalDirective } from '../../directives/experimental.directive';

src/app/components/shared-files/shared-files.component.ts

@@ -24,7 +24,7 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
 import { AppStore } from '../../store/states/app.state';

src/app/components/sidenav/sidenav.component.ts

@@ -26,7 +26,7 @@
 import { Subject } from 'rxjs/Rx';
 import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { Node } from 'alfresco-js-api';
-import { NodePermissionService } from '../../common/services/node-permission.service';
+import { NodePermissionService } from '../../services/node-permission.service';
 import { ExtensionService } from '../../extensions/extension.service';
 import { NavigationExtension } from '../../extensions/navigation.extension';
 import { Store } from '@ngrx/store';

src/app/components/trashcan/trashcan.component.spec.ts

@@ -30,7 +30,7 @@ import {
     NodeFavoriteDirective, DataTableComponent, AppConfigPipe
 } from '@alfresco/adf-core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { TrashcanComponent } from './trashcan.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { ExperimentalDirective } from '../../directives/experimental.directive';

src/app/components/trashcan/trashcan.component.ts

@@ -24,7 +24,7 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
 import { selectUser } from '../../store/selectors/app.selectors';

src/app/directives/node-copy.directive.spec.ts

@@ -30,8 +30,8 @@ import { Observable } from 'rxjs/Rx';
 import { MatSnackBar } from '@angular/material';
 import { NodeActionsService } from '../services/node-actions.service';
 import { NodeCopyDirective } from './node-copy.directive';
-import { AppTestingModule } from '../../testing/app-testing.module';
+import { ContentApiService } from '../services/content-api.service';
-import { ContentApiService } from '../../services/content-api.service';
+import { AppTestingModule } from '../testing/app-testing.module';
 
 @Component({
     template: '<div [acaCopyNode]="selection"></div>'

src/app/directives/node-copy.directive.ts

@@ -31,7 +31,7 @@ import { TranslationService } from '@alfresco/adf-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { NodeActionsService } from '../services/node-actions.service';
 import { ContentManagementService } from '../services/content-management.service';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Directive({
     selector: '[acaCopyNode]'

src/app/directives/node-delete.directive.spec.ts

@@ -29,14 +29,14 @@ import { Component, DebugElement } from '@angular/core';
 
 import { NodeDeleteDirective } from './node-delete.directive';
 import { EffectsModule, Actions, ofType } from '@ngrx/effects';
-import { NodeEffects } from '../../store/effects/node.effects';
+import { NodeEffects } from '../store/effects/node.effects';
 import {
     SnackbarInfoAction, SNACKBAR_INFO, SNACKBAR_ERROR,
     SnackbarErrorAction, SnackbarWarningAction, SNACKBAR_WARNING
-} from '../../store/actions';
+} from '../store/actions';
 import { map } from 'rxjs/operators';
-import { AppTestingModule } from '../../testing/app-testing.module';
+import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 import { Observable } from 'rxjs/Rx';
 
 @Component({

src/app/directives/node-delete.directive.ts

@@ -26,9 +26,9 @@
 import { Directive, HostListener, Input } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
-import { DeleteNodesAction } from '../../store/actions';
+import { DeleteNodesAction } from '../store/actions';
-import { NodeInfo } from '../../store/models';
+import { NodeInfo } from '../store/models';
 
 @Directive({
     selector: '[acaDeleteNode]'

src/app/directives/node-move.directive.spec.ts

@@ -32,11 +32,11 @@ import { TranslationService } from '@alfresco/adf-core';
 import { NodeActionsService } from '../services/node-actions.service';
 import { NodeMoveDirective } from './node-move.directive';
 import { EffectsModule, Actions, ofType } from '@ngrx/effects';
-import { NodeEffects } from '../../store/effects/node.effects';
+import { NodeEffects } from '../store/effects/node.effects';
-import { SnackbarErrorAction, SNACKBAR_ERROR } from '../../store/actions';
+import { SnackbarErrorAction, SNACKBAR_ERROR } from '../store/actions';
 import { map } from 'rxjs/operators';
-import { AppTestingModule } from '../../testing/app-testing.module';
+import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Component({
     template: '<div [acaMoveNode]="selection"></div>'

src/app/directives/node-move.directive.ts

@@ -33,9 +33,9 @@ import { ContentManagementService } from '../services/content-management.service
 import { NodeActionsService } from '../services/node-actions.service';
 import { Observable } from 'rxjs/Rx';
 import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
-import { SnackbarErrorAction } from '../../store/actions';
+import { SnackbarErrorAction } from '../store/actions';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Directive({
     selector: '[acaMoveNode]'

src/app/directives/node-permanent-delete.directive.spec.ts

@@ -34,11 +34,11 @@ import { Actions, ofType, EffectsModule } from '@ngrx/effects';
 import {
     SNACKBAR_INFO, SnackbarWarningAction, SnackbarInfoAction,
     SnackbarErrorAction, SNACKBAR_ERROR, SNACKBAR_WARNING
-} from '../../store/actions';
+} from '../store/actions';
 import { map } from 'rxjs/operators';
-import { NodeEffects } from '../../store/effects/node.effects';
+import { NodeEffects } from '../store/effects/node.effects';
-import { AppTestingModule } from '../../testing/app-testing.module';
+import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Component({
     template: `<div [acaPermanentDelete]="selection"></div>`

src/app/directives/node-permanent-delete.directive.ts

@@ -29,9 +29,9 @@ import { MatDialog } from '@angular/material';
 import { ConfirmDialogComponent } from '@alfresco/adf-content-services';
 import { Store } from '@ngrx/store';
 
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
-import { PurgeDeletedNodesAction } from '../../store/actions';
+import { PurgeDeletedNodesAction } from '../store/actions';
-import { NodeInfo } from '../../store/models';
+import { NodeInfo } from '../store/models';
 
 @Directive({
     selector: '[acaPermanentDelete]'

src/app/directives/node-permissions.directive.ts

@@ -27,9 +27,9 @@ import { Directive, HostListener, Input } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { MatDialog } from '@angular/material';
 import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
-import { SnackbarErrorAction } from '../../store/actions';
+import { SnackbarErrorAction } from '../store/actions';
-import { NodePermissionsDialogComponent } from '../../dialogs/node-permissions/node-permissions.dialog';
+import { NodePermissionsDialogComponent } from '../dialogs/node-permissions/node-permissions.dialog';
 
 @Directive({
     selector: '[acaNodePermissions]'

src/app/directives/node-restore.directive.spec.ts

@@ -31,10 +31,10 @@ import { ContentManagementService } from '../services/content-management.service
 import { Actions, ofType } from '@ngrx/effects';
 import { SnackbarErrorAction,
     SNACKBAR_ERROR, SnackbarInfoAction, SNACKBAR_INFO,
-    NavigateRouteAction, NAVIGATE_ROUTE } from '../../store/actions';
+    NavigateRouteAction, NAVIGATE_ROUTE } from '../store/actions';
 import { map } from 'rxjs/operators';
-import { AppTestingModule } from '../../testing/app-testing.module';
+import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 import { Observable } from 'rxjs/Rx';
 
 @Component({

src/app/directives/node-restore.directive.ts

@@ -31,18 +31,18 @@ import {
     PathInfoEntity,
     DeletedNodesPaging
 } from 'alfresco-js-api';
-import { DeleteStatus, DeletedNodeInfo } from '../../store/models';
+import { DeleteStatus, DeletedNodeInfo } from '../store/models';
 import { ContentManagementService } from '../services/content-management.service';
 import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
 import {
     NavigateRouteAction,
     SnackbarAction,
     SnackbarErrorAction,
     SnackbarInfoAction,
     SnackbarUserAction
-} from '../../store/actions';
+} from '../store/actions';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Directive({
     selector: '[acaRestoreNode]'

src/app/directives/node-unshare.directive.ts

@@ -26,7 +26,7 @@
 import { Directive, HostListener, Input } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { ContentManagementService } from '../services/content-management.service';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Directive({
     selector: '[acaUnshareNode]'

src/app/directives/node-versions.directive.ts

@@ -25,12 +25,12 @@
 
 import { Directive, HostListener, Input } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { NodeVersionsDialogComponent } from '../../dialogs/node-versions/node-versions.dialog';
+import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog';
 import { MatDialog } from '@angular/material';
 import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
-import { SnackbarErrorAction } from '../../store/actions';
+import { SnackbarErrorAction } from '../store/actions';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Directive({
     selector: '[acaNodeVersions]'

src/app/services/content-management.service.ts

@@ -27,10 +27,10 @@ import { Subject } from 'rxjs/Rx';
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { FolderDialogComponent } from '@alfresco/adf-content-services';
-import { LibraryDialogComponent } from '../../dialogs/library/library.dialog';
+import { LibraryDialogComponent } from '../dialogs/library/library.dialog';
-import { SnackbarErrorAction } from '../../store/actions';
+import { SnackbarErrorAction } from '../store/actions';
 import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states';
+import { AppStore } from '../store/states';
 import {
     MinimalNodeEntity,
     MinimalNodeEntryEntity,

src/app/services/experimental-guard.service.ts

@@ -1,7 +1,7 @@
 import { CanActivate, ActivatedRouteSnapshot, Router } from '@angular/router';
 import { Injectable } from '@angular/core';
 import { AppConfigService, StorageService } from '@alfresco/adf-core';
-import { environment } from '../../../environments/environment';
+import { environment } from '../../environments/environment';
 
 @Injectable()
 export class ExperimentalGuard implements CanActivate {

src/app/services/node-actions.service.spec.ts

@@ -30,8 +30,8 @@ import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
 import { DocumentListService } from '@alfresco/adf-content-services';
 import { NodeActionsService } from './node-actions.service';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { AppTestingModule } from '../../testing/app-testing.module';
+import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 class TestNode {
     entry?: MinimalNodeEntryEntity;

src/app/services/node-actions.service.ts

@@ -30,7 +30,7 @@ import { Observable, Subject } from 'rxjs/Rx';
 import { AlfrescoApiService, ContentService, DataColumn, TranslationService } from '@alfresco/adf-core';
 import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData } from '@alfresco/adf-content-services';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from '../services/content-api.service';
 
 @Injectable()
 export class NodeActionsService {

src/app/services/profile.resolver.ts

@@ -28,9 +28,9 @@ import { Injectable } from '@angular/core';
 import { Resolve, Router } from '@angular/router';
 import { Person } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Observable';
-import { AppStore } from '../../store/states/app.state';
+import { AppStore } from '../store/states/app.state';
-import { SetUserAction } from '../../store/actions/user.actions';
+import { SetUserAction } from '../store/actions';
-import { ContentApiService } from '../../services/content-api.service';
+import { ContentApiService } from './content-api.service';
 
 @Injectable()
 export class ProfileResolver implements Resolve<Person> {

src/app/store/effects/library.effects.ts

@@ -36,7 +36,7 @@ import {
 } from '../actions/snackbar.actions';
 import { Store } from '@ngrx/store';
 import { AppStore } from '../states/app.state';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { ContentApiService } from '../../services/content-api.service';
 
 @Injectable()

src/app/store/effects/node.effects.ts

@@ -43,7 +43,7 @@ import {
     CreateFolderAction,
     CREATE_FOLDER
 } from '../actions';
-import { ContentManagementService } from '../../common/services/content-management.service';
+import { ContentManagementService } from '../../services/content-management.service';
 import { Observable } from 'rxjs/Rx';
 import { NodeInfo, DeleteStatus, DeletedNodeInfo } from '../models';
 import { ContentApiService } from '../../services/content-api.service';

src/app/testing/app-testing.module.ts

@@ -55,9 +55,9 @@ import {
     DocumentListService
 } from '@alfresco/adf-content-services';
 import { MaterialModule } from '../material.module';
-import { ContentManagementService } from '../common/services/content-management.service';
+import { ContentManagementService } from '../services/content-management.service';
-import { NodeActionsService } from '../common/services/node-actions.service';
+import { NodeActionsService } from '../services/node-actions.service';
-import { NodePermissionService } from '../common/services/node-permission.service';
+import { NodePermissionService } from '../services/node-permission.service';
 import { ContentApiService } from '../services/content-api.service';
 import { ExtensionService } from '../extensions/extension.service';
 import { RuleService } from '../extensions/rules/rule.service';