diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 4d04a79d73..99931d8c6c 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -1,7 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
 import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
-
 import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
@@ -14,11 +13,7 @@ import { FormService } from '../shared/form/form.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { EndpointMockingRestService } from '../shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service';
-import {
-  MOCK_RESPONSE_MAP,
-  MockResponseMap,
-  mockResponseMap
-} from '../shared/mocks/dspace-rest-v2/mocks/mock-response-map';
+import { MOCK_RESPONSE_MAP, MockResponseMap, mockResponseMap } from '../shared/mocks/dspace-rest-v2/mocks/mock-response-map';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
 import { ObjectSelectService } from '../shared/object-select/object-select.service';
@@ -141,6 +136,8 @@ import { Version } from './shared/version.model';
 import { VersionHistory } from './shared/version-history.model';
 import { Script } from '../process-page/scripts/script.model';
 import { Process } from '../process-page/processes/process.model';
+import { ProcessDataService } from './data/processes/process-data.service';
+import { ScriptDataService } from './data/processes/script-data.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -261,6 +258,8 @@ const PROVIDERS = [
   VersionHistoryDataService,
   LicenseDataService,
   ItemTypeDataService,
+  ProcessDataService,
+  ScriptDataService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
diff --git a/src/app/process-page/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
similarity index 50%
rename from src/app/process-page/processes/process-data.service.ts
rename to src/app/core/data/processes/process-data.service.ts
index 2e38266425..a2e34dd699 100644
--- a/src/app/process-page/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -1,15 +1,15 @@
 import { Injectable } from '@angular/core';
-import { DataService } from '../../core/data/data.service';
-import { RequestService } from '../../core/data/request.service';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { DataService } from '../data.service';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { CoreState } from '../../core/core.reducers';
-import { ObjectCacheService } from '../../core/cache/object-cache.service';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../../core/data/default-change-analyzer.service';
-import { Process } from './process.model';
+import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
+import { Process } from '../../../process-page/processes/process.model';
 
 @Injectable()
 export class ProcessDataService extends DataService<Process> {
diff --git a/src/app/process-page/scripts/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
similarity index 50%
rename from src/app/process-page/scripts/script-data.service.ts
rename to src/app/core/data/processes/script-data.service.ts
index f097a3e19b..66f81baffe 100644
--- a/src/app/process-page/scripts/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -1,15 +1,15 @@
 import { Injectable } from '@angular/core';
-import { DataService } from '../../core/data/data.service';
-import { RequestService } from '../../core/data/request.service';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { DataService } from '../data.service';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { CoreState } from '../../core/core.reducers';
-import { ObjectCacheService } from '../../core/cache/object-cache.service';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../../core/data/default-change-analyzer.service';
-import { Script } from './script.model';
+import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
+import { Script } from '../../../process-page/scripts/script.model';
 
 @Injectable()
 export class ScriptDataService extends DataService<Script> {
diff --git a/src/app/process-page/new/scripts-select/scripts-select.component.ts b/src/app/process-page/new/scripts-select/scripts-select.component.ts
index 75f9b6d5ed..c0daa94fb0 100644
--- a/src/app/process-page/new/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/new/scripts-select/scripts-select.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
-import { ScriptDataService } from '../../scripts/script-data.service';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { Script } from '../../scripts/script.model';
 import { Observable, Subscription } from 'rxjs';
 import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
diff --git a/src/app/process-page/process-page.module.ts b/src/app/process-page/process-page.module.ts
index bf231483b1..6b2d88d71d 100644
--- a/src/app/process-page/process-page.module.ts
+++ b/src/app/process-page/process-page.module.ts
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
 import { ProcessPageRoutingModule } from './process-page-routing.module';
-import { ProcessDataService } from './processes/process-data.service';
-import { ScriptDataService } from './scripts/script-data.service';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
 import { NewProcessComponent } from './new/new-process.component';
 import { ScriptsSelectComponent } from './new/scripts-select/scripts-select.component';
 import { ScriptHelpComponent } from './new/script-help/script-help.component';
@@ -25,12 +25,7 @@ import { ParameterValueInputComponent } from './new/process-parameters/parameter
     StringValueInputComponent,
     ParameterValueInputComponent,
   ],
-  entryComponents: [
-  ],
-  providers: [
-    ProcessDataService,
-    ScriptDataService
-  ]
+  entryComponents: []
 })
 
 export class ProcessPageModule {