diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index f143a46cc..6ca4b3c4c 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -11,7 +11,9 @@ import { AppRoutingModule } from './routing.module';
 import { AppComponent } from './app.component';
 
 import { CoreModule } from './core/core.module';
+import { DomainModule } from './domain/domain.module';
 import { MetadataProviderModule } from './metadata-provider/metadata-provider.module';
+
 import { reducers, metaReducers } from './app.reducer';
 import { CustomRouterStateSerializer } from './shared/util';
 
@@ -36,6 +38,7 @@ import { environment } from '../environments/environment';
         AppRoutingModule,
         CoreModule.forRoot(),
         MetadataProviderModule.forRoot(),
+        DomainModule.forRoot(),
         StoreRouterConnectingModule,
         NgbDropdownModule.forRoot(),
         NgbModalModule.forRoot(),
diff --git a/ui/src/app/dashboard/effect/search.effects.ts b/ui/src/app/dashboard/effect/search.effects.ts
index f4bdf3028..d57132de1 100644
--- a/ui/src/app/dashboard/effect/search.effects.ts
+++ b/ui/src/app/dashboard/effect/search.effects.ts
@@ -5,7 +5,7 @@ import { Store } from '@ngrx/store';
 import * as providerSearch from '../action/search.action';
 import * as fromProviders from '../../metadata-provider/reducer';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 
 @Injectable()
 export class SearchEffects {
diff --git a/ui/src/app/domain/domain.module.ts b/ui/src/app/domain/domain.module.ts
index b082a4295..91ae7e2ce 100644
--- a/ui/src/app/domain/domain.module.ts
+++ b/ui/src/app/domain/domain.module.ts
@@ -1,5 +1,10 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 
+import { EntityDescriptorService } from './service/entity-descriptor.service';
+import { ListValuesService } from './service/list-values.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from './service/provider-change-emitter.service';
+import { EntityIdService } from './service/entity-id.service';
+import { EntityDraftService } from './service/entity-draft.service';
 @NgModule({
     declarations: [],
     entryComponents: [],
@@ -11,7 +16,14 @@ export class DomainModule {
     static forRoot(): ModuleWithProviders {
         return {
             ngModule: RootDomainModule,
-            providers: []
+            providers: [
+                EntityDescriptorService,
+                EntityIdService,
+                EntityDraftService,
+                ListValuesService,
+                ProviderStatusEmitter,
+                ProviderValueEmitter
+            ]
         };
     }
 }
diff --git a/ui/src/app/metadata-provider/service/entity-descriptor.service.spec.ts b/ui/src/app/domain/service/entity-descriptor.service.spec.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/entity-descriptor.service.spec.ts
rename to ui/src/app/domain/service/entity-descriptor.service.spec.ts
diff --git a/ui/src/app/metadata-provider/service/entity-descriptor.service.ts b/ui/src/app/domain/service/entity-descriptor.service.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/entity-descriptor.service.ts
rename to ui/src/app/domain/service/entity-descriptor.service.ts
diff --git a/ui/src/app/metadata-provider/service/entity-draft.service.ts b/ui/src/app/domain/service/entity-draft.service.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/entity-draft.service.ts
rename to ui/src/app/domain/service/entity-draft.service.ts
diff --git a/ui/src/app/metadata-provider/service/entity-id.service.ts b/ui/src/app/domain/service/entity-id.service.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/entity-id.service.ts
rename to ui/src/app/domain/service/entity-id.service.ts
diff --git a/ui/src/app/metadata-provider/service/entity-validators.service.spec.ts b/ui/src/app/domain/service/entity-validators.service.spec.ts
similarity index 98%
rename from ui/src/app/metadata-provider/service/entity-validators.service.spec.ts
rename to ui/src/app/domain/service/entity-validators.service.spec.ts
index 5c39ac08d..c0ef54fa3 100644
--- a/ui/src/app/metadata-provider/service/entity-validators.service.spec.ts
+++ b/ui/src/app/domain/service/entity-validators.service.spec.ts
@@ -6,7 +6,7 @@ import 'rxjs/add/observable/of';
 
 let ids = ['foo', 'bar', 'baz'];
 
-describe(`EntityDescriptorService`, () => {
+describe(`Entity Validators service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
diff --git a/ui/src/app/metadata-provider/service/entity-validators.service.ts b/ui/src/app/domain/service/entity-validators.service.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/entity-validators.service.ts
rename to ui/src/app/domain/service/entity-validators.service.ts
diff --git a/ui/src/app/metadata-provider/service/list-values.service.spec.ts b/ui/src/app/domain/service/list-values.service.spec.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/list-values.service.spec.ts
rename to ui/src/app/domain/service/list-values.service.spec.ts
diff --git a/ui/src/app/metadata-provider/service/list-values.service.ts b/ui/src/app/domain/service/list-values.service.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/list-values.service.ts
rename to ui/src/app/domain/service/list-values.service.ts
diff --git a/ui/src/app/metadata-provider/service/provider-change-emitter.service.spec.ts b/ui/src/app/domain/service/provider-change-emitter.service.spec.ts
similarity index 96%
rename from ui/src/app/metadata-provider/service/provider-change-emitter.service.spec.ts
rename to ui/src/app/domain/service/provider-change-emitter.service.spec.ts
index af7a40ce3..6602c6c34 100644
--- a/ui/src/app/metadata-provider/service/provider-change-emitter.service.spec.ts
+++ b/ui/src/app/domain/service/provider-change-emitter.service.spec.ts
@@ -5,7 +5,7 @@ import { AbstractControl, FormBuilder, ReactiveFormsModule } from '@angular/form
 import 'rxjs/add/observable/of';
 import { ProviderStatusEmitter, ProviderValueEmitter } from './provider-change-emitter.service';
 
-describe(`EntityDescriptorService`, () => {
+describe(`Provider Change emitter service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
diff --git a/ui/src/app/metadata-provider/service/provider-change-emitter.service.ts b/ui/src/app/domain/service/provider-change-emitter.service.ts
similarity index 100%
rename from ui/src/app/metadata-provider/service/provider-change-emitter.service.ts
rename to ui/src/app/domain/service/provider-change-emitter.service.ts
diff --git a/ui/src/app/edit-provider/component/unsaved-dialog.component.ts b/ui/src/app/edit-provider/component/unsaved-dialog.component.ts
index 684784eee..add2f3b59 100644
--- a/ui/src/app/edit-provider/component/unsaved-dialog.component.ts
+++ b/ui/src/app/edit-provider/component/unsaved-dialog.component.ts
@@ -7,7 +7,7 @@ import { Subject } from 'rxjs/Subject';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 import * as fromEditor from '../reducer';
 import { UpdateDraftRequest } from '../../metadata-provider/action/draft.action';
-import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 import { SaveChanges, CancelChanges } from '../action/editor.action';
 
 @Component({
diff --git a/ui/src/app/edit-provider/container/editor.component.ts b/ui/src/app/edit-provider/container/editor.component.ts
index 549a90570..ff294bdf5 100644
--- a/ui/src/app/edit-provider/container/editor.component.ts
+++ b/ui/src/app/edit-provider/container/editor.component.ts
@@ -29,7 +29,7 @@ import * as fromProviders from '../../metadata-provider/reducer';
 import { UpdateProviderRequest } from '../../metadata-provider/action/provider.action';
 import * as fromEditor from '../reducer';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { UpdateStatus, UpdateChanges, CancelChanges } from '../action/editor.action';
 import { EDITOR as EditorDef, EditorFlowDefinition } from '../editor-definition.const';
 import { UnsavedDialogComponent } from '../component/unsaved-dialog.component';
diff --git a/ui/src/app/edit-provider/container/wizard.component.ts b/ui/src/app/edit-provider/container/wizard.component.ts
index e47bcd586..02ceafda0 100644
--- a/ui/src/app/edit-provider/container/wizard.component.ts
+++ b/ui/src/app/edit-provider/container/wizard.component.ts
@@ -29,7 +29,7 @@ import * as draftActions from '../../metadata-provider/action/draft.action';
 import { AddProviderRequest, RemoveProviderRequest } from '../../metadata-provider/action/provider.action';
 import * as fromEditor from '../reducer';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { UpdateStatus, UpdateChanges, SaveChanges } from '../action/editor.action';
 import { WIZARD as WizardDef, EditorFlowDefinition } from '../editor-definition.const';
 import { CanComponentDeactivate } from '../../core/service/can-deactivate.guard';
diff --git a/ui/src/app/edit-provider/effect/editor.effect.ts b/ui/src/app/edit-provider/effect/editor.effect.ts
index 3b1383107..5d3404f37 100644
--- a/ui/src/app/edit-provider/effect/editor.effect.ts
+++ b/ui/src/app/edit-provider/effect/editor.effect.ts
@@ -4,7 +4,7 @@ import { Effect, Actions } from '@ngrx/effects';
 import * as editor from '../action/editor.action';
 import * as provider from '../../metadata-provider/action/provider.action';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 import { Router } from '@angular/router';
 
 @Injectable()
diff --git a/ui/src/app/edit-provider/effect/wizard.effect.ts b/ui/src/app/edit-provider/effect/wizard.effect.ts
index 1a1d0119d..b63babc78 100644
--- a/ui/src/app/edit-provider/effect/wizard.effect.ts
+++ b/ui/src/app/edit-provider/effect/wizard.effect.ts
@@ -5,7 +5,7 @@ import * as editorActions from '../action/editor.action';
 import * as draft from '../../metadata-provider/action/draft.action';
 import * as provider from '../../metadata-provider/action/provider.action';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDraftService } from '../../metadata-provider/service/entity-draft.service';
+import { EntityDraftService } from '../../domain/service/entity-draft.service';
 
 @Injectable()
 export class WizardEffects {
diff --git a/ui/src/app/metadata-filter/component/filter-form.component.spec.ts b/ui/src/app/metadata-filter/component/filter-form.component.spec.ts
index 30790e2cc..c27808310 100644
--- a/ui/src/app/metadata-filter/component/filter-form.component.spec.ts
+++ b/ui/src/app/metadata-filter/component/filter-form.component.spec.ts
@@ -4,7 +4,7 @@ import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { FilterFormComponent } from './filter-form.component';
 import * as fromFilter from '../reducer';
 import { ProviderEditorFormModule } from '../../metadata-provider/component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbPopoverModule, NgbPopoverConfig, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { NavigatorService } from '../../core/service/navigator.service';
 import { SharedModule } from '../../shared/shared.module';
diff --git a/ui/src/app/metadata-filter/component/filter-form.component.ts b/ui/src/app/metadata-filter/component/filter-form.component.ts
index 2c776fdf9..bd9fba675 100644
--- a/ui/src/app/metadata-filter/component/filter-form.component.ts
+++ b/ui/src/app/metadata-filter/component/filter-form.component.ts
@@ -7,11 +7,11 @@ import 'rxjs/add/operator/takeWhile';
 
 import * as fromFilter from '../reducer';
 import { ProviderFormFragmentComponent } from '../../metadata-provider/component/forms/provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { SearchDialogComponent } from '../component/search-dialog.component';
 import { ViewMoreIds, CancelCreateFilter, QueryEntityIds } from '../action/filter.action';
-import { EntityValidators } from '../../metadata-provider/service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 
 @Component({
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.spec.ts b/ui/src/app/metadata-filter/container/new-filter.component.spec.ts
index 6d77525ac..b64869d1f 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.spec.ts
+++ b/ui/src/app/metadata-filter/container/new-filter.component.spec.ts
@@ -4,7 +4,7 @@ import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { NewFilterComponent } from './new-filter.component';
 import * as fromFilter from '../reducer';
 import { ProviderEditorFormModule } from '../../metadata-provider/component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbPopoverModule, NgbPopoverConfig, NgbModalModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { NavigatorService } from '../../core/service/navigator.service';
 import { SharedModule } from '../../shared/shared.module';
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata-filter/container/new-filter.component.ts
index 91691b745..3773010c0 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata-filter/container/new-filter.component.ts
@@ -8,11 +8,11 @@ import 'rxjs/add/observable/fromPromise';
 
 import * as fromFilter from '../reducer';
 import { ProviderFormFragmentComponent } from '../../metadata-provider/component/forms/provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../metadata-provider/service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { SearchDialogComponent } from '../component/search-dialog.component';
 import { ViewMoreIds, CancelCreateFilter, QueryEntityIds, CreateFilter, UpdateFilter, SaveFilter } from '../action/filter.action';
-import { EntityValidators } from '../../metadata-provider/service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 import { PreviewFilterComponent } from '../component/preview-filter.component';
 
diff --git a/ui/src/app/metadata-filter/effect/filter.effect.ts b/ui/src/app/metadata-filter/effect/filter.effect.ts
index 892f20359..40c7235af 100644
--- a/ui/src/app/metadata-filter/effect/filter.effect.ts
+++ b/ui/src/app/metadata-filter/effect/filter.effect.ts
@@ -15,7 +15,7 @@ import * as filter from '../action/filter.action';
 import * as fromFilter from '../reducer';
 
 import { SearchDialogComponent } from '../component/search-dialog.component';
-import { EntityIdService } from '../../metadata-provider/service/entity-id.service';
+import { EntityIdService } from '../../domain/service/entity-id.service';
 import { MetadataFilterService } from '../service/filter.service';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 
diff --git a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.spec.ts
index 77b11cfff..12680c035 100644
--- a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { AdvancedInfoFormComponent } from './advanced-info-form.component';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
diff --git a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts
index 655075a3e..cce947a77 100644
--- a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts
@@ -9,10 +9,10 @@ import 'rxjs/add/operator/takeUntil';
 import 'rxjs/add/operator/startWith';
 
 import * as fromProviders from '../../reducer';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { EntityValidators } from '../../service/entity-validators.service';
+import { EntityValidators } from '../../../domain/service/entity-validators.service';
 import * as patterns from '../../../shared/regex';
 
 @Component({
diff --git a/ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts
index 58ac9c818..518a5ec0f 100644
--- a/ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AssertionFormComponent } from './assertion-form.component';
diff --git a/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts b/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts
index 3d55536ce..7ad059efd 100644
--- a/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, SsoService } from '../../../domain/model/metadata-provider';
 import * as patterns from '../../../shared/regex';
 
diff --git a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts
index cb106c4b8..6f15fa5f9 100644
--- a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts
@@ -2,12 +2,11 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AttributeReleaseFormComponent } from './attribute-release-form.component';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import * as stubs from '../../../../testing/provider.stub';
 
 describe('Attribute Release Form Component', () => {
diff --git a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts b/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts
index a068a963d..390b71fa5 100644
--- a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts
@@ -4,9 +4,9 @@ import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/last';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
-import { ListValuesService } from '../../service/list-values.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FormArray } from '@angular/forms/src/model';
 
 @Component({
diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts
index fc636ae01..125142fc7 100644
--- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts
@@ -3,11 +3,11 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { Provider } from '../../../domain/entity/Provider';
+import { ListValuesService } from '../../../domain/service/list-values.service';
+import { Provider } from '../../../domain/entity/provider';
 import { DescriptorInfoFormComponent } from './descriptor-info-form.component';
 
 import * as stubs from '../../../../testing/provider.stub';
diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts
index f1c6b8df6..9033aa0df 100644
--- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts
@@ -4,9 +4,9 @@ import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
-import { ListValuesService } from '../../service/list-values.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
     selector: 'descriptor-info-form',
diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts
index 7b9f3e95f..6cebda632 100644
--- a/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts
@@ -4,11 +4,10 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute, Router } from '@angular/router';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FinishFormComponent } from './finish-form.component';
 import { RouterStub, RouterLinkStubDirective } from '../../../../testing/router.stub';
 import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
@@ -16,12 +15,13 @@ import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 import * as stubs from '../../../../testing/provider.stub';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 import { I18nTextComponent } from '../i18n-text.component';
+import { Provider } from '../../../domain/entity/provider';
 
 @Component({
     template: `<finish-form [provider]="provider"></finish-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider
     });
 
diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.ts b/ui/src/app/metadata-provider/component/forms/finish-form.component.ts
index 42cfbdbd0..a29c5a787 100644
--- a/ui/src/app/metadata-provider/component/forms/finish-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/finish-form.component.ts
@@ -2,9 +2,9 @@ import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, C
 import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
-import { ListValuesService } from '../../service/list-values.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
     selector: 'finish-form',
diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts
index ab6087c89..5a8e75612 100644
--- a/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts
@@ -3,22 +3,22 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { KeyInfoFormComponent } from './key-info-form.component';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 
 import * as stubs from '../../../../testing/provider.stub';
 import { I18nTextComponent } from '../i18n-text.component';
+import { Provider } from '../../../domain/entity/provider';
 
 @Component({
     template: `<key-info-form [provider]="provider"></key-info-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider,
         securityInfo: {
             ...stubs.secInfo,
diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts
index 93988fb3e..952a24712 100644
--- a/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts
@@ -3,8 +3,7 @@ import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@ang
 import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Certificate } from '../../../domain/model/metadata-provider';
 
 @Component({
diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts
index dcfab2c02..1fa280400 100644
--- a/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts
@@ -3,22 +3,22 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { LogoutFormComponent } from './logout-form.component';
 
 import * as stubs from '../../../../testing/provider.stub';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 import { I18nTextComponent } from '../i18n-text.component';
+import { Provider } from '../../../domain/entity/provider';
 
 @Component({
     template: `<logout-form [provider]="provider"></logout-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider,
         logoutEndpoints: [stubs.logoutEndpoint]
     });
@@ -85,7 +85,7 @@ describe('Logout Endpoints Form Component', () => {
 
     describe('ngOnChanges method', () => {
         it('should add endpoints if provided', () => {
-            instance.provider = new EntityDescriptor({
+            instance.provider = new Provider({
                 ...stubs.provider
             });
             fixture.detectChanges();
diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.ts b/ui/src/app/metadata-provider/component/forms/logout-form.component.ts
index 4e71c7184..1c9083434 100644
--- a/ui/src/app/metadata-provider/component/forms/logout-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/logout-form.component.ts
@@ -3,8 +3,7 @@ import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@ang
 import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, LogoutEndpoint } from '../../../domain/model/metadata-provider';
 import * as patterns from '../../../shared/regex';
 
diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts
index 320fb5f08..1635b6ad6 100644
--- a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts
@@ -3,11 +3,11 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
+import { Provider } from '../../../domain/entity/provider';
 import { MetadataUiFormComponent } from './metadata-ui-form.component';
 
 import * as stubs from '../../../../testing/provider.stub';
@@ -18,7 +18,7 @@ import { I18nTextComponent } from '../i18n-text.component';
     template: `<metadata-ui-form [provider]="provider"></metadata-ui-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider
     });
 
diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts
index 16e53d315..2fb3ca2ee 100644
--- a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts
@@ -2,7 +2,7 @@ import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, C
 import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
 import * as patterns from '../../../shared/regex';
 
diff --git a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts
index bb32c9dbb..299f8c1ce 100644
--- a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts
@@ -2,11 +2,10 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { OrganizationInfoFormComponent } from './organization-info-form.component';
 import * as stubs from '../../../../testing/provider.stub';
 
diff --git a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts
index 94f3e04ab..e9b2ab7ea 100644
--- a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts
@@ -4,10 +4,10 @@ import { Observable } from 'rxjs/Observable';
 import { Subscription } from 'rxjs/Subscription';
 import 'rxjs/add/operator/startWith';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { EntityValidators } from '../../service/entity-validators.service';
+import { EntityValidators } from '../../../domain/service/entity-validators.service';
 import * as patterns from '../../../shared/regex';
 
 @Component({
diff --git a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts
index bdc19a905..168004a41 100644
--- a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 
 
 describe('Provider Form Fragment Component', () => {
diff --git a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts
index f89325345..266c89738 100644
--- a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts
@@ -8,7 +8,7 @@ import { Subject } from 'rxjs/Subject';
 import 'rxjs/add/operator/takeUntil';
 import 'rxjs/add/operator/startWith';
 
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
 import * as fromProviders from '../../reducer';
 
diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts
index 88b396847..26fb0f362 100644
--- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts
+++ b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts
@@ -3,21 +3,21 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provider-change-emitter.service';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 import * as fromProviders from '../../reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import { ListValuesService } from '../../service/list-values.service';
-import { EntityDescriptor } from '../../model/entity-descriptor';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { RelyingPartyFormComponent } from './relying-party-form.component';
-
+import { Provider } from '../../../domain/entity/provider';
 import * as stubs from '../../../../testing/provider.stub';
 import { SharedModule } from '../../../shared/shared.module';
 
+
 @Component({
     template: `<relying-party-form [provider]="provider"></relying-party-form>`
 })
 class TestHostComponent {
-    provider = new EntityDescriptor({
+    provider = new Provider({
         ...stubs.provider,
         relyingPartyOverrides: {
             nameIdFormats: [],
diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts
index af7536c64..72003c50f 100644
--- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts
+++ b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts
@@ -3,9 +3,8 @@ import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@ang
 import { Observable } from 'rxjs/Observable';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
-
-import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service';
-import { ListValuesService } from '../../service/list-values.service';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
+import { ListValuesService } from '../../../domain/service/list-values.service';
 import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
 
 import { URL_REGEX } from '../../../shared/regex';
diff --git a/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts b/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts
index e736b767c..a8d100945 100644
--- a/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts
+++ b/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs/Observable';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 import * as FileSaver from 'file-saver';
 import { Subscription } from 'rxjs/Subscription';
 import * as XmlFormatter from 'xml-formatter';
diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.ts b/ui/src/app/metadata-provider/container/blank-provider.component.ts
index b4def73c0..08232fa92 100644
--- a/ui/src/app/metadata-provider/container/blank-provider.component.ts
+++ b/ui/src/app/metadata-provider/container/blank-provider.component.ts
@@ -17,7 +17,7 @@ import { Store } from '@ngrx/store';
 import { AddDraftRequest } from '../action/draft.action';
 import { AddProviderRequest, UploadProviderRequest } from '../action/provider.action';
 import * as fromProviders from '../reducer';
-import { EntityValidators } from '../service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 
 @Component({
     selector: 'blank-provider-form',
diff --git a/ui/src/app/metadata-provider/container/new-provider.component.ts b/ui/src/app/metadata-provider/container/new-provider.component.ts
index 1e2e9f5dd..7aaf99583 100644
--- a/ui/src/app/metadata-provider/container/new-provider.component.ts
+++ b/ui/src/app/metadata-provider/container/new-provider.component.ts
@@ -21,7 +21,7 @@ import { Provider } from '../../domain/entity/provider';
 import { AddDraftRequest } from '../action/draft.action';
 import { AddProviderRequest, UploadProviderRequest, CreateProviderFromUrlRequest } from '../action/provider.action';
 import * as fromProviders from '../reducer';
-import { EntityValidators } from '../service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 
 @Component({
     selector: 'new-provider-page',
diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.ts b/ui/src/app/metadata-provider/container/upload-provider.component.ts
index e22bde17a..e929e15c9 100644
--- a/ui/src/app/metadata-provider/container/upload-provider.component.ts
+++ b/ui/src/app/metadata-provider/container/upload-provider.component.ts
@@ -7,7 +7,7 @@ import 'rxjs/add/operator/distinctUntilChanged';
 import 'rxjs/add/operator/take';
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
-import { EntityValidators } from '../service/entity-validators.service';
+import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { FileService } from '../../core/service/file.service';
 
 @Component({
diff --git a/ui/src/app/metadata-provider/effect/draft.effects.ts b/ui/src/app/metadata-provider/effect/draft.effects.ts
index 9895c12f1..e422e9144 100644
--- a/ui/src/app/metadata-provider/effect/draft.effects.ts
+++ b/ui/src/app/metadata-provider/effect/draft.effects.ts
@@ -6,7 +6,7 @@ import { Router } from '@angular/router';
 
 import * as draftActions from '../action/draft.action';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDraftService } from '../service/entity-draft.service';
+import { EntityDraftService } from '../../domain/service/entity-draft.service';
 
 @Injectable()
 export class DraftEffects {
diff --git a/ui/src/app/metadata-provider/effect/provider.effects.ts b/ui/src/app/metadata-provider/effect/provider.effects.ts
index 0f1d6f781..689448d59 100644
--- a/ui/src/app/metadata-provider/effect/provider.effects.ts
+++ b/ui/src/app/metadata-provider/effect/provider.effects.ts
@@ -7,7 +7,7 @@ import { Router } from '@angular/router';
 import * as providerActions from '../action/provider.action';
 import * as draftActions from '../action/draft.action';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../service/entity-descriptor.service';
+import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 
 @Injectable()
 export class ProviderEffects {
diff --git a/ui/src/app/metadata-provider/metadata-provider.module.ts b/ui/src/app/metadata-provider/metadata-provider.module.ts
index 948706417..666e19b25 100644
--- a/ui/src/app/metadata-provider/metadata-provider.module.ts
+++ b/ui/src/app/metadata-provider/metadata-provider.module.ts
@@ -6,22 +6,19 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 
-import { EntityDescriptorService } from './service/entity-descriptor.service';
 import { DraftEffects } from './effect/draft.effects';
 import { ProviderEffects } from './effect/provider.effects';
 import { reducers } from './reducer';
 
 import { NewProviderComponent } from './container/new-provider.component';
 
-import { ListValuesService } from './service/list-values.service';
-import { ProviderStatusEmitter, ProviderValueEmitter } from './service/provider-change-emitter.service';
+
 import { ProviderEditorFormModule } from './component';
 import { PreviewProviderDialogComponent } from './component/preview-provider-dialog.component';
-import { EntityDraftService } from './service/entity-draft.service';
 import { PretttyXml } from './pipe/pretty-xml.pipe';
 import { UploadProviderComponent } from './container/upload-provider.component';
 import { BlankProviderComponent } from './container/blank-provider.component';
-import { EntityIdService } from './service/entity-id.service';
+
 
 @NgModule({
     declarations: [
@@ -51,14 +48,7 @@ export class MetadataProviderModule {
     static forRoot(): ModuleWithProviders {
         return {
             ngModule: RootProviderModule,
-            providers: [
-                EntityIdService,
-                EntityDescriptorService,
-                EntityDraftService,
-                ProviderStatusEmitter,
-                ListValuesService,
-                ProviderValueEmitter
-            ]
+            providers: []
         };
     }
 }
diff --git a/ui/src/testing/provider.stub.ts b/ui/src/testing/provider.stub.ts
index 41fd4110e..724efd971 100644
--- a/ui/src/testing/provider.stub.ts
+++ b/ui/src/testing/provider.stub.ts
@@ -5,7 +5,7 @@ import {
     Certificate,
     SecurityInfo,
     LogoutEndpoint
-} from '../app/metadata-provider/model/metadata-provider';
+} from '../app/domain/model/metadata-provider';
 
 export const draft = {
     entityId: 'foo',