diff --git a/src/app/core/cache/models/normalized-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts
index c4326321eb..af980c518d 100644
--- a/src/app/core/cache/models/normalized-object-factory.ts
+++ b/src/app/core/cache/models/normalized-object-factory.ts
@@ -14,9 +14,9 @@ import { NormalizedGroup } from '../../eperson/models/normalized-group.model';
 import { NormalizedWorkflowItem } from '../../submission/models/normalized-workflowitem.model';
 import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model';
 import { SubmissionResourceType } from '../../submission/submission-resource-type';
-import { SubmissionDefinitionsModel } from '../../shared/config/config-submission-definitions.model';
-import { SubmissionFormsModel } from '../../shared/config/config-submission-forms.model';
-import { SubmissionSectionModel } from '../../shared/config/config-submission-section.model';
+import { SubmissionDefinitionsModel } from '../../config/models/config-submission-definitions.model';
+import { SubmissionFormsModel } from '../../config/models/config-submission-forms.model';
+import { SubmissionSectionModel } from '../../config/models/config-submission-section.model';
 
 export class NormalizedObjectFactory {
   public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject> {
diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts
index a1324970f1..048aca55ed 100644
--- a/src/app/core/cache/response-cache.models.ts
+++ b/src/app/core/cache/response-cache.models.ts
@@ -1,7 +1,7 @@
 import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
 import { RequestError } from '../data/request.models';
 import { PageInfo } from '../shared/page-info.model';
-import { ConfigObject } from '../shared/config/config.model';
+import { ConfigObject } from '../config/models/config.model';
 import { FacetValue } from '../../+search-page/search-service/facet-value.model';
 import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
 import { IntegrationModel } from '../integration/models/integration.model';
diff --git a/src/app/core/config/config-data.ts b/src/app/core/config/config-data.ts
index a6dc3ae04e..cb40514e45 100644
--- a/src/app/core/config/config-data.ts
+++ b/src/app/core/config/config-data.ts
@@ -1,5 +1,5 @@
 import { PageInfo } from '../shared/page-info.model';
-import { ConfigObject } from '../shared/config/config.model';
+import { ConfigObject } from './models/config.model';
 
 /**
  * A class to represent the data retrieved by a configuration service
diff --git a/src/app/core/data/config-response-parsing.service.spec.ts b/src/app/core/config/config-response-parsing.service.spec.ts
similarity index 97%
rename from src/app/core/data/config-response-parsing.service.spec.ts
rename to src/app/core/config/config-response-parsing.service.spec.ts
index e58ea70b57..699d3301b7 100644
--- a/src/app/core/data/config-response-parsing.service.spec.ts
+++ b/src/app/core/config/config-response-parsing.service.spec.ts
@@ -2,14 +2,14 @@ import { ConfigSuccessResponse, ErrorResponse } from '../cache/response-cache.mo
 import { ConfigResponseParsingService } from './config-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
-import { ConfigRequest } from './request.models';
+import { ConfigRequest } from '../data/request.models';
 
 import { Store } from '@ngrx/store';
 import { CoreState } from '../core.reducers';
-import { SubmissionDefinitionsModel } from '../shared/config/config-submission-definitions.model';
-import { PaginatedList } from './paginated-list';
+import { SubmissionDefinitionsModel } from './models/config-submission-definitions.model';
+import { PaginatedList } from '../data/paginated-list';
 import { PageInfo } from '../shared/page-info.model';
-import { SubmissionSectionModel } from '../shared/config/config-submission-section.model';
+import { SubmissionSectionModel } from './models/config-submission-section.model';
 
 describe('ConfigResponseParsingService', () => {
   let service: ConfigResponseParsingService;
diff --git a/src/app/core/data/config-response-parsing.service.ts b/src/app/core/config/config-response-parsing.service.ts
similarity index 79%
rename from src/app/core/data/config-response-parsing.service.ts
rename to src/app/core/config/config-response-parsing.service.ts
index 0babfa323f..71b1a0f69b 100644
--- a/src/app/core/data/config-response-parsing.service.ts
+++ b/src/app/core/config/config-response-parsing.service.ts
@@ -1,15 +1,15 @@
 import { Inject, Injectable } from '@angular/core';
 
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RestRequest } from '../data/request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { ConfigSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models';
 import { isNotEmpty } from '../../shared/empty.util';
-import { ConfigObjectFactory } from '../shared/config/config-object-factory';
+import { ConfigObjectFactory } from './models/config-object-factory';
 
-import { ConfigObject } from '../shared/config/config.model';
-import { ConfigType } from '../shared/config/config-type';
-import { BaseResponseParsingService } from './base-response-parsing.service';
+import { ConfigObject } from './models/config.model';
+import { ConfigType } from './models/config-type';
+import { BaseResponseParsingService } from '../data/base-response-parsing.service';
 import { GLOBAL_CONFIG } from '../../../config';
 import { GlobalConfig } from '../../../config/global-config.interface';
 import { ObjectCacheService } from '../cache/object-cache.service';
diff --git a/src/app/core/shared/config/config-access-condition-option.model.ts b/src/app/core/config/models/config-access-condition-option.model.ts
similarity index 100%
rename from src/app/core/shared/config/config-access-condition-option.model.ts
rename to src/app/core/config/models/config-access-condition-option.model.ts
diff --git a/src/app/core/shared/config/config-object-factory.ts b/src/app/core/config/models/config-object-factory.ts
similarity index 94%
rename from src/app/core/shared/config/config-object-factory.ts
rename to src/app/core/config/models/config-object-factory.ts
index 68e2ccbcb3..08a10201b9 100644
--- a/src/app/core/shared/config/config-object-factory.ts
+++ b/src/app/core/config/models/config-object-factory.ts
@@ -1,4 +1,4 @@
-import { GenericConstructor } from '../generic-constructor';
+import { GenericConstructor } from '../../shared/generic-constructor';
 
 import { SubmissionSectionModel } from './config-submission-section.model';
 import { SubmissionFormsModel } from './config-submission-forms.model';
diff --git a/src/app/core/shared/config/config-submission-definitions.model.ts b/src/app/core/config/models/config-submission-definitions.model.ts
similarity index 100%
rename from src/app/core/shared/config/config-submission-definitions.model.ts
rename to src/app/core/config/models/config-submission-definitions.model.ts
diff --git a/src/app/core/shared/config/config-submission-forms.model.ts b/src/app/core/config/models/config-submission-forms.model.ts
similarity index 100%
rename from src/app/core/shared/config/config-submission-forms.model.ts
rename to src/app/core/config/models/config-submission-forms.model.ts
diff --git a/src/app/core/shared/config/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
similarity index 100%
rename from src/app/core/shared/config/config-submission-section.model.ts
rename to src/app/core/config/models/config-submission-section.model.ts
diff --git a/src/app/core/shared/config/config-submission-uploads.model.ts b/src/app/core/config/models/config-submission-uploads.model.ts
similarity index 100%
rename from src/app/core/shared/config/config-submission-uploads.model.ts
rename to src/app/core/config/models/config-submission-uploads.model.ts
diff --git a/src/app/core/shared/config/config-type.ts b/src/app/core/config/models/config-type.ts
similarity index 100%
rename from src/app/core/shared/config/config-type.ts
rename to src/app/core/config/models/config-type.ts
diff --git a/src/app/core/shared/config/config.model.ts b/src/app/core/config/models/config.model.ts
similarity index 73%
rename from src/app/core/shared/config/config.model.ts
rename to src/app/core/config/models/config.model.ts
index 78ab78b92b..0f220682f4 100644
--- a/src/app/core/shared/config/config.model.ts
+++ b/src/app/core/config/models/config.model.ts
@@ -1,7 +1,7 @@
-import { autoserialize, autoserializeAs } from 'cerialize';
+import { autoserialize } from 'cerialize';
 import { NormalizedObject } from '../../cache/models/normalized-object.model';
 
-export abstract class ConfigObject extends  NormalizedObject{
+export abstract class ConfigObject extends  NormalizedObject {
 
   @autoserialize
   public name: string;
@@ -12,7 +12,7 @@ export abstract class ConfigObject extends  NormalizedObject{
   @autoserialize
   public _links: {
     [name: string]: string
-  }
+  };
 
   /**
    * The link to the rest endpoint where this config object can be found
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 15dab65158..d9e7e54931 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -40,7 +40,7 @@ import { ServerResponseService } from '../shared/services/server-response.servic
 import { NativeWindowFactory, NativeWindowService } from '../shared/services/window.service';
 import { BrowseService } from './browse/browse.service';
 import { BrowseResponseParsingService } from './data/browse-response-parsing.service';
-import { ConfigResponseParsingService } from './data/config-response-parsing.service';
+import { ConfigResponseParsingService } from './config/config-response-parsing.service';
 import { RouteService } from '../shared/services/route.service';
 import { SubmissionDefinitionsConfigService } from './config/submission-definitions-config.service';
 import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 30d6fb184b..b1104f118e 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -5,7 +5,7 @@ import { DSOResponseParsingService } from './dso-response-parsing.service';
 import { ResponseParsingService } from './parsing.service';
 import { EndpointMapResponseParsingService } from './endpoint-map-response-parsing.service';
 import { BrowseResponseParsingService } from './browse-response-parsing.service';
-import { ConfigResponseParsingService } from './config-response-parsing.service';
+import { ConfigResponseParsingService } from '../config/config-response-parsing.service';
 import { AuthResponseParsingService } from '../auth/auth-response-parsing.service';
 import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { SubmissionResponseParsingService } from '../submission/submission-response-parsing.service';
diff --git a/src/app/core/integration/models/integration.model.ts b/src/app/core/integration/models/integration.model.ts
index 9e54de2c07..3158abc7eb 100644
--- a/src/app/core/integration/models/integration.model.ts
+++ b/src/app/core/integration/models/integration.model.ts
@@ -1,7 +1,7 @@
 import { autoserialize } from 'cerialize';
 import { CacheableObject } from '../../cache/object-cache.reducer';
 
-export abstract class IntegrationModel implements CacheableObject{
+export abstract class IntegrationModel implements CacheableObject {
 
   @autoserialize
   self: string;
diff --git a/src/app/core/submission/models/submission-object.model.ts b/src/app/core/submission/models/submission-object.model.ts
index 48bb40fbdb..8160b46d1e 100644
--- a/src/app/core/submission/models/submission-object.model.ts
+++ b/src/app/core/submission/models/submission-object.model.ts
@@ -7,7 +7,7 @@ import { EPerson } from '../../eperson/models/eperson.model';
 import { RemoteData } from '../../data/remote-data';
 import { Collection } from '../../shared/collection.model';
 import { Item } from '../../shared/item.model';
-import { SubmissionDefinitionsModel } from '../../shared/config/config-submission-definitions.model';
+import { SubmissionDefinitionsModel } from '../../config/models/config-submission-definitions.model';
 import { WorkspaceitemSectionsObject } from './workspaceitem-sections.model';
 
 export interface SubmissionObjectError {
diff --git a/src/app/core/submission/normalized-submission-object-factory.ts b/src/app/core/submission/normalized-submission-object-factory.ts
index aa534b55a5..31cfc074c9 100644
--- a/src/app/core/submission/normalized-submission-object-factory.ts
+++ b/src/app/core/submission/normalized-submission-object-factory.ts
@@ -1,6 +1,6 @@
-import { SubmissionDefinitionsModel } from '../shared/config/config-submission-definitions.model';
-import { SubmissionFormsModel } from '../shared/config/config-submission-forms.model';
-import { SubmissionSectionModel } from '../shared/config/config-submission-section.model';
+import { SubmissionDefinitionsModel } from '../config/models/config-submission-definitions.model';
+import { SubmissionFormsModel } from '../config/models/config-submission-forms.model';
+import { SubmissionSectionModel } from '../config/models/config-submission-section.model';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { NormalizedBitstream } from '../cache/models/normalized-bitstream.model';
 import { NormalizedBundle } from '../cache/models/normalized-bundle.model';
@@ -10,7 +10,7 @@ import { NormalizedItem } from '../cache/models/normalized-item.model';
 import { NormalizedLicense } from '../cache/models/normalized-license.model';
 import { NormalizedWorkspaceItem } from './models/normalized-workspaceitem.model';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
-import { ConfigObject } from '../shared/config/config.model';
+import { ConfigObject } from '../config/models/config.model';
 import { SubmissionResourceType } from './submission-resource-type';
 import { NormalizedResourcePolicy } from '../cache/models/normalized-resource-policy.model';
 import { NormalizedWorkflowItem } from './models/normalized-workflowitem.model';
diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index 06dc84a56c..a87f788c1d 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -6,7 +6,7 @@ import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.
 import { ErrorResponse, RestResponse, SubmissionSuccessResponse } from '../cache/response-cache.models';
 import { isEmpty, isNotEmpty, isNotNull } from '../../shared/empty.util';
 
-import { ConfigObject } from '../shared/config/config.model';
+import { ConfigObject } from '../config/models/config.model';
 import { BaseResponseParsingService } from '../data/base-response-parsing.service';
 import { GLOBAL_CONFIG } from '../../../config';
 import { GlobalConfig } from '../../../config/global-config.interface';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
index 6d6f6fcb54..827f330a61 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
@@ -12,7 +12,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { DsDynamicGroupComponent } from './dynamic-group.components';
 import { DynamicGroupModel, DynamicGroupModelConfig } from './dynamic-group.model';
-import { FormRowModel, SubmissionFormsModel } from '../../../../../../core/shared/config/config-submission-forms.model';
+import { FormRowModel, SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
 import { FormFieldModel } from '../../../models/form-field.model';
 import { FormBuilderService } from '../../../form-builder.service';
 import { FormService } from '../../../../form.service';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
index 1993492cf1..f8539f3032 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
@@ -16,7 +16,7 @@ import { isEqual } from 'lodash';
 
 import { DynamicGroupModel, PLACEHOLDER_PARENT_METADATA } from './dynamic-group.model';
 import { FormBuilderService } from '../../../form-builder.service';
-import { SubmissionFormsModel } from '../../../../../../core/shared/config/config-submission-forms.model';
+import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
 import { FormService } from '../../../../form.service';
 import { FormComponent } from '../../../../form.component';
 import { Chips } from '../../../../../chips/models/chips.model';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.model.ts
index dd419fd82d..bccbcabfc1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.model.ts
@@ -1,5 +1,5 @@
 import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { FormRowModel } from '../../../../../../core/shared/config/config-submission-forms.model';
+import { FormRowModel } from '../../../../../../core/config/models/config-submission-forms.model';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
 import { AuthorityValue } from '../../../../../../core/integration/models/authority.value';
 import { isEmpty, isNull } from '../../../../../empty.util';
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 12f51166b5..62891cd4d4 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -41,7 +41,7 @@ import { DynamicTypeaheadModel } from './ds-dynamic-form-ui/models/typeahead/dyn
 import { DynamicListRadioGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
 import { AuthorityOptions } from '../../../core/integration/models/authority-options.model';
 import { FormFieldModel } from './models/form-field.model';
-import { FormRowModel, SubmissionFormsModel } from '../../../core/shared/config/config-submission-forms.model';
+import { FormRowModel, SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { FormBuilderService } from './form-builder.service';
 import { DynamicRowGroupModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
@@ -373,7 +373,7 @@ describe('FormBuilderService test suite', () => {
       _links: {
         self: 'testFormConfiguration.url'
       }
-    }
+    } as any;
   });
 
   beforeEach(inject([FormBuilderService], (formService: FormBuilderService) => service = formService));
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 265f7fb726..4c4a4a002c 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -17,7 +17,7 @@ import { isObject, isString, mergeWith } from 'lodash';
 
 import { hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined, isNull } from '../../empty.util';
 import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { SubmissionFormsModel } from '../../../core/shared/config/config-submission-forms.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP,
   DynamicGroupModel
diff --git a/src/app/shared/form/builder/models/form-field.model.ts b/src/app/shared/form/builder/models/form-field.model.ts
index 95b8798d5f..4b5f84d53f 100644
--- a/src/app/shared/form/builder/models/form-field.model.ts
+++ b/src/app/shared/form/builder/models/form-field.model.ts
@@ -1,5 +1,5 @@
 import { autoserialize } from 'cerialize';
-import { FormRowModel } from '../../../../core/shared/config/config-submission-forms.model';
+import { FormRowModel } from '../../../../core/config/models/config-submission-forms.model';
 import { LanguageCode } from './form-field-language-value.model';
 import { FormFieldMetadataValueObject } from './form-field-metadata-value.model';
 
diff --git a/src/app/shared/form/builder/parsers/group-field-parser.ts b/src/app/shared/form/builder/parsers/group-field-parser.ts
index 9a7b2bc42d..61edaf7f99 100644
--- a/src/app/shared/form/builder/parsers/group-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/group-field-parser.ts
@@ -7,7 +7,7 @@ import {
   PLACEHOLDER_PARENT_METADATA
 } from '../ds-dynamic-form-ui/models/dynamic-group/dynamic-group.model';
 import { isNotEmpty } from '../../../empty.util';
-import { FormRowModel } from '../../../../core/shared/config/config-submission-forms.model';
+import { FormRowModel } from '../../../../core/config/models/config-submission-forms.model';
 
 export class GroupFieldParser extends FieldParser {
 
diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index 54a6bc6a27..3f10b71279 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -1,5 +1,5 @@
 import { FormFieldModel } from '../models/form-field.model';
-import { FormRowModel } from '../../../../core/shared/config/config-submission-forms.model';
+import { FormRowModel } from '../../../../core/config/models/config-submission-forms.model';
 import { RowParser } from './row-parser';
 import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index 919f5cbdd9..776184e6f9 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -5,7 +5,7 @@ import { Subscription } from 'rxjs/Subscription';
 
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
 import { hasValue, isEmpty, isNotNull } from '../../shared/empty.util';
-import { SubmissionDefinitionsModel } from '../../core/shared/config/config-submission-definitions.model';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { SubmissionService } from '../submission.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 552d0ecff4..3eace39fb9 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChange
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { SubmissionDefinitionsModel } from '../../core/shared/config/config-submission-definitions.model';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { Workspaceitem } from '../../core/submission/models/workspaceitem.model';
 import { SubmissionService } from '../submission.service';
 import { Subscription } from 'rxjs/Subscription';
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index a92788d4cf..9bd88f035a 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -8,7 +8,7 @@ import {
   WorkspaceitemSectionsObject
 } from '../../core/submission/models/workspaceitem-sections.model';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { SubmissionDefinitionsModel } from '../../core/shared/config/config-submission-definitions.model';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { SectionsType } from '../sections/sections-type';
 
 /**
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 97df0d0287..89b9289b38 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -39,7 +39,7 @@ import { SubmissionObject } from '../../core/submission/models/submission-object
 import { TranslateService } from '@ngx-translate/core';
 import { SubmissionState } from '../submission.reducers';
 import { SubmissionObjectEntry } from './submission-objects.reducer';
-import { SubmissionSectionModel } from '../../core/shared/config/config-submission-section.model';
+import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
 import parseSectionErrors from '../utils/parseSectionErrors';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
 
diff --git a/src/app/submission/sections/container/section-container.component.spec.ts b/src/app/submission/sections/container/section-container.component.spec.ts
index e53377b26a..e66713c2ed 100644
--- a/src/app/submission/sections/container/section-container.component.spec.ts
+++ b/src/app/submission/sections/container/section-container.component.spec.ts
@@ -30,9 +30,7 @@ import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
 describe('SectionContainerComponent test suite', () => {
 
   let testComp: TestComponent;
-  let sectionContainerComponent: SectionContainerComponent;
   let testFixture: ComponentFixture<TestComponent>;
-  let sectionContainerComponentComponentFixture: ComponentFixture<SectionContainerComponent>;
   let html;
 
   const config = {
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 0484829439..77ca64ad3b 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -14,7 +14,7 @@ import { SubmissionFormsConfigService } from '../../../core/config/submission-fo
 import { hasValue, isNotEmpty, isUndefined } from '../../../shared/empty.util';
 import { ConfigData } from '../../../core/config/config-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SubmissionFormsModel } from '../../../core/shared/config/config-submission-forms.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { SubmissionSectionError, SubmissionSectionObject } from '../../objects/submission-objects.reducer';
 import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { WorkspaceitemSectionDataType } from '../../../core/submission/models/workspaceitem-sections.model';
diff --git a/src/app/submission/sections/upload/file/edit/file-edit.component.ts b/src/app/submission/sections/upload/file/edit/file-edit.component.ts
index fcc323047f..db9f1dc32f 100644
--- a/src/app/submission/sections/upload/file/edit/file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/file-edit.component.ts
@@ -29,9 +29,9 @@ import {
 } from './files-edit.model';
 import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
 import { isNotEmpty, isNotUndefined } from '../../../../../shared/empty.util';
-import { SubmissionFormsModel } from '../../../../../core/shared/config/config-submission-forms.model';
+import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
 import { FormFieldModel } from '../../../../../shared/form/builder/models/form-field.model';
-import { AccessConditionOption } from '../../../../../core/shared/config/config-access-condition-option.model';
+import { AccessConditionOption } from '../../../../../core/config/models/config-access-condition-option.model';
 import { SubmissionService } from '../../../../submission.service';
 
 @Component({
diff --git a/src/app/submission/sections/upload/file/file.component.ts b/src/app/submission/sections/upload/file/file.component.ts
index 9b5c01c23d..b0f79a8a98 100644
--- a/src/app/submission/sections/upload/file/file.component.ts
+++ b/src/app/submission/sections/upload/file/file.component.ts
@@ -9,7 +9,7 @@ import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/
 import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 
 import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
-import { SubmissionFormsModel } from '../../../../core/shared/config/config-submission-forms.model';
+import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
 import { deleteProperty } from '../../../../shared/object.util';
 import { dateToGMTString } from '../../../../shared/date.util';
 import { JsonPatchOperationsService } from '../../../../core/json-patch/json-patch-operations.service';
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 39fcd19074..797e4a1148 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -8,8 +8,8 @@ import { SectionUploadService } from './section-upload.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { GroupEpersonService } from '../../../core/eperson/group-eperson.service';
 import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
-import { SubmissionUploadsModel } from '../../../core/shared/config/config-submission-uploads.model';
-import { SubmissionFormsModel } from '../../../core/shared/config/config-submission-forms.model';
+import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { SectionsType } from '../sections-type';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionDataObject } from '../models/section-data.model';
@@ -22,7 +22,7 @@ import { SubmissionService } from '../../submission.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { ResourcePolicy } from '../../../core/shared/resource-policy.model';
-import { AccessConditionOption } from '../../../core/shared/config/config-access-condition-option.model';
+import { AccessConditionOption } from '../../../core/config/models/config-access-condition-option.model';
 
 export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
 export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 7f325babc8..0fa06943f6 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -35,7 +35,7 @@ import { SectionsType } from './sections/sections-type';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { SubmissionDefinitionsModel } from '../core/shared/config/config-submission-definitions.model';
+import { SubmissionDefinitionsModel } from '../core/config/models/config-submission-definitions.model';
 import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model';
 
 @Injectable()
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index 68f5f2547f..9e5aa14c2a 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { Subscription } from 'rxjs/Subscription';
 
 import { hasValue, isEmpty, isNotNull } from '../../shared/empty.util';
-import { SubmissionDefinitionsModel } from '../../core/shared/config/config-submission-definitions.model';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionService } from '../submission.service';