diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 7ee5acda8..364388566 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -4,7 +4,7 @@
         <img src="/assets/shibboleth_icon_color_130x130.png" width="30" height="30" class="d-inline-block align-top" alt="Shibboleth Logo - Click to be directed to www.shibboleth.net">
         <span class="d-lg-inline d-none">Shibboleth</span>
     </a>
-    <span class="navbar-text" i18n="@@label--app">Metadata Source Management</span>
+    <span class="navbar-text" i18n="@@label--app">Source Management</span>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
             aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -24,29 +24,29 @@
                 </button>
                 <div ngbDropdownMenu aria-labelledby="addNewDropdown">
                     <a class="nav-link"
-                        routerLink="/filter/new"
+                        routerLink="/metadata/resolver/new"
                         routerLinkActive="active"
-                        aria-label="Add a new metadata filter"
+                        aria-label="Add a new metadata provider"
                         role="button">
-                        <i class="fa fa-cubes fa-fw" aria-hidden="true"></i>
+                        <i class="fa fa-cube fa-fw" aria-hidden="true"></i>
                         &nbsp;
-                        <ng-container i18n="@@action--add-filter">Filter</ng-container>
+                        <ng-container i18n="@@action--add-source">Metadata Source</ng-container>
                     </a>
                     <a class="nav-link"
-                        routerLink="/new"
+                        routerLink="/metadata/provider/new"
                         routerLinkActive="active"
-                        aria-label="Launch wizard to add a new provider"
+                        aria-label="Add a new metadata resolver"
                         role="button">
-                        <i class="fa fa-cube fa-fw" aria-hidden="true"></i>
+                        <i class="fa fa-cubes fa-fw" aria-hidden="true"></i>
                         &nbsp;
-                        <ng-container i18n="@@action--add-source">Metadata Source</ng-container>
+                        <ng-container i18n="@@action--add-filter">Metadata Provider</ng-container>
                     </a>
                 </div>
             </li>
             <li class="nav-item">
-                <a class="nav-link" routerLink="/dashboard" routerLinkActive="active" aria-label="Metadata sources dashboard">
+                <a class="nav-link" routerLink="/metadata" routerLinkActive="active" aria-label="Metadata Dashboard">
                     <i class="fa fa-th fa-fw" aria-hidden="true"></i>
-                    <ng-container i18n="@@action--manage-sources">Manage Sources</ng-container>
+                    <ng-container i18n="@@action--dashboard">Dashboard</ng-container>
                 </a>
             </li>
             <li>
diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts
index 62dabd575..2c78a42c4 100644
--- a/ui/src/app/app.component.spec.ts
+++ b/ui/src/app/app.component.spec.ts
@@ -54,7 +54,7 @@ describe('AppComponent', () => {
 
     it('should create the app', async(() => {
         expect(app).toBeTruthy();
-        expect(store.dispatch).toHaveBeenCalledTimes(4);
+        expect(store.dispatch).toHaveBeenCalledTimes(1);
     }));
 
     it(`should have as title 'Shib-UI'`, async(() => {
diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index 6a2702749..f3e44f399 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -6,10 +6,7 @@ import { Store } from '@ngrx/store';
 
 import * as fromRoot from './core/reducer';
 import { VersionInfo } from './core/model/version';
-import { LoadProviderRequest } from './domain/action/provider-collection.action';
-import { LoadDraftRequest } from './domain/action/draft-collection.action';
 import { VersionInfoLoadRequestAction } from './core/action/version.action';
-import { LoadFilterRequest } from './domain/action/filter-collection.action';
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
@@ -30,9 +27,6 @@ export class AppComponent implements OnInit {
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new LoadProviderRequest());
-        this.store.dispatch(new LoadFilterRequest());
-        this.store.dispatch(new LoadDraftRequest());
         this.store.dispatch(new VersionInfoLoadRequestAction());
     }
 }
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index 15c94ea59..85dd2dcf9 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -7,24 +7,19 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 
 import { NgbDropdownModule, NgbModalModule, NgbPopoverModule, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { AppRoutingModule } from './routing.module';
+import { AppRoutingModule } from './app.routing';
 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';
-
-import { CachingInterceptor } from './core/service/cache.interceptor';
 import { AuthorizedInterceptor } from './core/service/authorized.interceptor';
 import { NotificationModule } from './notification/notification.module';
 import { ErrorInterceptor } from './core/service/error.interceptor';
 import { NavigatorService } from './core/service/navigator.service';
-
-import { environment } from '../environments/environment';
 import { ContentionModule } from './contention/contention.module';
+import { SharedModule } from './shared/shared.module';
 
 @NgModule({
     declarations: [
@@ -36,27 +31,21 @@ import { ContentionModule } from './contention/contention.module';
         }),
         EffectsModule.forRoot([]),
         BrowserModule,
-        AppRoutingModule,
         CoreModule.forRoot(),
-        MetadataProviderModule.forRoot(),
-        DomainModule.forRoot(),
         StoreRouterConnectingModule,
         NgbDropdownModule.forRoot(),
         NgbModalModule.forRoot(),
         NgbPopoverModule.forRoot(),
         NgbPaginationModule.forRoot(),
         NotificationModule,
+        HttpClientModule,
         ContentionModule,
-        HttpClientModule
+        SharedModule,
+        AppRoutingModule
     ],
     providers: [
         NavigatorService,
         { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer },
-        /*{
-            provide: HTTP_INTERCEPTORS,
-            useClass: CachingInterceptor,
-            multi: true
-        },*/
         {
             provide: HTTP_INTERCEPTORS,
             useClass: AuthorizedInterceptor,
diff --git a/ui/src/app/app.reducer.ts b/ui/src/app/app.reducer.ts
index bd5aa2946..5808ccf22 100644
--- a/ui/src/app/app.reducer.ts
+++ b/ui/src/app/app.reducer.ts
@@ -1,5 +1,4 @@
-import { ActionReducerMap, MetaReducer, ActionReducer } from '@ngrx/store';
-import { routerReducer, RouterReducerState } from '@ngrx/router-store';
+import { ActionReducerMap, MetaReducer } from '@ngrx/store';
 import * as fromRouter from '@ngrx/router-store';
 
 import { RouterStateUrl } from './shared/util';
diff --git a/ui/src/app/app.routing.ts b/ui/src/app/app.routing.ts
new file mode 100644
index 000000000..3de190469
--- /dev/null
+++ b/ui/src/app/app.routing.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+const routes: Routes = [
+    { path: '', redirectTo: 'metadata', pathMatch: 'full' },
+    {
+        path: 'metadata',
+        loadChildren: './metadata/metadata.module#MetadataModule'
+    }
+];
+
+@NgModule({
+    imports: [RouterModule.forRoot(routes)],
+    exports: [RouterModule]
+})
+export class AppRoutingModule { }
diff --git a/ui/src/app/contention/action/contention.action.ts b/ui/src/app/contention/action/contention.action.ts
index bcf216008..0976c9c2d 100644
--- a/ui/src/app/contention/action/contention.action.ts
+++ b/ui/src/app/contention/action/contention.action.ts
@@ -1,7 +1,5 @@
 import { Action } from '@ngrx/store';
 import { Contention, ContentionResolution } from '../model/contention';
-import { MetadataEntity } from '../../domain/domain.type';
-
 
 export enum ContentionActionTypes {
     SHOW_CONTENTION = '[Contention] Show Contention',
diff --git a/ui/src/app/contention/component/change-item.component.ts b/ui/src/app/contention/component/change-item.component.ts
index c2cf99a7f..31e565286 100644
--- a/ui/src/app/contention/component/change-item.component.ts
+++ b/ui/src/app/contention/component/change-item.component.ts
@@ -1,15 +1,5 @@
-import { Component, OnInit, Input, OnChanges } from '@angular/core';
-import { FormGroup, Validators, FormBuilder } from '@angular/forms';
-import { Observable, of } from 'rxjs';
-import { map, withLatestFrom } from 'rxjs/operators';
-import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-
-import * as fromContention from '../reducer';
-import { ResolveContentionAction } from '../action/contention.action';
+import { Component, Input, OnChanges } from '@angular/core';
 import { ChangeItem } from '../model/contention';
-import { DifferentialService } from '../../core/service/differential.service';
 
 export enum ValueTypes {
     array = 'array',
diff --git a/ui/src/app/contention/component/contention-dialog.component.ts b/ui/src/app/contention/component/contention-dialog.component.ts
index f9108d64c..1f3070081 100644
--- a/ui/src/app/contention/component/contention-dialog.component.ts
+++ b/ui/src/app/contention/component/contention-dialog.component.ts
@@ -1,13 +1,9 @@
-import { Component, OnInit, Input, OnChanges } from '@angular/core';
-import { FormGroup, Validators, FormBuilder } from '@angular/forms';
-import { Observable, of } from 'rxjs';
-import { map, withLatestFrom } from 'rxjs/operators';
-import { Router } from '@angular/router';
+import { Component } from '@angular/core';
+import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import * as fromContention from '../reducer';
-import { ResolveContentionAction } from '../action/contention.action';
 import { Contention, ChangeItem } from '../model/contention';
 
 @Component({
diff --git a/ui/src/app/contention/contention.module.ts b/ui/src/app/contention/contention.module.ts
index 670c8eac8..4ce48c3c3 100644
--- a/ui/src/app/contention/contention.module.ts
+++ b/ui/src/app/contention/contention.module.ts
@@ -1,16 +1,14 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
-import { HttpClientModule } from '@angular/common/http';
 
 import { reducers } from './reducer';
 import { ContentionEffects } from './effect/contention.effect';
 import { ContentionDialogComponent } from './component/contention-dialog.component';
 import { ChangeItemComponent } from './component/change-item.component';
-import { DomainModule } from '../domain/domain.module';
 import { ContentionService } from './service/contention.service';
+import { SharedModule } from '../shared/shared.module';
 
 export const COMPONENTS = [
     ContentionDialogComponent,
@@ -20,7 +18,7 @@ export const COMPONENTS = [
 @NgModule({
     imports: [
         CommonModule,
-        DomainModule,
+        SharedModule,
         StoreModule.forFeature('contention', reducers),
         EffectsModule.forFeature([ContentionEffects])
     ],
diff --git a/ui/src/app/contention/effect/contention.effect.ts b/ui/src/app/contention/effect/contention.effect.ts
index b034bb8d3..aa89ffbd1 100644
--- a/ui/src/app/contention/effect/contention.effect.ts
+++ b/ui/src/app/contention/effect/contention.effect.ts
@@ -1,7 +1,5 @@
 import { Injectable } from '@angular/core';
 import { Effect, Actions, ofType } from '@ngrx/effects';
-import { Location } from '@angular/common';
-
 import { of } from 'rxjs';
 import { map, tap, catchError, switchMap } from 'rxjs/operators';
 
@@ -9,7 +7,6 @@ import {
     ShowContentionAction,
     ResolveContentionAction,
     ContentionActionTypes,
-    ContentionActionUnion,
     CancelContentionAction
 } from '../action/contention.action';
 import { ModalService, DEFAULT_MODAL_OPTIONS } from '../../core/service/modal.service';
diff --git a/ui/src/app/contention/reducer/contention.reducer.ts b/ui/src/app/contention/reducer/contention.reducer.ts
index 2b940a976..d5432a93d 100644
--- a/ui/src/app/contention/reducer/contention.reducer.ts
+++ b/ui/src/app/contention/reducer/contention.reducer.ts
@@ -1,6 +1,5 @@
 import { ContentionActionTypes, ContentionActionUnion } from '../action/contention.action';
 import { Contention } from '../model/contention';
-import { MetadataEntity } from '../../domain/domain.type';
 
 export interface State {
     contention: Contention<any>;
diff --git a/ui/src/app/core/service/differential.service.ts b/ui/src/app/core/service/differential.service.ts
index b4e432126..f4ecdf0c1 100644
--- a/ui/src/app/core/service/differential.service.ts
+++ b/ui/src/app/core/service/differential.service.ts
@@ -20,7 +20,6 @@ export class DifferentialService {
         return lib.updatedDiff(originalObj, updatedObj);
     }
     detailedDiff(originalObj, updatedObj) { // returns an object with the added, deleted and updated differences
-        console.log(originalObj, updatedObj);
         return lib.detailedDiff(originalObj, updatedObj);
     }
 }
diff --git a/ui/src/app/dashboard/container/dashboard.component.html b/ui/src/app/dashboard/container/dashboard.component.html
deleted file mode 100644
index 02f379165..000000000
--- a/ui/src/app/dashboard/container/dashboard.component.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<div class="container-fluid p-3" role="main">
-    <section class="section">
-        <div class="section-header bg-primary p-2 text-light">
-            <div class="row justify-content-between">
-                <div class="col-md-4">
-                    <span class="lead" i18n="@@label--current-metadata-sources">Current Metadata Sources</span>
-                </div>
-                <div class="col-md-4 text-right">
-                    <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-light" id="filterDropdown" ngbDropdownToggle>
-                            <i class="fa fa-fw" [ngClass]="{
-                                'fa-cube': filtering === 'provider',
-                                'fa-cubes': filtering === 'filter',
-                                'fa-dot-circle-o': filtering === 'all'
-                            }"></i>
-                            <ng-container i18n="@@label--selected-filter-option">
-                                {filtering, select, filter {Show Filters} provider {Show Sources} other {Show All}}
-                            </ng-container>
-                        </button>
-                        <div ngbDropdownMenu aria-labelledby="filterDropdown">
-                            <button class="dropdown-item"
-                                *ngFor="let option of filterOptions; index as i"
-                                (click)="changeFilter(option)">
-                                <i class="fa fa-fw" [ngClass]="{
-                                    'fa-cube': option === 'provider',
-                                    'fa-cubes': option === 'filter',
-                                    'fa-dot-circle-o': option === 'all'
-                                }"></i>
-                                <ng-container i18n="@@label--select-filter-option">
-                                    {option, select, filter {Show Filters} provider {Show Source} other {Show All}}
-                                </ng-container>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4">
-                    <provider-search
-                        [query]="searchQuery$ | async"
-                        [searching]="loading$ | async"
-                        (search)="search($event)">
-                    </provider-search>
-                </div>
-            </div>
-        </div>
-        <div class="section-body p-2 border border-top-0 border-primary">
-            <ul class="list-unstyled m-0">
-                <li *ngFor="let entity of limited$ | async; index as i" [ngClass]="{'mt-2': i > 0}" aria-label="Provider Item Accordion. Press Spacebar to open">
-                    <entity-item
-                        [entity]="entity"
-                        [isOpen]="(entitiesOpen$ | async)[entity.id || entity.entityId]"
-                        (select)="edit(entity)"
-                        (toggle)="toggleProvider(entity)"
-                        (preview)="openPreviewDialog(entity)"
-                        (delete)="deleteProvider(entity)">
-                    </entity-item>
-                </li>
-            </ul>
-            <div class="mt-3 clearfix" *ngIf="(total$ | async) > limit">
-                <ngb-pagination
-                    class="float-right"
-                    [collectionSize]="total$ | async"
-                    [page]="page"
-                    [pageSize]="limit"
-                    (pageChange)="changePage($event)"
-                    aria-label="Pages">
-                </ngb-pagination>
-            </div>
-        </div>
-    </section>
-</div>
diff --git a/ui/src/app/dashboard/reducer/dashboard.reducer.ts b/ui/src/app/dashboard/reducer/dashboard.reducer.ts
deleted file mode 100644
index a71c8b812..000000000
--- a/ui/src/app/dashboard/reducer/dashboard.reducer.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { createSelector, createFeatureSelector } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import * as dashboard from '../action/dashboard.action';
-import * as fromRoot from '../../core/reducer';
-
-export interface State {
-    providersOpen: {[key: string]: boolean};
-}
-
-export const initialState: State = {
-    providersOpen: {}
-};
-
-export function reducer(state = initialState, action: dashboard.Actions): State {
-    switch (action.type) {
-        case dashboard.TOGGLE_ENTITY_DISPLAY: {
-            return Object.assign({}, state, {
-                providersOpen: {
-                    ...state.providersOpen,
-                    ...{[action.payload]: !state.providersOpen[action.payload]}
-                }
-            });
-        }
-        default: {
-            // console.log(state);
-            return state;
-        }
-    }
-}
-
-export const providersOpen = (state: State) => state.providersOpen;
diff --git a/ui/src/app/domain/action/provider-collection.action.ts b/ui/src/app/domain/action/provider-collection.action.ts
deleted file mode 100644
index 0d890aad4..000000000
--- a/ui/src/app/domain/action/provider-collection.action.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { Action } from '@ngrx/store';
-import { MetadataProvider } from '../model/metadata-provider';
-import { Update } from '@ngrx/entity';
-
-export enum ProviderCollectionActionTypes {
-    FIND = '[Metadata Provider] Find',
-    SELECT = '[Metadata Provider] Select',
-    SELECT_SUCCESS = '[Metadata Provider] Select Success',
-
-    UPDATE_PROVIDER_REQUEST = '[Metadata Provider] Update Request',
-    UPDATE_PROVIDER_SUCCESS = '[Metadata Provider] Update Success',
-    UPDATE_PROVIDER_FAIL = '[Metadata Provider] Update Fail',
-
-    LOAD_PROVIDER_REQUEST = '[Metadata Provider Collection] Provider REQUEST',
-    LOAD_PROVIDER_SUCCESS = '[Metadata Provider Collection] Provider SUCCESS',
-    LOAD_PROVIDER_ERROR = '[Metadata Provider Collection] Provider ERROR',
-    ADD_PROVIDER = '[Metadata Provider Collection] Add Provider',
-    ADD_PROVIDER_SUCCESS = '[Metadata Provider Collection] Add Provider Success',
-    ADD_PROVIDER_FAIL = '[Metadata Provider Collection] Add Provider Fail',
-    REMOVE_PROVIDER = '[Metadata Provider Collection] Remove Provider',
-    REMOVE_PROVIDER_SUCCESS = '[Metadata Provider Collection] Remove Provider Success',
-    REMOVE_PROVIDER_FAIL = '[Metadata Provider Collection] Remove Provider Fail',
-
-    UPLOAD_PROVIDER_REQUEST = '[Metadata Provider Collection] Upload Provider Request',
-    CREATE_PROVIDER_FROM_URL_REQUEST = '[Metadata Provider Collection] Create Provider From URL Request',
-}
-
-export class FindProvider implements Action {
-    readonly type = ProviderCollectionActionTypes.FIND;
-
-    constructor(public payload: string) { }
-}
-
-export class SelectProvider implements Action {
-    readonly type = ProviderCollectionActionTypes.SELECT;
-
-    constructor(public payload: string) { }
-}
-
-export class SelectProviderSuccess implements Action {
-    readonly type = ProviderCollectionActionTypes.SELECT_SUCCESS;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class LoadProviderRequest implements Action {
-    readonly type = ProviderCollectionActionTypes.LOAD_PROVIDER_REQUEST;
-
-    constructor() { }
-}
-
-export class LoadProviderSuccess implements Action {
-    readonly type = ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS;
-
-    constructor(public payload: MetadataProvider[]) { }
-}
-
-export class LoadProviderError implements Action {
-    readonly type = ProviderCollectionActionTypes.LOAD_PROVIDER_ERROR;
-
-    constructor(public payload: any) { }
-}
-
-export class UpdateProviderRequest implements Action {
-    readonly type = ProviderCollectionActionTypes.UPDATE_PROVIDER_REQUEST;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class UpdateProviderSuccess implements Action {
-    readonly type = ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS;
-
-    constructor(public payload: Update<MetadataProvider>) { }
-}
-
-export class UpdateProviderFail implements Action {
-    readonly type = ProviderCollectionActionTypes.UPDATE_PROVIDER_FAIL;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class AddProviderRequest implements Action {
-    readonly type = ProviderCollectionActionTypes.ADD_PROVIDER;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class AddProviderSuccess implements Action {
-    readonly type = ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class AddProviderFail implements Action {
-    readonly type = ProviderCollectionActionTypes.ADD_PROVIDER_FAIL;
-
-    constructor(public payload: any) { }
-}
-
-export class RemoveProviderRequest implements Action {
-    readonly type = ProviderCollectionActionTypes.REMOVE_PROVIDER;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class RemoveProviderSuccess implements Action {
-    readonly type = ProviderCollectionActionTypes.REMOVE_PROVIDER_SUCCESS;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class RemoveProviderFail implements Action {
-    readonly type = ProviderCollectionActionTypes.REMOVE_PROVIDER_FAIL;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class UploadProviderRequest implements Action {
-    readonly type = ProviderCollectionActionTypes.UPLOAD_PROVIDER_REQUEST;
-
-    constructor(public payload: { name: string, body: string }) { }
-}
-
-export class CreateProviderFromUrlRequest implements Action {
-    readonly type = ProviderCollectionActionTypes.CREATE_PROVIDER_FROM_URL_REQUEST;
-
-    constructor(public payload: { name: string, url: string }) { }
-}
-
-export type ProviderCollectionActionsUnion =
-    | LoadProviderRequest
-    | LoadProviderSuccess
-    | LoadProviderError
-    | AddProviderRequest
-    | AddProviderSuccess
-    | AddProviderFail
-    | RemoveProviderRequest
-    | RemoveProviderSuccess
-    | RemoveProviderFail
-    | FindProvider
-    | SelectProvider
-    | SelectProviderSuccess
-    | UpdateProviderRequest
-    | UpdateProviderSuccess
-    | UpdateProviderFail
-    | UploadProviderRequest
-    | CreateProviderFromUrlRequest;
diff --git a/ui/src/app/domain/domain.type.ts b/ui/src/app/domain/domain.type.ts
deleted file mode 100644
index d9bd86cfa..000000000
--- a/ui/src/app/domain/domain.type.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { MetadataFilter } from './model/metadata-filter';
-import { MetadataProvider } from './model/metadata-provider';
-
-export * from './model/metadata-provider';
-export * from './model/metadata-filter';
-
-export enum DomainEntityKinds {
-    filter = 'filter',
-    provider = 'provider'
-}
-
-export type MetadataEntity =
-    | MetadataFilter
-    | MetadataProvider;
diff --git a/ui/src/app/domain/effect/provider-collection.effect.spec.ts b/ui/src/app/domain/effect/provider-collection.effect.spec.ts
deleted file mode 100644
index e0ab36ae1..000000000
--- a/ui/src/app/domain/effect/provider-collection.effect.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { TestBed, tick, fakeAsync } from '@angular/core/testing';
-import { Actions } from '@ngrx/effects';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { empty, Observable, of } from 'rxjs';
-
-import { TestActions, getActions } from '../../../testing/effect.util';
-import { MetadataProvider } from '../domain.type';
-import { ProviderCollectionEffects } from './provider-collection.effects';
-import { EntityDescriptorService } from '../service/entity-descriptor.service';
-import { Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-
-describe('Provider Collection Effects', () => {
-    let effects: ProviderCollectionEffects;
-    let draftService: any;
-    let actions$: TestActions;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            providers: [
-                ProviderCollectionEffects,
-                {
-                    provide: EntityDescriptorService,
-                    useValue: {
-                        query: () => { },
-                        find: (id: string) => { },
-                        save: (e: MetadataProvider) => { },
-                        update: (e: MetadataProvider) => { },
-                        remove: (e: MetadataProvider) => { },
-                        preview: (e: MetadataProvider) => { },
-                        upload: (name: string, xml: string) => { },
-                        createFromUrl: (name: string, url: string) => { }
-                    },
-                },
-                { provide: Actions, useFactory: getActions },
-                { provide: Router, useClass: RouterStub }
-            ],
-        });
-
-        effects = TestBed.get(ProviderCollectionEffects);
-        draftService = TestBed.get(EntityDescriptorService);
-        actions$ = TestBed.get(Actions);
-    });
-});
diff --git a/ui/src/app/domain/effect/provider-collection.effects.ts b/ui/src/app/domain/effect/provider-collection.effects.ts
deleted file mode 100644
index b402318f9..000000000
--- a/ui/src/app/domain/effect/provider-collection.effects.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Effect, Actions, ofType } from '@ngrx/effects';
-import { Action } from '@ngrx/store';
-import { Router } from '@angular/router';
-
-import { Observable, of } from 'rxjs';
-import { map, catchError, switchMap, tap } from 'rxjs/operators';
-
-import * as providerActions from '../action/provider-collection.action';
-import * as draftActions from '../action/draft-collection.action';
-import { ProviderCollectionActionsUnion, ProviderCollectionActionTypes } from '../action/provider-collection.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
-import { removeNulls } from '../../shared/util';
-
-/* istanbul ignore next */
-@Injectable()
-export class ProviderCollectionEffects {
-
-    @Effect()
-    loadProviders$ = this.actions$.pipe(
-        ofType<providerActions.LoadProviderRequest>(ProviderCollectionActionTypes.LOAD_PROVIDER_REQUEST),
-        switchMap(() =>
-            this.descriptorService
-                .query()
-                .pipe(
-                    map(descriptors => new providerActions.LoadProviderSuccess(descriptors)),
-                    catchError(error => of(new providerActions.LoadProviderError(error)))
-                )
-        )
-    );
-
-    @Effect()
-    updateProvider$ = this.actions$.pipe(
-        ofType<providerActions.UpdateProviderRequest>(ProviderCollectionActionTypes.UPDATE_PROVIDER_REQUEST),
-        map(action => action.payload),
-        switchMap(provider => {
-            delete provider.modifiedDate;
-            delete provider.createdDate;
-            return this.descriptorService
-                .update(provider)
-                .pipe(
-                    map(p => new providerActions.UpdateProviderSuccess({
-                        id: p.id,
-                        changes: p
-                    })),
-                    catchError(err => of(new providerActions.UpdateProviderFail(provider)))
-                );
-        })
-    );
-
-    @Effect({ dispatch: false })
-    updateProviderSuccessRedirect$ = this.actions$.pipe(
-        ofType<providerActions.UpdateProviderSuccess>(ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS),
-        map(action => action.payload),
-        tap(provider => this.router.navigate(['/dashboard']))
-    );
-
-    @Effect()
-    updateProviderSuccessReload$ = this.actions$.pipe(
-        ofType<providerActions.UpdateProviderSuccess>(ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS),
-        map(action => action.payload),
-        map(provider => new providerActions.LoadProviderRequest())
-    );
-
-    @Effect()
-    selectProvider$ = this.actions$.pipe(
-        ofType<providerActions.SelectProvider>(ProviderCollectionActionTypes.SELECT),
-        map(action => action.payload),
-        switchMap(id =>
-            this.descriptorService
-                .find(id)
-                .pipe(
-                    map(p => new providerActions.SelectProviderSuccess(p))
-                )
-        )
-    );
-
-    @Effect()
-    addProviderRequest$ = this.actions$.pipe(
-        ofType<providerActions.AddProviderRequest>(ProviderCollectionActionTypes.ADD_PROVIDER),
-        map(action => action.payload),
-        map(provider => ({
-            ...provider,
-            relyingPartyOverrides: removeNulls(provider.relyingPartyOverrides)
-        })),
-        switchMap(provider =>
-            this.descriptorService
-                .save(provider)
-                .pipe(
-                    map(p => new providerActions.AddProviderSuccess(p)),
-                    catchError(() => of(new providerActions.AddProviderFail(provider)))
-                )
-        )
-    );
-
-    @Effect({ dispatch: false })
-    addProviderSuccessRedirect$ = this.actions$.pipe(
-        ofType<providerActions.AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
-        map(action => action.payload),
-        tap(provider => this.router.navigate(['/dashboard']))
-    );
-    @Effect()
-    addProviderSuccessReload$ = this.actions$.pipe(
-        ofType<providerActions.AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
-        map(action => action.payload),
-        map(provider => new providerActions.LoadProviderRequest())
-    );
-
-    @Effect()
-    addProviderSuccessRemoveDraft$ = this.actions$.pipe(
-        ofType<providerActions.AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
-        map(action => action.payload),
-        map(provider => new draftActions.RemoveDraftRequest(provider))
-    );
-
-    @Effect()
-    uploadProviderRequest$ = this.actions$.pipe(
-        ofType<providerActions.UploadProviderRequest>(ProviderCollectionActionTypes.UPLOAD_PROVIDER_REQUEST),
-        map(action => action.payload),
-        switchMap(file =>
-            this.descriptorService
-                .upload(file.name, file.body)
-                .pipe(
-                    map(p => new providerActions.AddProviderSuccess(p)),
-                    catchError(() => of(new providerActions.AddProviderFail(file)))
-                )
-        )
-    );
-
-    @Effect()
-    createProviderFromUrlRequest$ = this.actions$.pipe(
-        ofType<providerActions.CreateProviderFromUrlRequest>(ProviderCollectionActionTypes.CREATE_PROVIDER_FROM_URL_REQUEST),
-        map(action => action.payload),
-        switchMap(file =>
-            this.descriptorService
-                .createFromUrl(file.name, file.url)
-                .pipe(
-                    map(p => new providerActions.AddProviderSuccess(p)),
-                    catchError(() => of(new providerActions.AddProviderFail(file)))
-                )
-        )
-    );
-
-    constructor(
-        private descriptorService: EntityDescriptorService,
-        private actions$: Actions,
-        private router: Router
-    ) { }
-} /* istanbul ignore next */
diff --git a/ui/src/app/domain/model/metadata-provider.ts b/ui/src/app/domain/model/metadata-provider.ts
deleted file mode 100644
index c01b9ce3a..000000000
--- a/ui/src/app/domain/model/metadata-provider.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Organization } from './organization';
-import { MDUI } from './mdui';
-import { Contact } from './contact';
-import { SecurityInfo } from './security-info';
-import { SsoService } from './sso-service';
-import { LogoutEndpoint } from './logout-endpoint';
-import { IdpSsoDescriptor } from './sso-descriptor';
-import { RelyingPartyOverrides } from './relying-party-overrides';
-import { Certificate } from './certificate';
-
-import { MetadataBase } from './metadata-base';
-
-export interface MetadataProvider extends MetadataBase {
-    entityId: string;
-    serviceProviderName: string;
-    organization?: Organization;
-    contacts?: Contact[];
-    mdui?: MDUI;
-    securityInfo?: SecurityInfo;
-    assertionConsumerServices?: SsoService[];
-    serviceProviderSsoDescriptor?: IdpSsoDescriptor;
-    logoutEndpoints?: LogoutEndpoint[];
-    serviceEnabled?: boolean;
-    relyingPartyOverrides: RelyingPartyOverrides;
-    attributeRelease: string[];
-}
-
-export * from './organization';
-export * from './mdui';
-export * from './contact';
-export * from './security-info';
-export * from './sso-service';
-export * from './logout-endpoint';
-export * from './sso-descriptor';
-export * from './relying-party-overrides';
-export * from './certificate';
diff --git a/ui/src/app/domain/reducer/draft-collection.reducer.ts b/ui/src/app/domain/reducer/draft-collection.reducer.ts
deleted file mode 100644
index 0fea3ea3d..000000000
--- a/ui/src/app/domain/reducer/draft-collection.reducer.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { createSelector } from '@ngrx/store';
-import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
-
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import * as providerAction from '../action/provider-collection.action';
-import { DraftCollectionActionsUnion, DraftCollectionActionTypes } from '../action/draft-collection.action';
-
-export interface DraftCollectionState extends EntityState<MetadataProvider> {
-    selectedDraftId: string | null;
-}
-
-export function sortByName(a: MetadataProvider, b: MetadataProvider): number {
-    return a.serviceProviderName.localeCompare(b.serviceProviderName);
-}
-
-export const adapter: EntityAdapter<MetadataProvider> = createEntityAdapter<MetadataProvider>({
-    sortComparer: sortByName,
-    selectId: (model: MetadataProvider) => model.entityId
-});
-
-export const initialState: DraftCollectionState = adapter.getInitialState({
-    selectedDraftId: null,
-});
-
-export function reducer(state = initialState, action: DraftCollectionActionsUnion): DraftCollectionState {
-    switch (action.type) {
-        case DraftCollectionActionTypes.LOAD_DRAFT_SUCCESS: {
-            return adapter.addMany(action.payload, {
-                ...state,
-                selectedDraftId: state.selectedDraftId,
-            });
-        }
-
-        case DraftCollectionActionTypes.UPDATE_DRAFT_SUCCESS: {
-            return adapter.updateOne(action.payload, state);
-        }
-
-        case DraftCollectionActionTypes.REMOVE_DRAFT_SUCCESS: {
-            return adapter.removeOne(action.payload.entityId, state);
-        }
-
-        case DraftCollectionActionTypes.SELECT: {
-            return {
-                ...state,
-                selectedDraftId: action.payload,
-            };
-        }
-
-        default: {
-            return state;
-        }
-    }
-}
-
-export const getSelectedDraftId = (state: DraftCollectionState) => state.selectedDraftId;
-export const {
-    selectIds: selectDraftIds,
-    selectEntities: selectDraftEntities,
-    selectAll: selectAllDrafts,
-    selectTotal: selectDraftTotal
-} = adapter.getSelectors();
diff --git a/ui/src/app/domain/reducer/index.ts b/ui/src/app/domain/reducer/index.ts
deleted file mode 100644
index a6281c90b..000000000
--- a/ui/src/app/domain/reducer/index.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/store';
-import * as fromFilter from './filter-collection.reducer';
-import * as fromProvider from './provider-collection.reducer';
-import * as fromDraft from './draft-collection.reducer';
-import * as fromRoot from '../../app.reducer';
-
-export interface CollectionState {
-    filters: fromFilter.FilterCollectionState;
-    providers: fromProvider.ProviderCollectionState;
-    drafts: fromDraft.DraftCollectionState;
-}
-
-export const reducers: ActionReducerMap<CollectionState> = {
-    filters: fromFilter.reducer,
-    providers: fromProvider.reducer,
-    drafts: fromDraft.reducer
-};
-
-export interface State extends fromRoot.State {
-    'collections': CollectionState;
-}
-
-export const getCollectionState = createFeatureSelector<CollectionState>('collections');
-
-/*
- *   Select pieces of Collection State - Functions
-*/
-export const getFiltersFromStateFn = (state: CollectionState) => state.filters;
-export const getProvidersStateFn = (state: CollectionState) => state.providers;
-export const getDraftsStateFn = (state: CollectionState) => state.drafts;
-
-export const getFilterEntityState = createSelector(getCollectionState, getFiltersFromStateFn);
-export const getProviderEntityState = createSelector(getCollectionState, getProvidersStateFn);
-export const getDraftEntityState = createSelector(getCollectionState, getDraftsStateFn);
-
-/*
- *   Utility functions
-*/
-
-export const combineAllFn = (d, p) => [...p, ...d];
-export const doesExistFn = (ids, selected) => ids.indexOf(selected) > -1;
-export const getInCollectionFn = (entities, selectedId) => {
-    return selectedId && entities[selectedId];
-};
-export const getEntityIdsFn = list => list.map(entity => entity.entityId);
-
-/*
- *   Select pieces of Provider Collection
-*/
-
-export const getProviderEntities = createSelector(getProviderEntityState, fromProvider.selectProviderEntities);
-export const getSelectedProviderId = createSelector(getProviderEntityState, fromProvider.getSelectedProviderId);
-export const getSelectedProvider = createSelector(getProviderEntities, getSelectedProviderId, getInCollectionFn);
-export const getProviderIds = createSelector(getProviderEntityState, fromProvider.selectProviderIds);
-export const getProviderCollection = createSelector(getProviderEntityState, getProviderIds, fromProvider.selectAllProviders);
-
-/*
- *   Select pieces of Draft Collection
-*/
-
-export const getDraftEntities = createSelector(getDraftEntityState, fromDraft.selectDraftEntities);
-export const getDraftIds = createSelector(getDraftEntityState, fromDraft.selectDraftIds);
-export const getDraftCollection = createSelector(getDraftEntityState, getDraftIds, fromDraft.selectAllDrafts);
-
-export const getSelectedDraftId = createSelector(getDraftEntityState, fromDraft.getSelectedDraftId);
-export const getSelectedDraft = createSelector(getDraftEntities, getSelectedDraftId, getInCollectionFn);
-export const isSelectedProviderInCollection = createSelector(getProviderIds, getSelectedProviderId, doesExistFn);
-export const isSelectedDraftInCollection = createSelector(getDraftIds, getSelectedDraftId, doesExistFn);
-
-/*
- *   Select pieces of Filter Collection
-*/
-
-export const getAllFilters = createSelector(getFilterEntityState, fromFilter.selectAllFilters);
-export const getFilterEntities = createSelector(getFilterEntityState, fromFilter.selectFilterEntities);
-export const getSelectedFilterId = createSelector(getFilterEntityState, fromFilter.getSelectedFilterId);
-export const getSelectedFilter = createSelector(getFilterEntities, getSelectedFilterId, getInCollectionFn);
-export const getFilterIds = createSelector(getFilterEntityState, fromFilter.selectFilterIds);
-export const getFilterCollectionIsLoaded = createSelector(getFilterEntityState, fromFilter.getIsLoaded);
-
-/*
- *   Combine pieces of Collection State
-*/
-
-export const getAllProviders = createSelector(getDraftCollection, getProviderCollection, combineAllFn);
-export const getAllProviderIds = createSelector(getDraftIds, getProviderIds, combineAllFn);
-
-export const getAllEntityIds = createSelector(getAllProviders, getEntityIdsFn);
diff --git a/ui/src/app/domain/reducer/provider-collection.reducer.ts b/ui/src/app/domain/reducer/provider-collection.reducer.ts
deleted file mode 100644
index 42a18c8c4..000000000
--- a/ui/src/app/domain/reducer/provider-collection.reducer.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { createSelector } from '@ngrx/store';
-import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
-
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import * as provider from '../action/provider-collection.action';
-import { ProviderCollectionActionsUnion, ProviderCollectionActionTypes } from '../action/provider-collection.action';
-
-export interface ProviderCollectionState extends EntityState<MetadataProvider> {
-    selectedProviderId: string | null;
-}
-
-export function sortByDate(a: MetadataProvider, b: MetadataProvider): number {
-    return a.createdDate.localeCompare(b.createdDate);
-}
-
-export const adapter: EntityAdapter<MetadataProvider> = createEntityAdapter<MetadataProvider>({
-    sortComparer: sortByDate,
-    selectId: (model: MetadataProvider) => model.id
-});
-
-export const initialState: ProviderCollectionState = adapter.getInitialState({
-    selectedProviderId: null
-});
-
-export function reducer(state = initialState, action: provider.ProviderCollectionActionsUnion): ProviderCollectionState {
-    switch (action.type) {
-        case ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS: {
-            return adapter.addAll(action.payload, {
-                ...state,
-                selectedProviderId: state.selectedProviderId
-            });
-        }
-
-        case ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS: {
-            return adapter.updateOne(action.payload, state);
-        }
-
-        case ProviderCollectionActionTypes.SELECT: {
-            return {
-                ...state,
-                selectedProviderId: action.payload,
-            };
-        }
-
-        default: {
-            return state;
-        }
-    }
-}
-
-export const getSelectedProviderId = (state: ProviderCollectionState) => state.selectedProviderId;
-export const {
-    selectIds: selectProviderIds,
-    selectEntities: selectProviderEntities,
-    selectAll: selectAllProviders,
-    selectTotal: selectProviderTotal
-} = adapter.getSelectors();
diff --git a/ui/src/app/edit-provider/container/provider.component.ts b/ui/src/app/edit-provider/container/provider.component.ts
deleted file mode 100644
index 0ca698a6b..000000000
--- a/ui/src/app/edit-provider/container/provider.component.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Component, Output, Input, EventEmitter, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-
-import { Store } from '@ngrx/store';
-import { NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
-
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { SelectProvider } from '../../domain/action/provider-collection.action';
-import * as fromProviders from '../../domain/reducer';
-
-@Component({
-    selector: 'provider-page',
-    templateUrl: './provider.component.html',
-    styleUrls: ['./provider.component.scss'],
-    providers: [NgbPopoverConfig]
-})
-export class ProviderComponent implements OnDestroy {
-    actionsSubscription: Subscription;
-
-    constructor(
-        store: Store<fromProviders.State>,
-        route: ActivatedRoute
-    ) {
-        this.actionsSubscription = route.params.pipe(
-            distinctUntilChanged(),
-            map(params => new SelectProvider(params.id))
-        ).subscribe(store);
-    }
-
-    ngOnDestroy() {
-        this.actionsSubscription.unsubscribe();
-    }
-} /* istanbul ignore next */
diff --git a/ui/src/app/edit-provider/editor.module.ts b/ui/src/app/edit-provider/editor.module.ts
deleted file mode 100644
index 8b2863fc0..000000000
--- a/ui/src/app/edit-provider/editor.module.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { CommonModule } from '@angular/common';
-import { ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { StoreModule } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
-
-import { ProviderComponent } from './container/provider.component';
-import { DraftComponent } from './container/draft.component';
-import { WizardComponent } from './container/wizard.component';
-import { EditorComponent } from './container/editor.component';
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { RootProviderModule } from '../metadata-provider/metadata-provider.module';
-import { ProviderEditorFormModule } from '../metadata-provider/component';
-import { reducers } from './reducer';
-
-import { UnsavedDialogComponent } from './component/unsaved-dialog.component';
-import { CanDeactivateGuard } from '../core/service/can-deactivate.guard';
-import { WizardNavComponent } from './component/wizard-nav.component';
-import { WizardEffects } from './effect/wizard.effect';
-import { EditorEffects } from './effect/editor.effect';
-import { ValidFormIconComponent } from './component/valid-form-icon.component';
-import { SharedModule } from '../shared/shared.module';
-import { DomainModule } from '../domain/domain.module';
-
-export const routes: Routes = [
-    {
-        path: ':id',
-        component: ProviderComponent,
-        canActivate: [],
-        children: [
-            { path: 'edit', redirectTo: 'edit/2' },
-            {
-                path: 'edit/:index',
-                component: EditorComponent,
-                canDeactivate: [CanDeactivateGuard]
-            }
-        ]
-    },
-    {
-        path: ':entityId',
-        component: DraftComponent,
-        canActivate: [],
-        children: [
-            { path: 'wizard', redirectTo: 'wizard/2' },
-            {
-                path: 'wizard/:index',
-                component: WizardComponent,
-                canDeactivate: [CanDeactivateGuard]
-            }
-        ]
-    }
-];
-
-@NgModule({
-    declarations: [
-        ProviderComponent,
-        EditorComponent,
-        WizardComponent,
-        UnsavedDialogComponent,
-        WizardNavComponent,
-        DraftComponent,
-        ValidFormIconComponent
-    ],
-    entryComponents: [
-        UnsavedDialogComponent
-    ],
-    imports: [
-        DomainModule,
-        CommonModule,
-        RouterModule,
-        ReactiveFormsModule,
-        RootProviderModule,
-        ProviderEditorFormModule,
-        NgbDropdownModule,
-        StoreModule.forFeature('edit-provider', reducers),
-        EffectsModule.forFeature([WizardEffects, EditorEffects]),
-        RouterModule.forChild(routes),
-        SharedModule
-    ],
-    providers: []
-})
-export class EditorModule { }
diff --git a/ui/src/app/edit-provider/effect/editor.effect.ts b/ui/src/app/edit-provider/effect/editor.effect.ts
deleted file mode 100644
index 1e14ca360..000000000
--- a/ui/src/app/edit-provider/effect/editor.effect.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Effect, Actions, ofType } from '@ngrx/effects';
-
-import { switchMap, map, withLatestFrom, tap } from 'rxjs/operators';
-
-import * as fromCollection from '../../domain/reducer';
-import * as fromRoot from '../../app.reducer';
-
-import * as editor from '../action/editor.action';
-import * as provider from '../../domain/action/provider-collection.action';
-
-import { ShowContentionAction } from '../../contention/action/contention.action';
-import { Contention, ContentionEntity } from '../../contention/model/contention';
-
-import { ProviderCollectionActionTypes } from '../../domain/action/provider-collection.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
-import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { MetadataResolverService } from '../../domain/service/metadata-resolver.service';
-import { ContentionService } from '../../contention/service/contention.service';
-
-@Injectable()
-export class EditorEffects {
-
-    @Effect()
-    cancelChanges$ = this.actions$.pipe(
-        ofType<editor.CancelChanges>(editor.CANCEL_CHANGES),
-        map(() => new provider.LoadProviderRequest()),
-        tap(() => this.router.navigate(['/dashboard']))
-    );
-
-    @Effect()
-    updateProviderSuccessRedirect$ = this.actions$.pipe(
-        ofType<provider.UpdateProviderSuccess>(ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS),
-        map(action => action.payload),
-        map(p => new editor.ResetChanges())
-    );
-
-    @Effect()
-    openContention$ = this.actions$.pipe(
-        ofType<provider.UpdateProviderFail>(ProviderCollectionActionTypes.UPDATE_PROVIDER_FAIL),
-        map(action => action.payload),
-        withLatestFrom(this.store.select(fromCollection.getSelectedProvider)),
-        switchMap(([filter, current]) => {
-            return this.service.find(filter.id).pipe(
-                map(data => new ShowContentionAction(this.contentionService.getContention(current, filter, data, {
-                    resolve: (obj) => this.store.dispatch(new provider.UpdateProviderRequest(obj)),
-                    reject: (obj) => this.store.dispatch(new editor.CancelChanges())
-                })))
-            );
-        })
-    );
-
-    constructor(
-        private store: Store<fromRoot.State>,
-        private service: EntityDescriptorService,
-        private actions$: Actions,
-        private router: Router,
-        private contentionService: ContentionService
-    ) { }
-}
diff --git a/ui/src/app/edit-provider/reducer/index.ts b/ui/src/app/edit-provider/reducer/index.ts
deleted file mode 100644
index ba82831f4..000000000
--- a/ui/src/app/edit-provider/reducer/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createSelector, createFeatureSelector } from '@ngrx/store';
-import * as fromRoot from '../../app.reducer';
-import * as fromEditor from './editor.reducer';
-
-export interface EditProviderState {
-    editor: fromEditor.EditorState;
-}
-
-export const reducers = {
-    editor: fromEditor.reducer
-};
-
-export interface State extends fromRoot.State {
-    'edit-provider': EditProviderState;
-}
-
-export const getEditProviderState = createFeatureSelector<EditProviderState>('edit-provider');
-export const getEditorState = createSelector(getEditProviderState, (state: EditProviderState) => state.editor);
-export const getEditorIsValid = createSelector(getEditorState, fromEditor.isEditorValid);
-export const getEditorIsSaved = createSelector(getEditorState, fromEditor.isEditorSaved);
-export const getEditorChanges = createSelector(getEditorState, fromEditor.getChanges);
-export const getEditorIsSaving = createSelector(getEditorState, fromEditor.isEditorSaving);
-export const getFormStatus = createSelector(getEditorState, fromEditor.getFormStatus);
-export const getInvalidEditorForms = createSelector(getEditorState, fromEditor.getInvalidForms);
diff --git a/ui/src/app/metadata-filter/action/filter.action.spec.ts b/ui/src/app/metadata-filter/action/filter.action.spec.ts
deleted file mode 100644
index 290f349cd..000000000
--- a/ui/src/app/metadata-filter/action/filter.action.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as actions from './filter.action';
-
-describe('Filter Actions', () => {
-    it('should provide actions', () => {
-        expect(new actions.CancelCreateFilter().type).toBe(actions.CANCEL_CREATE_FILTER);
-        expect(new actions.SelectId('foo').type).toBe(actions.SELECT_ID);
-    });
-});
diff --git a/ui/src/app/metadata-filter/action/search.action.ts b/ui/src/app/metadata-filter/action/search.action.ts
deleted file mode 100644
index a9312eff3..000000000
--- a/ui/src/app/metadata-filter/action/search.action.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Action } from '@ngrx/store';
-
-import { QueryParams } from '../../core/model/query';
-
-export const QUERY_ENTITY_IDS = '[Filter] Query Entity Ids';
-export const VIEW_MORE_IDS = '[Filter] View More Ids Modal';
-export const CANCEL_VIEW_MORE = '[Filter] Cancel View More';
-export const CLEAR_SEARCH = '[Filter] Clear Search';
-export const LOAD_ENTITY_IDS_SUCCESS = '[Entity ID Collection] Load Entity Ids Success';
-export const LOAD_ENTITY_IDS_ERROR = '[Entity ID Collection] Load Entity Ids Error';
-
-export class QueryEntityIds implements Action {
-    readonly type = QUERY_ENTITY_IDS;
-
-    constructor(public payload: QueryParams) { }
-}
-
-export class ViewMoreIds implements Action {
-    readonly type = VIEW_MORE_IDS;
-
-    constructor(public payload: string) { }
-}
-
-export class ClearSearch implements Action {
-    readonly type = CLEAR_SEARCH;
-}
-
-export class CancelViewMore implements Action {
-    readonly type = CANCEL_VIEW_MORE;
-}
-
-export class LoadEntityIdsSuccess implements Action {
-    readonly type = LOAD_ENTITY_IDS_SUCCESS;
-
-    constructor(public payload: string[]) { }
-}
-
-export class LoadEntityIdsError implements Action {
-    readonly type = LOAD_ENTITY_IDS_ERROR;
-
-    constructor(public payload: Error) { }
-}
-
-export type Actions =
-    | ViewMoreIds
-    | CancelViewMore
-    | ClearSearch
-    | LoadEntityIdsSuccess
-    | LoadEntityIdsError
-    | QueryEntityIds;
diff --git a/ui/src/app/metadata-filter/effect/filter.effect.ts b/ui/src/app/metadata-filter/effect/filter.effect.ts
deleted file mode 100644
index c74bd3893..000000000
--- a/ui/src/app/metadata-filter/effect/filter.effect.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Effect, Actions, ofType } from '@ngrx/effects';
-import { Store } from '@ngrx/store';
-import { of } from 'rxjs';
-import { map, switchMap, catchError, withLatestFrom, tap } from 'rxjs/operators';
-
-import { Router } from '@angular/router';
-
-import * as filterActions from '../action/filter.action';
-import * as fromCollection from '../../domain/reducer';
-import * as fromRoot from '../../app.reducer';
-import * as collection from '../../domain/action/filter-collection.action';
-import { FilterCollectionActionTypes } from '../../domain/action/filter-collection.action';
-import { EntityIdService } from '../../domain/service/entity-id.service';
-import { MetadataResolverService } from '../../domain/service/metadata-resolver.service';
-import { ShowContentionAction } from '../../contention/action/contention.action';
-import { MetadataFilter } from '../../domain/domain.type';
-import { ContentionService } from '../../contention/service/contention.service';
-
-@Injectable()
-export class FilterEffects {
-
-    @Effect()
-    loadEntityMdui$ = this.actions$.pipe(
-        ofType<filterActions.SelectId>(filterActions.SELECT_ID),
-        map(action => action.payload),
-        switchMap(query =>
-            this.idService.findEntityById(query).pipe(
-                map(data => new filterActions.LoadEntityPreviewSuccess(data)),
-                catchError(error => of(new filterActions.LoadEntityPreviewError(error)))
-            )
-        )
-    );
-
-    @Effect()
-    openContention$ = this.actions$.pipe(
-        ofType<collection.UpdateFilterFail>(collection.FilterCollectionActionTypes.UPDATE_FILTER_FAIL),
-        map(action => action.payload),
-        withLatestFrom(this.store.select(fromCollection.getSelectedFilter)),
-        switchMap(([filter, current]) =>
-            this.resolverService.find(filter.id).pipe(
-                map(data => new ShowContentionAction(this.contentionService.getContention(current, filter, data, {
-                    resolve: (obj) => this.store.dispatch(new collection.UpdateFilterRequest(<MetadataFilter>{ ...obj })),
-                    reject: (obj) => this.store.dispatch(new filterActions.CancelCreateFilter())
-                })))
-            )
-        )
-    );
-
-    @Effect({ dispatch: false })
-    saveFilterSuccess$ = this.actions$.pipe(
-        ofType<collection.AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
-        switchMap(() => this.router.navigate(['/dashboard']))
-    );
-
-    @Effect()
-    cancelChanges$ = this.actions$.pipe(
-        ofType<filterActions.CancelCreateFilter>(filterActions.CANCEL_CREATE_FILTER),
-        map(() => new collection.LoadFilterRequest()),
-        tap(() => this.router.navigate(['/dashboard']))
-    );
-
-    constructor(
-        private store: Store<fromRoot.State>,
-        private actions$: Actions,
-        private router: Router,
-        private idService: EntityIdService,
-        private resolverService: MetadataResolverService,
-        private contentionService: ContentionService
-    ) { }
-}
diff --git a/ui/src/app/metadata-provider/action/copy.action.ts b/ui/src/app/metadata-provider/action/copy.action.ts
deleted file mode 100644
index 1343aa9d1..000000000
--- a/ui/src/app/metadata-provider/action/copy.action.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Action } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-
-export enum CopySourceActionTypes {
-    CREATE_PROVIDER_COPY_REQUEST = '[Copy Provider] Create Provider Copy Request',
-    CREATE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Create Provider Copy Success',
-    CREATE_PROVIDER_COPY_ERROR = '[Copy Provider] Create Provider Copy Error',
-
-    UPDATE_PROVIDER_COPY = '[Copy Provider] Update Provider Copy Request',
-
-    UPDATE_PROVIDER_COPY_SECTIONS = '[Copy Provider] Update Provider Sections',
-
-    SAVE_PROVIDER_COPY_REQUEST = '[Copy Provider] Save Provider Copy Request',
-    SAVE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Save Provider Copy Request',
-    SAVE_PROVIDER_COPY_ERROR = '[Copy Provider] Save Provider Copy Request',
-}
-
-export class CreateProviderCopyRequest implements Action {
-    readonly type = CopySourceActionTypes.CREATE_PROVIDER_COPY_REQUEST;
-
-    constructor(public payload: { entityId: string, serviceProviderName: string, target: string }) { }
-}
-
-export class CreateProviderCopySuccess implements Action {
-    readonly type = CopySourceActionTypes.CREATE_PROVIDER_COPY_SUCCESS;
-
-    constructor(public payload: MetadataProvider) { }
-}
-
-export class CreateProviderCopyError implements Action {
-    readonly type = CopySourceActionTypes.CREATE_PROVIDER_COPY_ERROR;
-
-    constructor(public payload: Error) { }
-}
-
-export class UpdateProviderCopy implements Action {
-    readonly type = CopySourceActionTypes.UPDATE_PROVIDER_COPY;
-
-    constructor(public payload: Partial<MetadataProvider>) { }
-}
-
-export class UpdateProviderCopySections implements Action {
-    readonly type = CopySourceActionTypes.UPDATE_PROVIDER_COPY_SECTIONS;
-
-    constructor(public payload: string[]) { }
-}
-
-export type CopySourceActionUnion =
-    | CreateProviderCopyRequest
-    | CreateProviderCopySuccess
-    | CreateProviderCopyError
-    | UpdateProviderCopy
-    | UpdateProviderCopySections;
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
deleted file mode 100644
index e51cc7972..000000000
--- a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.spec.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-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 '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
-import { AdvancedInfoFormComponent } from './advanced-info-form.component';
-import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import * as stubs from '../../../../testing/provider.stub';
-
-describe('Advanced Info Form Component', () => {
-    let fixture: ComponentFixture<AdvancedInfoFormComponent>;
-    let instance: AdvancedInfoFormComponent;
-    let store: Store<fromCollections.CollectionState>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            providers: [
-                ProviderValueEmitter,
-                ProviderStatusEmitter,
-                NgbPopoverConfig
-            ],
-            imports: [
-                NoopAnimationsModule,
-                ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
-                NgbPopoverModule
-            ],
-            declarations: [
-                AdvancedInfoFormComponent
-            ],
-        });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
-
-        fixture = TestBed.createComponent(AdvancedInfoFormComponent);
-        instance = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it('should compile', () => {
-        expect(fixture).toBeDefined();
-    });
-
-    describe('ngOnChanges method', () => {
-        it('should set properties on the provider', () => {
-            instance.provider = stubs.provider;
-            fixture.detectChanges();
-            instance.ngOnChanges();
-            expect(instance.provider.organization).toEqual({});
-            expect(instance.provider.contacts).toEqual([]);
-        });
-    });
-
-    describe('removeContact method', () => {
-        it('should remove the contact at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
-                contacts: [stubs.contact]
-            };
-            fixture.detectChanges();
-            instance.ngOnChanges();
-            instance.removeContact(0);
-            expect(instance.contacts.length).toBe(0);
-        });
-    });
-
-    describe('addContact method', () => {
-        it('should remove the contact at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
-                contacts: [stubs.contact]
-            };
-            fixture.detectChanges();
-            instance.ngOnChanges();
-            instance.addContact();
-            expect(instance.contacts.length).toBe(2);
-        });
-    });
-});
diff --git a/ui/src/app/metadata-provider/container/new-provider.component.spec.ts b/ui/src/app/metadata-provider/container/new-provider.component.spec.ts
deleted file mode 100644
index 4c320fa21..000000000
--- a/ui/src/app/metadata-provider/container/new-provider.component.spec.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterModule, Router, ActivatedRoute } from '@angular/router';
-import { APP_BASE_HREF } from '@angular/common';
-
-import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { NewProviderComponent } from './new-provider.component';
-
-import { BlankProviderComponent } from './blank-provider.component';
-import { UploadProviderComponent } from './upload-provider.component';
-import { CopyProviderComponent } from './copy-provider.component';
-import { SharedModule } from '../../shared/shared.module';
-import { NavigatorService } from '../../core/service/navigator.service';
-import * as fromProvider from '../reducer';
-import * as fromCollections from '../../domain/reducer';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/activated-route.stub';
-import { I18nTextComponent } from '../../domain/component/i18n-text.component';
-
-describe('New Provider Page', () => {
-    let fixture: ComponentFixture<NewProviderComponent>;
-    let store: Store<fromCollections.State>;
-    let instance: NewProviderComponent;
-    let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub();
-    activatedRoute.testParamMap = { id: 'foo' };
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                NoopAnimationsModule,
-                StoreModule.forRoot({
-                    collections: combineReducers(fromCollections.reducers),
-                    provider: combineReducers(fromProvider.reducers)
-                }),
-                ReactiveFormsModule,
-                SharedModule,
-                RouterModule.forRoot([])
-            ],
-            declarations: [
-                NewProviderComponent,
-                BlankProviderComponent,
-                UploadProviderComponent,
-                CopyProviderComponent,
-                I18nTextComponent
-            ],
-            providers: [
-                NavigatorService,
-                { provide: ActivatedRoute, useValue: activatedRoute },
-                { provide: APP_BASE_HREF, useValue: '/' }
-            ]
-        });
-
-        fixture = TestBed.createComponent(NewProviderComponent);
-        instance = fixture.componentInstance;
-        store = TestBed.get(Store);
-
-        spyOn(store, 'dispatch').and.callThrough();
-    });
-
-    it('should compile', () => {
-        fixture.detectChanges();
-
-        expect(fixture).toBeDefined();
-    });
-});
diff --git a/ui/src/app/metadata-provider/container/new-provider.component.ts b/ui/src/app/metadata-provider/container/new-provider.component.ts
deleted file mode 100644
index 4dee1bf02..000000000
--- a/ui/src/app/metadata-provider/container/new-provider.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-
-@Component({
-    selector: 'new-provider-page',
-    templateUrl: './new-provider.component.html',
-    styleUrls: ['./new-provider.component.scss']
-})
-export class NewProviderComponent {
-    constructor() {}
-} /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/metadata-provider.module.ts b/ui/src/app/metadata-provider/metadata-provider.module.ts
deleted file mode 100644
index 7143a2712..000000000
--- a/ui/src/app/metadata-provider/metadata-provider.module.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { NgModule, ModuleWithProviders } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
-import { ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { StoreModule } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
-
-import { NewProviderComponent } from './container/new-provider.component';
-
-import { ProviderEditorFormModule } from './component';
-import { PrettyXml } from './pipe/pretty-xml.pipe';
-import { UploadProviderComponent } from './container/upload-provider.component';
-import { BlankProviderComponent } from './container/blank-provider.component';
-import { CopyProviderComponent } from './container/copy-provider.component';
-import { SharedModule } from '../shared/shared.module';
-import { SearchIdEffects } from './effect/search.effect';
-import * as fromProvider from './reducer';
-import { ConfirmCopyComponent } from './container/confirm-copy.component';
-import { CopyIsSetGuard } from './guard/copy-isset.guard';
-import { CopyProviderEffects } from './effect/copy.effect';
-import { DomainModule } from '../domain/domain.module';
-
-@NgModule({
-    declarations: [
-        NewProviderComponent,
-        UploadProviderComponent,
-        BlankProviderComponent,
-        CopyProviderComponent,
-        ConfirmCopyComponent,
-        PrettyXml
-    ],
-    entryComponents: [],
-    imports: [
-        DomainModule,
-        SharedModule,
-        HttpClientModule,
-        CommonModule,
-        RouterModule,
-        ReactiveFormsModule,
-        FormsModule,
-        ProviderEditorFormModule
-    ],
-    exports: [
-        ProviderEditorFormModule
-    ],
-    providers: []
-})
-export class MetadataProviderModule {
-    static forRoot(): ModuleWithProviders {
-        return {
-            ngModule: RootProviderModule,
-            providers: [
-                CopyIsSetGuard
-            ]
-        };
-    }
-}
-
-export const routes: Routes = [
-    {
-        path: 'new',
-        component: NewProviderComponent,
-        canActivate: [],
-        children: [
-            { path: '', redirectTo: 'blank', pathMatch: 'prefix' },
-            {
-                path: 'blank',
-                component: BlankProviderComponent,
-                canDeactivate: []
-            },
-            {
-                path: 'upload',
-                component: UploadProviderComponent,
-                canDeactivate: []
-            },
-            {
-                path: 'copy',
-                component: CopyProviderComponent,
-                canDeactivate: []
-            }
-        ]
-    },
-    {
-        path: 'new/copy/confirm',
-        component: ConfirmCopyComponent,
-        canActivate: [CopyIsSetGuard]
-    }
-];
-
-@NgModule({
-    imports: [
-        MetadataProviderModule,
-        RouterModule.forChild(routes),
-        StoreModule.forFeature('provider', fromProvider.reducers),
-        EffectsModule.forFeature([
-            SearchIdEffects,
-            CopyProviderEffects
-        ])
-    ],
-})
-export class RootProviderModule { }
diff --git a/ui/src/app/metadata-provider/reducer/index.ts b/ui/src/app/metadata-provider/reducer/index.ts
deleted file mode 100644
index d1981f19a..000000000
--- a/ui/src/app/metadata-provider/reducer/index.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { createSelector, createFeatureSelector } from '@ngrx/store';
-import * as fromRoot from '../../app.reducer';
-import * as fromSearch from './search.reducer';
-import * as fromCopy from './copy.reducer';
-
-export interface ProviderState {
-    copy: fromCopy.CopyState;
-    search: fromSearch.SearchState;
-}
-
-export const reducers = {
-    copy: fromCopy.reducer,
-    search: fromSearch.reducer
-};
-
-export interface State extends fromRoot.State {
-    'provider': ProviderState;
-}
-
-export const getProviderState = createFeatureSelector<ProviderState>('provider');
-
-export const getCopyFromStateFn = (state: ProviderState) => state.copy;
-export const getSearchFromStateFn = (state: ProviderState) => state.search;
-
-export const getCopyFromState = createSelector(getProviderState, getCopyFromStateFn);
-export const getCopy = createSelector(getCopyFromState, fromCopy.getCopy);
-export const getSaving = createSelector(getCopyFromState, fromCopy.getSaving);
-export const getAttributes = createSelector(getCopyFromState, fromCopy.getCopyAttributes);
-export const getSectionsToCopy = createSelector(getCopyFromState, fromCopy.getCopySections);
-
-export const getSearchFromState = createSelector(getProviderState, getSearchFromStateFn);
-export const getSearchResults = createSelector(getSearchFromState, fromSearch.getMatches);
-export const getSearchQuery = createSelector(getSearchFromState, fromSearch.getQuery);
-export const getSearchLoading = createSelector(getSearchFromState, fromSearch.getSearching);
diff --git a/ui/src/app/domain/action/entity.action.ts b/ui/src/app/metadata/domain/action/entity.action.ts
similarity index 82%
rename from ui/src/app/domain/action/entity.action.ts
rename to ui/src/app/metadata/domain/action/entity.action.ts
index 61f3ad3e5..4bfe1380c 100644
--- a/ui/src/app/domain/action/entity.action.ts
+++ b/ui/src/app/metadata/domain/action/entity.action.ts
@@ -1,5 +1,5 @@
 import { Action } from '@ngrx/store';
-import { MetadataEntity } from '../../domain/domain.type';
+import { MetadataEntity } from '../../domain/model';
 
 export const PREVIEW_ENTITY = '[Domain] Preview Entity';
 
diff --git a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.html b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/advanced-info-form.component.html
rename to ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html
diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts
new file mode 100644
index 000000000..6049e344b
--- /dev/null
+++ b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts
@@ -0,0 +1,102 @@
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ViewChild, Component } from '@angular/core';
+import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
+import { Observable, of } from 'rxjs';
+import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
+import { AdvancedInfoFormComponent } from './advanced-info-form.component';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+
+@Component({
+    template: `<adv-info-form [resolver]="resolver" [ids]="ids$"></adv-info-form>`
+})
+class TestHostComponent {
+
+    ids$: Observable<string[]> = of(['foo']);
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
+        serviceProviderSsoDescriptor: {
+            protocolSupportEnum: 'foo',
+            nameIdFormats: []
+        }
+    });
+
+    @ViewChild(AdvancedInfoFormComponent)
+    public formUnderTest: AdvancedInfoFormComponent;
+
+    changeProvider(opts: any): void {
+        this.resolver = Object.assign({}, this.resolver, opts);
+    }
+
+    addFormat(value: string): void {
+        this.resolver.serviceProviderSsoDescriptor.nameIdFormats.push(value);
+    }
+}
+
+
+describe('Advanced Info Form Component', () => {
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [
+                ProviderValueEmitter,
+                ProviderStatusEmitter,
+                NgbPopoverConfig
+            ],
+            imports: [
+                NoopAnimationsModule,
+                ReactiveFormsModule,
+                NgbPopoverModule
+            ],
+            declarations: [
+                AdvancedInfoFormComponent,
+                TestHostComponent
+            ],
+        });
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should compile', () => {
+        expect(fixture).toBeDefined();
+    });
+
+    describe('ngOnChanges method', () => {
+        it('should set properties on the resolver', () => {
+            instance.changeProvider(stubs.resolver);
+            fixture.detectChanges();
+            expect(instance.formUnderTest.resolver.organization).toEqual({});
+            expect(instance.formUnderTest.resolver.contacts).toEqual([]);
+        });
+    });
+
+    describe('removeContact method', () => {
+        it('should remove the contact at the given index', () => {
+            instance.changeProvider({
+                ...stubs.resolver,
+                contacts: [stubs.contact]
+            });
+            fixture.detectChanges();
+            instance.formUnderTest.removeContact(0);
+            expect(instance.formUnderTest.contacts.length).toBe(0);
+        });
+    });
+
+    describe('addContact method', () => {
+        it('should remove the contact at the given index', () => {
+            instance.changeProvider({
+                ...stubs.resolver,
+                contacts: [stubs.contact]
+            });
+            fixture.detectChanges();
+            instance.formUnderTest.addContact();
+            expect(instance.formUnderTest.contacts.length).toBe(2);
+        });
+    });
+});
diff --git a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts
similarity index 69%
rename from ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts
index cf6173cf9..d0ce28c2c 100644
--- a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts
@@ -1,16 +1,12 @@
 import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy, EventEmitter } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 import { Observable, Subscription, of } from 'rxjs';
-import { takeUntil, combineLatest, switchMap, map, startWith } from 'rxjs/operators';
+import { takeUntil, switchMap, map, startWith } from 'rxjs/operators';
 
-import { Store } from '@ngrx/store';
-
-import * as fromCollection from '../../../domain/reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver, Contact } from '../../../domain/model';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { EntityValidators } from '../../../domain/service/entity-validators.service';
-import * as patterns from '../../../shared/regex';
 
 @Component({
     selector: 'adv-info-form',
@@ -18,7 +14,8 @@ import * as patterns from '../../../shared/regex';
     templateUrl: './advanced-info-form.component.html'
 })
 export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
+    @Input() ids: Observable<string[]>;
 
     contactTypes: string[] = [
         'support',
@@ -31,26 +28,15 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
 
     hasValue$: Observable<boolean>;
     totalValue$: Observable<string>;
-    ids$: Observable<string[]> = of([]);
 
     private validationSubscription: Subscription;
 
     constructor(
         protected fb: FormBuilder,
         protected statusEmitter: ProviderStatusEmitter,
-        protected valueEmitter: ProviderValueEmitter,
-        protected store: Store<fromCollection.CollectionState>
+        protected valueEmitter: ProviderValueEmitter
     ) {
         super(fb, statusEmitter, valueEmitter);
-
-        this.ids$ = this.store
-            .select(fromCollection.getAllEntityIds)
-            .pipe(
-                takeUntil(this.ngUnsubscribe),
-                combineLatest(this.store.select(fromCollection.getSelectedProvider), (ids: string[], provider: MetadataProvider) => {
-                    return ids.filter(id => provider.entityId !== id);
-                })
-            );
     }
 
     createForm(): void {
@@ -85,20 +71,20 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
         this.form
             .get('entityId')
             .setAsyncValidators(
-                EntityValidators.createUniqueIdValidator(this.ids$)
+                EntityValidators.createUniqueIdValidator(this.ids)
             );
     }
 
     ngOnChanges(): void {
-        this.provider.organization = this.provider.organization || {};
-        this.provider.contacts = this.provider.contacts || [];
+        this.resolver.organization = this.resolver.organization || {};
+        this.resolver.contacts = this.resolver.contacts || [];
         this.form.reset({
-            serviceProviderName: this.provider.serviceProviderName,
-            serviceEnabled: this.provider.serviceEnabled,
-            entityId: this.provider.entityId,
-            organization: this.provider.organization
+            serviceProviderName: this.resolver.serviceProviderName,
+            serviceEnabled: this.resolver.serviceEnabled,
+            entityId: this.resolver.entityId,
+            organization: this.resolver.organization
         });
-        this.setContacts(this.provider.contacts);
+        this.setContacts(this.resolver.contacts);
     }
 
     get contacts(): FormArray {
diff --git a/ui/src/app/metadata-provider/component/forms/assertion-form.component.html b/ui/src/app/metadata/domain/component/forms/assertion-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/assertion-form.component.html
rename to ui/src/app/metadata/domain/component/forms/assertion-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts
similarity index 78%
rename from ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts
index 5f6574a8c..6a3925d2f 100644
--- a/ui/src/app/metadata-provider/component/forms/assertion-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts
@@ -3,15 +3,13 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AssertionFormComponent } from './assertion-form.component';
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Assertion Form Component', () => {
     let fixture: ComponentFixture<AssertionFormComponent>;
     let instance: AssertionFormComponent;
-    let store: Store<fromCollections.CollectionState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -23,17 +21,12 @@ describe('Assertion Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 AssertionFormComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(AssertionFormComponent);
         instance = fixture.componentInstance;
@@ -46,17 +39,17 @@ describe('Assertion Form Component', () => {
 
     describe('ngOnChanges method', () => {
         it('should set properties on the provider', () => {
-            instance.provider = stubs.provider;
+            instance.resolver = stubs.resolver;
             fixture.detectChanges();
             instance.ngOnChanges();
-            expect(instance.provider.assertionConsumerServices).toEqual([]);
+            expect(instance.resolver.assertionConsumerServices).toEqual([]);
         });
     });
 
     describe('removeEndpoint method', () => {
         it('should remove the endpoint at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 assertionConsumerServices: [stubs.endpoint]
             };
             fixture.detectChanges();
@@ -68,8 +61,8 @@ describe('Assertion Form Component', () => {
 
     describe('addEndpoint method', () => {
         it('should remove the endpoint at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 assertionConsumerServices: [stubs.endpoint]
             };
             fixture.detectChanges();
diff --git a/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts b/ui/src/app/metadata/domain/component/forms/assertion-form.component.ts
similarity index 79%
rename from ui/src/app/metadata-provider/component/forms/assertion-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/assertion-form.component.ts
index 668784c78..a3ce408b8 100644
--- a/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/assertion-form.component.ts
@@ -1,11 +1,10 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, AbstractControl, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup, FormArray, AbstractControl } from '@angular/forms';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, SsoService } from '../../../domain/model/metadata-provider';
-import * as patterns from '../../../shared/regex';
+import { SsoService, MetadataResolver } from '../../../domain/model/';
 
 @Component({
     selector: 'assertion-form',
@@ -13,7 +12,7 @@ import * as patterns from '../../../shared/regex';
     templateUrl: './assertion-form.component.html'
 })
 export class AssertionFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
 
@@ -68,7 +67,7 @@ export class AssertionFormComponent extends ProviderFormFragmentComponent implem
     }
 
     ngOnChanges(): void {
-        this.provider.assertionConsumerServices = this.provider.assertionConsumerServices || [];
-        this.setEndpoints(this.provider.assertionConsumerServices);
+        this.resolver.assertionConsumerServices = this.resolver.assertionConsumerServices || [];
+        this.setEndpoints(this.resolver.assertionConsumerServices);
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.html b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/attribute-release-form.component.html
rename to ui/src/app/metadata/domain/component/forms/attribute-release-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts
similarity index 82%
rename from ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts
index 1345dda16..67882509e 100644
--- a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts
@@ -3,16 +3,14 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AttributeReleaseFormComponent } from './attribute-release-form.component';
 import { ListValuesService } from '../../../domain/service/list-values.service';
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Attribute Release Form Component', () => {
     let fixture: ComponentFixture<AttributeReleaseFormComponent>;
     let instance: AttributeReleaseFormComponent;
-    let store: Store<fromCollections.CollectionState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -25,22 +23,17 @@ describe('Attribute Release Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 AttributeReleaseFormComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(AttributeReleaseFormComponent);
         instance = fixture.componentInstance;
-        instance.provider = {
-            ...stubs.provider,
+        instance.resolver = {
+            ...stubs.resolver,
             attributeRelease: []
         };
         fixture.detectChanges();
@@ -54,7 +47,7 @@ describe('Attribute Release Form Component', () => {
         it('should set properties on the provider', () => {
             spyOn(instance, 'setAttributes');
             instance.ngOnChanges();
-            expect(instance.provider.attributeRelease).toEqual([]);
+            expect(instance.resolver.attributeRelease).toEqual([]);
             expect(instance.setAttributes).toHaveBeenCalled();
         });
     });
diff --git a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts
similarity index 89%
rename from ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts
index d4a4d8b39..8a7d3a258 100644
--- a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts
@@ -1,11 +1,11 @@
 import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { last } from 'rxjs/operators';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FormArray } from '@angular/forms/src/model';
 
@@ -16,7 +16,7 @@ import { FormArray } from '@angular/forms/src/model';
     templateUrl: './attribute-release-form.component.html'
 })
 export class AttributeReleaseFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
     attributesToRelease: any[];
@@ -43,8 +43,8 @@ export class AttributeReleaseFormComponent extends ProviderFormFragmentComponent
     }
 
     ngOnChanges(): void {
-        this.provider.attributeRelease = this.provider.attributeRelease || [];
-        this.setAttributes(this.provider.attributeRelease);
+        this.resolver.attributeRelease = this.resolver.attributeRelease || [];
+        this.setAttributes(this.resolver.attributeRelease);
     }
 
     get attributeRelease(): FormArray {
diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.html b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.html
rename to ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts
similarity index 80%
rename from ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts
index 5f814a6a2..3885aebef 100644
--- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts
@@ -4,21 +4,20 @@ 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
-import { Provider } from '../../../domain/entity/provider';
+import { FileBackedHttpMetadataResolver } from '../../../domain/entity';
 import { DescriptorInfoFormComponent } from './descriptor-info-form.component';
 
-import * as stubs from '../../../../testing/provider.stub';
-import { SharedModule } from '../../../shared/shared.module';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { SharedModule } from '../../../../shared/shared.module';
 
 @Component({
-    template: `<descriptor-info-form [provider]="provider"></descriptor-info-form>`
+    template: `<descriptor-info-form [resolver]="resolver"></descriptor-info-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
-        ...stubs.provider,
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
         serviceProviderSsoDescriptor: {
             protocolSupportEnum: 'foo',
             nameIdFormats: []
@@ -29,18 +28,17 @@ class TestHostComponent {
     public formUnderTest: DescriptorInfoFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 
     addFormat(value: string): void {
-        this.provider.serviceProviderSsoDescriptor.nameIdFormats.push(value);
+        this.resolver.serviceProviderSsoDescriptor.nameIdFormats.push(value);
     }
 }
 
 describe('Descriptor Info Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
     let form: DescriptorInfoFormComponent;
     let fb: FormBuilder;
 
@@ -55,9 +53,6 @@ describe('Descriptor Info Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule,
                 SharedModule
             ],
@@ -66,8 +61,6 @@ describe('Descriptor Info Form Component', () => {
                 TestHostComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;
diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts
similarity index 88%
rename from ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts
index dea3f26a2..89a824bc5 100644
--- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts
@@ -1,11 +1,11 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
 import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
@@ -14,7 +14,7 @@ import { ListValuesService } from '../../../domain/service/list-values.service';
     templateUrl: './descriptor-info-form.component.html'
 })
 export class DescriptorInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
 
@@ -46,7 +46,7 @@ export class DescriptorInfoFormComponent extends ProviderFormFragmentComponent i
     }
 
     ngOnChanges(): void {
-        let descriptor = this.provider.serviceProviderSsoDescriptor;
+        let descriptor = this.resolver.serviceProviderSsoDescriptor;
         this.form.reset({
             serviceProviderSsoDescriptor: descriptor || {}
         });
diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.html b/ui/src/app/metadata/domain/component/forms/finish-form.component.html
similarity index 82%
rename from ui/src/app/metadata-provider/component/forms/finish-form.component.html
rename to ui/src/app/metadata/domain/component/forms/finish-form.component.html
index 6a6725ade..3a2cb51a7 100644
--- a/ui/src/app/metadata-provider/component/forms/finish-form.component.html
+++ b/ui/src/app/metadata/domain/component/forms/finish-form.component.html
@@ -23,11 +23,11 @@ <h3 class="tag tag-success tag-sm my-4">
                 </h3>
                 <dl>
                     <dt class="text-primary" i18n="@@label--service-provider-name-dashboard-display-only">Service Provider Name (Dashboard Display Only)</dt>
-                    <dd class="value">{{ provider.serviceProviderName }}</dd>
+                    <dd class="value">{{ resolver.serviceProviderName }}</dd>
                     <dt class="text-primary" i18n="@@label--service-provider-entity-id">Service Provider Entity ID</dt>
-                    <dd class="value">{{ provider.entityId }}</dd>
+                    <dd class="value">{{ resolver.entityId }}</dd>
                     <dt class="text-primary" i18n="@@label--enable-this-service">Enable this service?</dt>
-                    <dd class="value">{{ provider.serviceEnabled ? 'Yes' : 'No' }}</dd>
+                    <dd class="value">{{ resolver.serviceEnabled ? 'Yes' : 'No' }}</dd>
                 </dl>
             </section>
             <section class="entity-section">
@@ -35,17 +35,17 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">2</span>
                     <ng-container i18n="@@label--organization-information">Organization Information</ng-container>
                 </a>
-                <dl *ngIf="provider.organization">
+                <dl *ngIf="resolver.organization">
                     <dt class="text-primary" i18n="@@label--organization-name">Organization Name</dt>
-                    <dd class="value">{{ provider.organization.name }}</dd>
+                    <dd class="value">{{ resolver.organization.name }}</dd>
                     <dt class="text-primary" i18n="@@label--organization-display-name">Organization Display Name</dt>
-                    <dd class="value">{{ provider.organization.displayName }}</dd>
+                    <dd class="value">{{ resolver.organization.displayName }}</dd>
                     <dt class="text-primary" i18n="@@label--organization-url">Organization URL</dt>
-                    <dd class="value">{{ provider.organization.url }}</dd>
+                    <dd class="value">{{ resolver.organization.url }}</dd>
                     <dt class="text-primary" i18n="@@label--contact-information">Contact Information</dt>
                     <dd class="value">
-                        <p class="text-secondary" *ngIf="!provider.contacts.length">&mdash;</p>
-                        <table class="table table-sm table-bordered table-striped" *ngIf="provider.contacts.length">
+                        <p class="text-secondary" *ngIf="!resolver.contacts.length">&mdash;</p>
+                        <table class="table table-sm table-bordered table-striped" *ngIf="resolver.contacts.length">
                             <thead>
                             <tr class="table-secondary">
                                 <th scope="col" i18n="@@label--given-name">Given Name</th>
@@ -54,7 +54,7 @@ <h3 class="tag tag-success tag-sm my-4">
                             </tr>
                             </thead>
                             <tbody>
-                            <tr *ngFor="let contact of provider.contacts">
+                            <tr *ngFor="let contact of resolver.contacts">
                                 <td>{{ contact.name }}</td>
                                 <td>{{ contact.emailAddress }}</td>
                                 <td>{{ contact.type }}</td>
@@ -69,21 +69,21 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">3</span>
                     <ng-container i18n="@@label--user-interface-mdui-infromation">User Interface / MDUI Information</ng-container>
                 </a>
-                <dl *ngIf="provider.mdui">
+                <dl *ngIf="resolver.mdui">
                     <dt class="text-primary" i18n="@@label--display-name">Display Name</dt>
-                    <dd class="value">{{ provider.mdui.displayName }}</dd>
+                    <dd class="value">{{ resolver.mdui.displayName }}</dd>
                     <dt class="text-primary" i18n="@@label--information-url">Information URL</dt>
-                    <dd class="value">{{ provider.mdui.informationUrl }}</dd>
+                    <dd class="value">{{ resolver.mdui.informationUrl }}</dd>
                     <dt class="text-primary" i18n="@@label--description">Description</dt>
-                    <dd class="value">{{ provider.mdui.description }}</dd>
+                    <dd class="value">{{ resolver.mdui.description }}</dd>
                     <dt class="text-primary" i18n="@@label--privacy-statement">Privacy Statement URL</dt>
-                    <dd class="value">{{ provider.mdui.privacyStatementUrl }}</dd>
+                    <dd class="value">{{ resolver.mdui.privacyStatementUrl }}</dd>
                     <dt class="text-primary" i18n="@@label--logo-url">Logo URL</dt>
-                    <dd class="value">{{ provider.mdui.logoUrl }}</dd>
+                    <dd class="value">{{ resolver.mdui.logoUrl }}</dd>
                     <dt class="text-primary" i18n="@@label--logo-width">Logo Width</dt>
-                    <dd class="value">{{ provider.mdui.logoWidth }}</dd>
+                    <dd class="value">{{ resolver.mdui.logoWidth }}</dd>
                     <dt class="text-primary" i18n="@@label--logo-height">Logo Height</dt>
-                    <dd class="value">{{ provider.mdui.logoHeight }}</dd>
+                    <dd class="value">{{ resolver.mdui.logoHeight }}</dd>
                 </dl>
             </section>
             <section class="entity-section">
@@ -91,14 +91,14 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">4</span>
                     <ng-container i18n="@@label--sp-sso-descriptor-information">SP SSO Descriptor Information</ng-container>
                 </a>
-                <dl *ngIf="provider.serviceProviderSsoDescriptor">
+                <dl *ngIf="resolver.serviceProviderSsoDescriptor">
                     <dt class="text-primary" i18n="@@label--protocol-support-enumeration">Protocol Support Enumeration</dt>
-                    <dd class="value">{{ provider.serviceProviderSsoDescriptor.protocolSupportEnum }}</dd>
+                    <dd class="value">{{ resolver.serviceProviderSsoDescriptor.protocolSupportEnum }}</dd>
                     <dt class="text-primary" i18n="@@label--nameid-format">NameID Format</dt>
                     <dd class="value">
-                        <p class="text-secondary" *ngIf="!provider.serviceProviderSsoDescriptor.nameIdFormats.length">&mdash;</p>
-                        <ul class="list-unstyled" *ngIf="provider.serviceProviderSsoDescriptor.nameIdFormats.length">
-                            <li *ngFor="let format of provider.serviceProviderSsoDescriptor.nameIdFormats">
+                        <p class="text-secondary" *ngIf="!resolver.serviceProviderSsoDescriptor.nameIdFormats.length">&mdash;</p>
+                        <ul class="list-unstyled" *ngIf="resolver.serviceProviderSsoDescriptor.nameIdFormats.length">
+                            <li *ngFor="let format of resolver.serviceProviderSsoDescriptor.nameIdFormats">
                                 {{ format }}
                             </li>
                         </ul>
@@ -110,8 +110,8 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">5</span>
                     <ng-container i18n="@@label--logout-endpoints">Logout Endpoints</ng-container>
                 </a>
-                <p class="text-secondary" *ngIf="!provider.logoutEndpoints.length">&mdash;</p>
-                <table class="table table-sm table-bordered table-striped"  *ngIf="provider.logoutEndpoints.length">
+                <p class="text-secondary" *ngIf="!resolver.logoutEndpoints.length">&mdash;</p>
+                <table class="table table-sm table-bordered table-striped"  *ngIf="resolver.logoutEndpoints.length">
                     <thead>
                     <tr class="table-secondary">
                         <th scope="col" i18n="@@label--logout-endpoints">Logout Endpoint</th>
@@ -119,7 +119,7 @@ <h3 class="tag tag-success tag-sm my-4">
                     </tr>
                     </thead>
                     <tbody>
-                    <tr *ngFor="let endpoint of provider.logoutEndpoints">
+                    <tr *ngFor="let endpoint of resolver.logoutEndpoints">
                         <td>{{ endpoint.url }}</td>
                         <td>{{ endpoint.bindingType }}</td>
                     </tr>
@@ -133,17 +133,17 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">6</span>
                     <ng-container i18n="@@label--security-information">Security Information</ng-container>
                 </a>
-                <dl *ngIf="provider.securityInfo">
+                <dl *ngIf="resolver.securityInfo">
                     <dt class="text-primary" i18n="@@label--is-there-a-x509-certificate">Is there a X509 Certificate?</dt>
-                    <dd class="value">{{ provider.securityInfo.x509CertificateAvailable ? 'Yes' : 'No' }}</dd>
+                    <dd class="value">{{ resolver.securityInfo.x509CertificateAvailable ? 'Yes' : 'No' }}</dd>
                     <dt class="text-primary" i18n="@@label--authentication-requests-signed">Authentication Requests Signed?</dt>
-                    <dd class="value">{{ provider.securityInfo.authenticationRequestsSigned ? 'Yes' : 'No' }}</dd>
+                    <dd class="value">{{ resolver.securityInfo.authenticationRequestsSigned ? 'Yes' : 'No' }}</dd>
                     <dt class="text-primary" i18n="@@label--want-assertions-signed">Want Assertions Signed?</dt>
-                    <dd class="value">{{ provider.securityInfo.wantAssertionsSigned ? 'Yes' : 'No' }}</dd>
+                    <dd class="value">{{ resolver.securityInfo.wantAssertionsSigned ? 'Yes' : 'No' }}</dd>
                     <dt class="text-primary" i18n="@@label--x509-certificates">X509 Certificates</dt>
                     <dd class="value">
-                        <p class="text-secondary" *ngIf="!provider.securityInfo.x509Certificates.length">&mdash;</p>
-                        <table class="table table-sm table-bordered table-striped" *ngIf="provider.securityInfo.x509Certificates.length">
+                        <p class="text-secondary" *ngIf="!resolver.securityInfo.x509Certificates.length">&mdash;</p>
+                        <table class="table table-sm table-bordered table-striped" *ngIf="resolver.securityInfo.x509Certificates.length">
                             <caption class="sr-only" i18n="@@label--x509-certificates">X509 Certificates</caption>
                             <thead>
                             <tr class="table-secondary">
@@ -153,7 +153,7 @@ <h3 class="tag tag-success tag-sm my-4">
                             </tr>
                             </thead>
                             <tbody>
-                            <tr *ngFor="let cert of provider.securityInfo.x509Certificates; let i = index;">
+                            <tr *ngFor="let cert of resolver.securityInfo.x509Certificates; let i = index;">
                                 <td>{{ cert.name }}</td>
                                 <td>{{ cert.type }}</td>
                                 <td [ngbPopover]="cert.value"
@@ -174,8 +174,8 @@ <h3 class="tag tag-success tag-sm my-4">
                 <dl>
                     <dt class="text-primary" i18n="@@label--assertion-consumer-service-endpoints">Assertion Consumer Service Endpoints</dt>
                     <dd class="value">
-                        <p class="text-secondary" *ngIf="!provider.assertionConsumerServices.length">&mdash;</p>
-                        <table class="table table-sm table-bordered table-striped" *ngIf="provider.assertionConsumerServices.length">
+                        <p class="text-secondary" *ngIf="!resolver.assertionConsumerServices.length">&mdash;</p>
+                        <table class="table table-sm table-bordered table-striped" *ngIf="resolver.assertionConsumerServices.length">
                             <thead>
                             <tr class="table-secondary">
                                 <th scope="col">#</th>
@@ -184,7 +184,7 @@ <h3 class="tag tag-success tag-sm my-4">
                             </tr>
                             </thead>
                             <tbody>
-                            <tr *ngFor="let service of provider.assertionConsumerServices; let i=index;">
+                            <tr *ngFor="let service of resolver.assertionConsumerServices; let i=index;">
                                 <th scope="row">{{ i + 1 }}</th>
                                 <td>{{ service.locationUrl }}</td>
                                 <td>{{ service.binding }}</td>
@@ -199,39 +199,39 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">8</span>
                     <ng-container i18n="@@label--relying-party-overrides">Relying Party Overrides</ng-container>
                 </a>
-                <dl *ngIf="provider.relyingPartyOverrides">
+                <dl *ngIf="resolver.relyingPartyOverrides">
                     <dt class="text-primary" i18n="@@label--sign-the-assertion">Sign the Assertion?</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.signAssertion ? 'True' : 'False' }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.signAssertion ? 'True' : 'False' }}</dd>
                     <dt class="text-primary" i18n="@@label--dont-sign-the-response">Don't Sign the Response?</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.dontSignResponse ? 'True' : 'False' }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.dontSignResponse ? 'True' : 'False' }}</dd>
                     <dt class="text-primary" i18n="@@label--turn-off-encryption-of-response">Turn off Encryption of Response?</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.turnOffEncryption ? 'True' : 'False' }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.turnOffEncryption ? 'True' : 'False' }}</dd>
                     <dt class="text-primary" i18n="@@label--use-sha1-signing-algorithm">Use SHA1 Signing Algorithm?</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.useSha ? 'True' : 'False' }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.useSha ? 'True' : 'False' }}</dd>
                     <dt class="text-primary" i18n="@@label--nameid-format-to-send">NameID Format to Send</dt>
                     <dd class="value">
-                        <p class="text-secondary" *ngIf="!provider.relyingPartyOverrides.nameIdFormats.length">&mdash;</p>
-                        <ul class="list-unstyled" *ngIf="provider.relyingPartyOverrides.nameIdFormats.length">
-                            <li *ngFor="let format of provider.relyingPartyOverrides.nameIdFormats">
+                        <p class="text-secondary" *ngIf="!resolver.relyingPartyOverrides.nameIdFormats.length">&mdash;</p>
+                        <ul class="list-unstyled" *ngIf="resolver.relyingPartyOverrides.nameIdFormats.length">
+                            <li *ngFor="let format of resolver.relyingPartyOverrides.nameIdFormats">
                                 {{ format }}
                             </li>
                         </ul>
                     </dd>
                     <dt class="text-primary" i18n="@@label--default-authentication-methods">Default Authentication Method(s)</dt>
                     <dd class="value">
-                        <p class="text-secondary" *ngIf="!provider.relyingPartyOverrides.authenticationMethods.length">&mdash;</p>
-                        <ol class="list-unstyled" *ngIf="provider.relyingPartyOverrides.authenticationMethods.length">
-                            <li *ngFor="let method of provider.relyingPartyOverrides.authenticationMethods">
+                        <p class="text-secondary" *ngIf="!resolver.relyingPartyOverrides.authenticationMethods.length">&mdash;</p>
+                        <ol class="list-unstyled" *ngIf="resolver.relyingPartyOverrides.authenticationMethods.length">
+                            <li *ngFor="let method of resolver.relyingPartyOverrides.authenticationMethods">
                                 {{ method }}
                             </li>
                         </ol>
                     </dd>
                     <dt class="text-primary" i18n="@@label--ignore-any-sp-requested-authentication-method">Ignore any SP-Requested Authentication Method?</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.ignoreAuthenticationMethod ? 'True' : 'False' }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.ignoreAuthenticationMethod ? 'True' : 'False' }}</dd>
                     <dt class="text-primary" i18n="@@label--omit-not-before-condition">Omit Not Before Condition?</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.omitNotBefore ? 'True' : 'False' }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.omitNotBefore ? 'True' : 'False' }}</dd>
                     <dt class="text-primary" i18n="@@label--responderid">ResponderID</dt>
-                    <dd class="value">{{ provider.relyingPartyOverrides.responderId }}</dd>
+                    <dd class="value">{{ resolver.relyingPartyOverrides.responderId }}</dd>
                 </dl>
             </section>
             <section class="entity-section">
@@ -239,7 +239,7 @@ <h3 class="tag tag-success tag-sm my-4">
                     <span class="index">9</span>
                     <ng-container i18n="@@label--attribute-release">Attribute Release</ng-container>
                 </a>
-                <table class="table table-sm table-bordered table-striped" *ngIf="provider.attributeRelease">
+                <table class="table table-sm table-bordered table-striped" *ngIf="resolver.attributeRelease">
                     <thead>
                     <tr class="table-secondary">
                         <th scope="col" i18n="@@label--attribute-name">Attribute Name</th>
@@ -251,10 +251,10 @@ <h3 class="tag tag-success tag-sm my-4">
                     <tr *ngFor="let attr of attributesToRelease$ | async">
                         <td>{{ attr.label }}</td>
                         <td>
-                            <i class="fa fa-fw fa-check" *ngIf="provider.attributeRelease.indexOf(attr.key) > -1"></i>
+                            <i class="fa fa-fw fa-check" *ngIf="resolver.attributeRelease.indexOf(attr.key) > -1"></i>
                         </td>
                         <td>
-                            <i class="fa fa-fw fa-check" *ngIf="!(provider.attributeRelease.indexOf(attr.key) > -1)"></i>
+                            <i class="fa fa-fw fa-check" *ngIf="!(resolver.attributeRelease.indexOf(attr.key) > -1)"></i>
                         </td>
                     </tr>
                     </tbody>
diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.scss b/ui/src/app/metadata/domain/component/forms/finish-form.component.scss
similarity index 73%
rename from ui/src/app/metadata-provider/component/forms/finish-form.component.scss
rename to ui/src/app/metadata/domain/component/forms/finish-form.component.scss
index 0f9488141..71ade4d37 100644
--- a/ui/src/app/metadata-provider/component/forms/finish-form.component.scss
+++ b/ui/src/app/metadata/domain/component/forms/finish-form.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../theme/_palette';
+@import '../../../../../theme/_palette';
 
 .value:empty {
     &::after {
diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts
similarity index 72%
rename from ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts
index 2936c0832..6487bcfa8 100644
--- a/ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts
@@ -3,40 +3,37 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 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';
+import { RouterStub, RouterLinkStubDirective } from '../../../../../testing/router.stub';
+import { ActivatedRouteStub } from '../../../../../testing/activated-route.stub';
 
-import * as stubs from '../../../../testing/provider.stub';
-import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
-import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
-import { Provider } from '../../../domain/entity/provider';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
-    template: `<finish-form [provider]="provider"></finish-form>`
+    template: `<finish-form [resolver]="resolver"></finish-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
-        ...stubs.provider
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver
     });
 
     @ViewChild(FinishFormComponent)
     public formUnderTest: FinishFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 }
 
 describe('Finished Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
     let form: FinishFormComponent;
 
     beforeEach(() => {
@@ -52,9 +49,6 @@ describe('Finished Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
@@ -65,8 +59,6 @@ describe('Finished Form Component', () => {
                 TestHostComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;
@@ -88,9 +80,9 @@ describe('Finished Form Component', () => {
             expect(form.form.reset).toHaveBeenCalled();
         });
 
-        xit('should reset the form with serviceEnabled = false if no provider', () => {
+        xit('should reset the form with serviceEnabled = false if no resolver', () => {
             spyOn(form.form, 'reset').and.callThrough();
-            delete instance.provider;
+            delete instance.resolver;
             fixture.detectChanges();
             expect(form.form.reset).toHaveBeenCalled();
         });
diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.ts b/ui/src/app/metadata/domain/component/forms/finish-form.component.ts
similarity index 70%
rename from ui/src/app/metadata-provider/component/forms/finish-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/finish-form.component.ts
index c645db916..f7a3a80df 100644
--- a/ui/src/app/metadata-provider/component/forms/finish-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/finish-form.component.ts
@@ -1,9 +1,9 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
@@ -13,7 +13,7 @@ import { ListValuesService } from '../../../domain/service/list-values.service';
     styleUrls: ['./finish-form.component.scss']
 })
 export class FinishFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
     attributesToRelease$: Observable<any[]>;
@@ -25,7 +25,7 @@ export class FinishFormComponent extends ProviderFormFragmentComponent implement
         private listValues: ListValuesService
     ) {
         super(fb, statusEmitter, valueEmitter);
-        this.attributesToRelease$ = listValues.attributesToRelease;
+        this.attributesToRelease$ = this.listValues.attributesToRelease;
     }
 
     createForm(): void {
@@ -36,7 +36,7 @@ export class FinishFormComponent extends ProviderFormFragmentComponent implement
 
     ngOnChanges(): void {
         this.form.reset({
-            serviceEnabled: !this.provider ? false : this.provider.serviceEnabled !== false ? true : false
+            serviceEnabled: !this.resolver ? false : this.resolver.serviceEnabled !== false ? true : false
         });
     }
-} /* istanbul ignore next */
+}
diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.html b/ui/src/app/metadata/domain/component/forms/key-info-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/key-info-form.component.html
rename to ui/src/app/metadata/domain/component/forms/key-info-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts
similarity index 82%
rename from ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts
index 3be72cbdd..a271be071 100644
--- a/ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts
@@ -2,24 +2,22 @@ import { Component, ViewChild } from '@angular/core';
 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 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 '../../../domain/component/i18n-text.component';
-import { Provider } from '../../../domain/entity/provider';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
-    template: `<key-info-form [provider]="provider"></key-info-form>`
+    template: `<key-info-form [resolver]="resolver"></key-info-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
-        ...stubs.provider,
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
         securityInfo: {
             ...stubs.secInfo,
             x509Certificates: []
@@ -30,14 +28,13 @@ class TestHostComponent {
     public formUnderTest: KeyInfoFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 }
 
 describe('Security (Key) Info Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
     let form: KeyInfoFormComponent;
 
     beforeEach(() => {
@@ -51,9 +48,6 @@ describe('Security (Key) Info Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
@@ -63,8 +57,6 @@ describe('Security (Key) Info Form Component', () => {
                 I18nTextComponent
             ],
         }).compileComponents();
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;
diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/key-info-form.component.ts
similarity index 86%
rename from ui/src/app/metadata-provider/component/forms/key-info-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/key-info-form.component.ts
index 0e8fe19e0..882b7c330 100644
--- a/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/key-info-form.component.ts
@@ -1,11 +1,11 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Certificate } from '../../../domain/model/metadata-provider';
+import { MetadataResolver, Certificate } from '../../../domain/model';
 
 @Component({
     selector: 'key-info-form',
@@ -13,7 +13,7 @@ import { MetadataProvider, Certificate } from '../../../domain/model/metadata-pr
     templateUrl: './key-info-form.component.html'
 })
 export class KeyInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     hasCert$: Observable<boolean>;
 
@@ -97,14 +97,14 @@ export class KeyInfoFormComponent extends ProviderFormFragmentComponent implemen
 
     ngOnChanges(): void {
         this.form.reset({
-            securityInfo: this.provider.securityInfo || {
+            securityInfo: this.resolver.securityInfo || {
                 x509CertificateAvailable: false,
                 authenticationRequestsSigned: false,
                 wantAssertionsSigned: false
             }
         });
-        if (this.provider.securityInfo && this.provider.securityInfo.x509CertificateAvailable) {
-            this.setCertificates(this.provider.securityInfo.x509Certificates);
+        if (this.resolver.securityInfo && this.resolver.securityInfo.x509CertificateAvailable) {
+            this.setCertificates(this.resolver.securityInfo.x509Certificates);
         }
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.html b/ui/src/app/metadata/domain/component/forms/logout-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/logout-form.component.html
rename to ui/src/app/metadata/domain/component/forms/logout-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts
similarity index 82%
rename from ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts
index c841cd668..33f32fd51 100644
--- a/ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts
@@ -4,22 +4,21 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 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 '../../../domain/component/i18n-text.component';
-import { Provider } from '../../../domain/entity/provider';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
-    template: `<logout-form [provider]="provider"></logout-form>`
+    template: `<logout-form [resolver]="resolver"></logout-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
-        ...stubs.provider,
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
         logoutEndpoints: [stubs.logoutEndpoint]
     });
 
@@ -27,14 +26,13 @@ class TestHostComponent {
     public formUnderTest: LogoutFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 }
 
 describe('Logout Endpoints Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
     let form: LogoutFormComponent;
 
     beforeEach(() => {
@@ -48,9 +46,6 @@ describe('Logout Endpoints Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
@@ -60,8 +55,6 @@ describe('Logout Endpoints Form Component', () => {
                 I18nTextComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;
@@ -85,8 +78,8 @@ describe('Logout Endpoints Form Component', () => {
 
     describe('ngOnChanges method', () => {
         it('should add endpoints if provided', () => {
-            instance.provider = new Provider({
-                ...stubs.provider
+            instance.resolver = new FileBackedHttpMetadataResolver({
+                ...stubs.resolver
             });
             fixture.detectChanges();
             expect(form.logoutEndpoints.length).toBe(0);
diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.ts b/ui/src/app/metadata/domain/component/forms/logout-form.component.ts
similarity index 76%
rename from ui/src/app/metadata-provider/component/forms/logout-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/logout-form.component.ts
index 981c336db..60b3b5f80 100644
--- a/ui/src/app/metadata-provider/component/forms/logout-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/logout-form.component.ts
@@ -1,11 +1,9 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
-import { Observable } from 'rxjs';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, LogoutEndpoint } from '../../../domain/model/metadata-provider';
-import * as patterns from '../../../shared/regex';
+import { MetadataResolver, LogoutEndpoint } from '../../../domain/model';
 
 @Component({
     selector: 'logout-form',
@@ -13,7 +11,7 @@ import * as patterns from '../../../shared/regex';
     templateUrl: './logout-form.component.html'
 })
 export class LogoutFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
 
@@ -62,7 +60,7 @@ export class LogoutFormComponent extends ProviderFormFragmentComponent implement
     }
 
     ngOnChanges(): void {
-        this.provider.logoutEndpoints = this.provider.logoutEndpoints || [];
-        this.setEndpoints(this.provider.logoutEndpoints);
+        this.resolver.logoutEndpoints = this.resolver.logoutEndpoints || [];
+        this.setEndpoints(this.resolver.logoutEndpoints);
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.html b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.html
rename to ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts
similarity index 69%
rename from ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts
index 961311ac4..6c85a9a09 100644
--- a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts
@@ -2,38 +2,35 @@ import { ViewChild, Component, Input } from '@angular/core';
 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 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';
-import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
-import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
+import { I18nTextComponent } from '../../../../shared/component/i18n-text.component';
 
 @Component({
-    template: `<metadata-ui-form [provider]="provider"></metadata-ui-form>`
+    template: `<metadata-ui-form [resolver]="resolver"></metadata-ui-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
-        ...stubs.provider
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver
     });
 
     @ViewChild(MetadataUiFormComponent)
     public formUnderTest: MetadataUiFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 }
 
 describe('Metadata UI Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
     let form: MetadataUiFormComponent;
 
     beforeEach(() => {
@@ -47,20 +44,15 @@ describe('Metadata UI Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 MetadataUiFormComponent,
                 TestHostComponent,
-                I18nTextComponent,
-                InputDefaultsDirective
+                InputDefaultsDirective,
+                I18nTextComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;
diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.ts
similarity index 73%
rename from ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.ts
index 5bd8b0d6b..bde640cfc 100644
--- a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.ts
@@ -1,10 +1,9 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
-import { Observable } from 'rxjs';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, Validators } from '@angular/forms';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 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';
+import { MetadataResolver } from '../../../domain/model';
+import * as patterns from '../../../../shared/regex';
 
 @Component({
     selector: 'metadata-ui-form',
@@ -12,7 +11,7 @@ import * as patterns from '../../../shared/regex';
     templateUrl: './metadata-ui-form.component.html'
 })
 export class MetadataUiFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     descriptionMaxLength = this.defaultMaxLength;
 
@@ -40,7 +39,7 @@ export class MetadataUiFormComponent extends ProviderFormFragmentComponent imple
 
     ngOnChanges(): void {
         this.form.reset({
-            mdui: this.provider.mdui || {}
+            mdui: this.resolver.mdui || {}
         });
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.html b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/organization-info-form.component.html
rename to ui/src/app/metadata/domain/component/forms/organization-info-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts
similarity index 77%
rename from ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts
index 93ca34dd9..98ce05361 100644
--- a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts
@@ -3,16 +3,14 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { OrganizationInfoFormComponent } from './organization-info-form.component';
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Organization Info Form Component', () => {
     let fixture: ComponentFixture<OrganizationInfoFormComponent>;
     let instance: OrganizationInfoFormComponent;
-    let store: Store<fromCollections.CollectionState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -25,17 +23,12 @@ describe('Organization Info Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule
             ],
             declarations: [
                 OrganizationInfoFormComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(OrganizationInfoFormComponent);
         instance = fixture.componentInstance;
@@ -48,18 +41,18 @@ describe('Organization Info Form Component', () => {
 
     describe('ngOnChanges method', () => {
         it('should set properties on the provider', () => {
-            instance.provider = stubs.provider;
+            instance.resolver = stubs.resolver;
             fixture.detectChanges();
             instance.ngOnChanges();
-            expect(instance.provider.organization).toEqual({});
-            expect(instance.provider.contacts).toEqual([]);
+            expect(instance.resolver.organization).toEqual({});
+            expect(instance.resolver.contacts).toEqual([]);
         });
     });
 
     describe('removeContact method', () => {
         it('should remove the contact at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 contacts: [stubs.contact]
             };
             fixture.detectChanges();
@@ -71,8 +64,8 @@ describe('Organization Info Form Component', () => {
 
     describe('addContact method', () => {
         it('should remove the contact at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 contacts: [stubs.contact]
             };
             fixture.detectChanges();
diff --git a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts
similarity index 87%
rename from ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts
index 8a1d2598f..6051e4bbb 100644
--- a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts
@@ -4,10 +4,9 @@ import { Observable, Subscription } from 'rxjs';
 import { startWith, map } from 'rxjs/operators';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver, Contact } from '../../../domain/model';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { EntityValidators } from '../../../domain/service/entity-validators.service';
-import * as patterns from '../../../shared/regex';
 
 @Component({
     selector: 'org-info-form',
@@ -15,7 +14,7 @@ import * as patterns from '../../../shared/regex';
     templateUrl: './organization-info-form.component.html'
 })
 export class OrganizationInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     contactTypes: string[] = [
         'support',
@@ -60,12 +59,12 @@ export class OrganizationInfoFormComponent extends ProviderFormFragmentComponent
     }
 
     ngOnChanges(): void {
-        this.provider.organization = this.provider.organization || {};
-        this.provider.contacts = this.provider.contacts || [];
+        this.resolver.organization = this.resolver.organization || {};
+        this.resolver.contacts = this.resolver.contacts || [];
         this.form.reset({
-            organization: this.provider.organization
+            organization: this.resolver.organization
         });
-        this.setContacts(this.provider.contacts);
+        this.setContacts(this.resolver.contacts);
     }
 
     get contacts(): FormArray {
diff --git a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts b/ui/src/app/metadata/domain/component/forms/provider-form-fragment.component.spec.ts
similarity index 95%
rename from ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/provider-form-fragment.component.spec.ts
index 168004a41..290acaeaa 100644
--- a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/provider-form-fragment.component.spec.ts
@@ -5,7 +5,7 @@ import { ProviderFormFragmentComponent } from './provider-form-fragment.componen
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 
 
-describe('Provider Form Fragment Component', () => {
+describe('Resolver Form Fragment Component', () => {
     let fixture: ComponentFixture<ProviderFormFragmentComponent>;
     let instance: ProviderFormFragmentComponent;
 
diff --git a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts b/ui/src/app/metadata/domain/component/forms/provider-form-fragment.component.ts
similarity index 74%
rename from ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts
rename to ui/src/app/metadata/domain/component/forms/provider-form-fragment.component.ts
index fa9796f5c..746dfe7f8 100644
--- a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/provider-form-fragment.component.ts
@@ -1,15 +1,14 @@
-import { Component, Input, Output, OnInit, OnDestroy, AfterViewInit,
-    ChangeDetectionStrategy, EventEmitter, ElementRef, ViewChildren } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, FormControlName, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnDestroy, ChangeDetectionStrategy, ElementRef, ViewChildren } from '@angular/core';
+import { FormBuilder, FormGroup, FormControlName } from '@angular/forms';
 
 import { Observable, Subject, Subscription } from 'rxjs';
 import { takeUntil, startWith } from 'rxjs/operators';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 
-import * as constants from '../../../shared/constant';
-import { removeNulls } from '../../../shared/util';
+import * as constants from '../../../../shared/constant';
+import { removeNulls } from '../../../../shared/util';
 
 @Component({
     selector: 'provider-form-fragment',
@@ -17,7 +16,7 @@ import { removeNulls } from '../../../shared/util';
     template: `Foo`
 })
 export class ProviderFormFragmentComponent implements OnInit, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
     @ViewChildren(FormControlName, { read: ElementRef }) formInputElements: ElementRef[];
 
     protected ngUnsubscribe: Subject<void> = new Subject<void>();
@@ -25,7 +24,7 @@ export class ProviderFormFragmentComponent implements OnInit, OnDestroy {
     protected statusEmitSubscription: Subscription;
 
     form: FormGroup;
-    provider$: Observable<MetadataProvider>;
+    provider$: Observable<MetadataResolver>;
 
     defaultMaxLength = constants.DEFAULT_FIELD_MAX_LENGTH;
 
diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.html b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.html
similarity index 100%
rename from ui/src/app/metadata-provider/component/forms/relying-party-form.component.html
rename to ui/src/app/metadata/domain/component/forms/relying-party-form.component.html
diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts
similarity index 84%
rename from ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts
rename to ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts
index 170699ec4..62017b66b 100644
--- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts
@@ -4,21 +4,20 @@ 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 '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 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';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { SharedModule } from '../../../../shared/shared.module';
+import { FileBackedHttpMetadataResolver } from '../../entity';
 
 
 @Component({
-    template: `<relying-party-form [provider]="provider"></relying-party-form>`
+    template: `<relying-party-form [resolver]="resolver"></relying-party-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
-        ...stubs.provider,
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
         relyingPartyOverrides: {
             nameIdFormats: [],
             authenticationMethods: []
@@ -29,18 +28,17 @@ class TestHostComponent {
     public formUnderTest: RelyingPartyFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 
     addString(collection: 'nameIdFormats' | 'authenticationMethods', value: string): void {
-        this.provider.relyingPartyOverrides[collection].push(value);
+        this.resolver.relyingPartyOverrides[collection].push(value);
     }
 }
 
 describe('Relying Party Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
     let form: RelyingPartyFormComponent;
     let fb: FormBuilder;
 
@@ -55,9 +53,6 @@ describe('Relying Party Form Component', () => {
             imports: [
                 NoopAnimationsModule,
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
-                }),
                 NgbPopoverModule,
                 SharedModule
             ],
@@ -66,8 +61,6 @@ describe('Relying Party Form Component', () => {
                 TestHostComponent
             ],
         });
-        store = TestBed.get(Store);
-        spyOn(store, 'dispatch').and.callThrough();
 
         fixture = TestBed.createComponent(TestHostComponent);
         fb = TestBed.get(FormBuilder);
diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.ts
similarity index 89%
rename from ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts
rename to ui/src/app/metadata/domain/component/forms/relying-party-form.component.ts
index 354995938..4aef6bff4 100644
--- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts
+++ b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.ts
@@ -1,13 +1,12 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
 import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 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 { MetadataResolver } from '../../../domain/model';
 
-import { URL_REGEX } from '../../../shared/regex';
 
 @Component({
     selector: 'relying-party-form',
@@ -15,7 +14,7 @@ import { URL_REGEX } from '../../../shared/regex';
     templateUrl: './relying-party-form.component.html'
 })
 export class RelyingPartyFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
     nameIds$: Observable<string[]> = of([]);
@@ -84,7 +83,7 @@ export class RelyingPartyFormComponent extends ProviderFormFragmentComponent imp
     }
 
     ngOnChanges(): void {
-        let overrides = this.provider.relyingPartyOverrides || {nameIdFormats: [], authenticationMethods: []};
+        let overrides = this.resolver.relyingPartyOverrides || {nameIdFormats: [], authenticationMethods: []};
         this.form.reset({
             relyingPartyOverrides: overrides
         });
diff --git a/ui/src/app/metadata-provider/component/index.ts b/ui/src/app/metadata/domain/component/index.ts
similarity index 84%
rename from ui/src/app/metadata-provider/component/index.ts
rename to ui/src/app/metadata/domain/component/index.ts
index 3a676ac1a..238ff8d25 100644
--- a/ui/src/app/metadata-provider/component/index.ts
+++ b/ui/src/app/metadata/domain/component/index.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
+import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap/modal/modal.module';
 
 import { AdvancedInfoFormComponent } from './forms/advanced-info-form.component';
@@ -17,9 +17,7 @@ import { LogoutFormComponent } from './forms/logout-form.component';
 import { FinishFormComponent } from './forms/finish-form.component';
 import { ProviderFormFragmentComponent } from './forms/provider-form-fragment.component';
 
-import { InfoLabelDirective } from '../directive/info-label.directive';
-import { InputDefaultsDirective } from '../directive/input-defaults.directive';
-import { SharedModule } from '../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 import { DomainModule } from '../../domain/domain.module';
 
 export const COMPONENTS = [
@@ -38,8 +36,6 @@ export const COMPONENTS = [
 
 export const declarations = [
     ...COMPONENTS,
-    InfoLabelDirective,
-    InputDefaultsDirective
 ];
 
 @NgModule({
diff --git a/ui/src/app/shared/preview/preview-dialog.component.html b/ui/src/app/metadata/domain/component/preview-dialog.component.html
similarity index 100%
rename from ui/src/app/shared/preview/preview-dialog.component.html
rename to ui/src/app/metadata/domain/component/preview-dialog.component.html
diff --git a/ui/src/app/metadata/domain/component/preview-dialog.component.ts b/ui/src/app/metadata/domain/component/preview-dialog.component.ts
new file mode 100644
index 000000000..824d5be90
--- /dev/null
+++ b/ui/src/app/metadata/domain/component/preview-dialog.component.ts
@@ -0,0 +1,25 @@
+import { Component, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import * as FileSaver from 'file-saver';
+import { Subscription } from 'rxjs/Subscription';
+import { MetadataEntity } from '../../domain/model';
+
+@Component({
+    selector: 'preview-dialog',
+    templateUrl: './preview-dialog.component.html'
+})
+export class PreviewDialogComponent {
+    @Input() entity: MetadataEntity;
+    @Input() xml: string;
+
+    sub: Subscription;
+
+    constructor(
+        public activeModal: NgbActiveModal
+    ) {}
+
+    preview(xml): void {
+        const blob = new Blob([xml], { type: 'text/xml;charset=utf-8' });
+        FileSaver.saveAs(blob, `${ this.entity.name }.xml`);
+    }
+} /* istanbul ignore next */
diff --git a/ui/src/app/domain/domain.module.ts b/ui/src/app/metadata/domain/domain.module.ts
similarity index 53%
rename from ui/src/app/domain/domain.module.ts
rename to ui/src/app/metadata/domain/domain.module.ts
index ac77546db..3349342d9 100644
--- a/ui/src/app/domain/domain.module.ts
+++ b/ui/src/app/metadata/domain/domain.module.ts
@@ -1,29 +1,24 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { HttpModule } from '@angular/http';
-import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { CommonModule } from '@angular/common';
 
-import { EntityDescriptorService } from './service/entity-descriptor.service';
+import { ResolverService } from './service/resolver.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';
+import { EntityDraftService } from './service/draft.service';
 
-import { reducers } from './reducer';
-import { DraftCollectionEffects } from './effect/draft-collection.effects';
-import { ProviderCollectionEffects } from './effect/provider-collection.effects';
-import { FilterCollectionEffects } from './effect/filter-collection.effect';
-import { MetadataResolverService } from './service/metadata-resolver.service';
+import { MetadataProviderService } from './service/provider.service';
 import { EntityEffects } from './effect/entity.effect';
-import { PreviewDialogModule } from '../shared/preview/preview-dialog.module';
-import { I18nTextComponent } from './component/i18n-text.component';
+import { PreviewDialogComponent } from './component/preview-dialog.component';
 
-export const COMPONENTS = [];
+export const COMPONENTS = [
+    PreviewDialogComponent
+];
 
 export const DECLARATIONS = [
-    ...COMPONENTS,
-    I18nTextComponent
+    ...COMPONENTS
 ];
 
 @NgModule({
@@ -31,8 +26,7 @@ export const DECLARATIONS = [
     entryComponents: COMPONENTS,
     imports: [
         HttpModule,
-        CommonModule,
-        PreviewDialogModule
+        CommonModule
     ],
     exports: DECLARATIONS,
     providers: []
@@ -42,13 +36,13 @@ export class DomainModule {
         return {
             ngModule: RootDomainModule,
             providers: [
-                EntityDescriptorService,
+                ResolverService,
                 EntityIdService,
                 EntityDraftService,
                 ListValuesService,
                 ProviderStatusEmitter,
                 ProviderValueEmitter,
-                MetadataResolverService
+                MetadataProviderService
             ]
         };
     }
@@ -57,11 +51,7 @@ export class DomainModule {
 @NgModule({
     imports: [
         DomainModule,
-        StoreModule.forFeature('collections', reducers),
         EffectsModule.forFeature([
-            FilterCollectionEffects,
-            DraftCollectionEffects,
-            ProviderCollectionEffects,
             EntityEffects
         ])
     ],
diff --git a/ui/src/app/metadata/domain/domain.type.ts b/ui/src/app/metadata/domain/domain.type.ts
new file mode 100644
index 000000000..78def16d7
--- /dev/null
+++ b/ui/src/app/metadata/domain/domain.type.ts
@@ -0,0 +1,36 @@
+import {
+    MetadataProvider,
+    MetadataResolver,
+    MetadataFilter
+} from './model';
+
+import {
+    EntityAttributesFilter,
+    FileBackedHttpMetadataResolver,
+    FileBackedHttpMetadataProvider
+} from './entity';
+
+export type Filter =
+    | EntityAttributesFilter;
+
+export type Resolver =
+    | FileBackedHttpMetadataResolver;
+
+export type Provider =
+    | FileBackedHttpMetadataProvider;
+
+export type Entity =
+    | Filter
+    | Resolver
+    | Provider;
+
+export type Metadata =
+    | MetadataProvider
+    | MetadataResolver
+    | MetadataFilter;
+
+export enum MetadataTypes {
+    FILTER = '[Type] Metadata Filter',
+    PROVIDER = '[Type] Metadata Provider',
+    RESOLVER = '[Type] Metadata Resolver'
+}
diff --git a/ui/src/app/metadata/domain/domain.util.spec.ts b/ui/src/app/metadata/domain/domain.util.spec.ts
new file mode 100644
index 000000000..548379455
--- /dev/null
+++ b/ui/src/app/metadata/domain/domain.util.spec.ts
@@ -0,0 +1,36 @@
+import * as util from './domain.util';
+
+describe('Domain Utility methods', () => {
+
+    describe('combineAllFn', () => {
+        it('should return true when the selected id is found', () => {
+            expect(util.combineAllFn(['foo'], ['bar'])).toEqual(['bar', 'foo']);
+        });
+    });
+
+    describe('doesExistFn', () => {
+        it('should return true when the selected id is found', () => {
+            expect(util.doesExistFn(['foo', 'bar'], 'foo')).toBe(true);
+        });
+        it('should return false when the selected id is not found', () => {
+            expect(util.doesExistFn(['foo'], 'bar')).toBe(false);
+        });
+    });
+
+    describe('getInCollectionFn', () => {
+        const entities = { foo: {}, bar: {} };
+        it('should return the entity with the given id', () => {
+            expect(util.getInCollectionFn(entities, 'foo')).toBe(entities.foo);
+        });
+        it('should return null when provided a null id', () => {
+            expect(util.getInCollectionFn(entities, null)).toBeNull();
+        });
+    });
+
+    describe('getEntityIdsFn', () => {
+        const entities = [{ entityId: 'foo' }, { entityId: 'bar' }];
+        it('should return a list of ids', () => {
+            expect(util.getEntityIdsFn(entities)).toEqual(['foo', 'bar']);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/domain/domain.util.ts b/ui/src/app/metadata/domain/domain.util.ts
new file mode 100644
index 000000000..599ce04b7
--- /dev/null
+++ b/ui/src/app/metadata/domain/domain.util.ts
@@ -0,0 +1,10 @@
+/*
+ *   Utility functions
+*/
+
+export const combineAllFn = (d, p) => [...p, ...d];
+export const doesExistFn = (ids, selected) => ids.indexOf(selected) > -1;
+export const getInCollectionFn = (entities, selectedId) => {
+    return selectedId && entities[selectedId];
+};
+export const getEntityIdsFn = list => list.map(entity => entity.entityId);
diff --git a/ui/src/app/domain/effect/entity.effect.spec.ts b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
similarity index 80%
rename from ui/src/app/domain/effect/entity.effect.spec.ts
rename to ui/src/app/metadata/domain/effect/entity.effect.spec.ts
index 25a14a107..d42817b6e 100644
--- a/ui/src/app/domain/effect/entity.effect.spec.ts
+++ b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
@@ -2,13 +2,13 @@ import { TestBed, tick, fakeAsync } from '@angular/core/testing';
 import { Actions } from '@ngrx/effects';
 import { of } from 'rxjs';
 
-import { TestActions, getActions } from '../../../testing/effect.util';
+import { TestActions, getActions } from '../../../../testing/effect.util';
 import { EntityEffects } from './entity.effect';
 import { EntityIdService } from '../service/entity-id.service';
-import { EntityDescriptorService } from '../service/entity-descriptor.service';
+import { ResolverService } from '../service/resolver.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NgbModalStub } from '../../../testing/modal.stub';
-import { EntityAttributesFilter } from '../entity/entity-attributes.filter';
+import { NgbModalStub } from '../../../../testing/modal.stub';
+import { EntityAttributesFilter } from '../entity';
 
 describe('Entity Effects', () => {
     let effects: EntityEffects;
@@ -26,7 +26,7 @@ describe('Entity Effects', () => {
                     useClass: NgbModalStub
                 },
                 {
-                    provide: EntityDescriptorService,
+                    provide: ResolverService,
                     useValue: { preview: () => {} },
                 },
                 {
@@ -38,7 +38,7 @@ describe('Entity Effects', () => {
         });
 
         effects = TestBed.get(EntityEffects);
-        providerService = TestBed.get(EntityDescriptorService);
+        providerService = TestBed.get(ResolverService);
         idService = TestBed.get(EntityIdService);
         modal = TestBed.get(NgbModal);
         actions$ = TestBed.get(Actions);
diff --git a/ui/src/app/domain/effect/entity.effect.ts b/ui/src/app/metadata/domain/effect/entity.effect.ts
similarity index 65%
rename from ui/src/app/domain/effect/entity.effect.ts
rename to ui/src/app/metadata/domain/effect/entity.effect.ts
index 440f5dd45..4901b3828 100644
--- a/ui/src/app/domain/effect/entity.effect.ts
+++ b/ui/src/app/metadata/domain/effect/entity.effect.ts
@@ -3,12 +3,12 @@ import { Effect, Actions, ofType } from '@ngrx/effects';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { Observable } from 'rxjs';
-import { map, switchMap, tap } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 
-import { EntityDescriptorService } from '../service/entity-descriptor.service';
-import { MetadataResolverService } from '../service/metadata-resolver.service';
-import { PreviewDialogComponent } from '../../shared/preview/preview-dialog.component';
-import { MetadataEntity, DomainEntityKinds } from '../domain.type';
+import { ResolverService } from '../service/resolver.service';
+import { PreviewDialogComponent } from '../component/preview-dialog.component';
+import { MetadataEntity } from '../model';
+import { MetadataTypes } from '../domain.type';
 import { EntityIdService } from '../service/entity-id.service';
 import * as entityActions from '../action/entity.action';
 
@@ -26,13 +26,13 @@ export class EntityEffects {
     constructor(
         private actions$: Actions,
         private modalService: NgbModal,
-        private providerService: EntityDescriptorService,
+        private providerService: ResolverService,
         private entityService: EntityIdService
     ) { }
 
     openModal(entity: MetadataEntity): void {
-        let request: Observable<string> = entity.kind === DomainEntityKinds.filter ?
-            this.entityService.preview(entity.entityId) : this.providerService.preview(entity.id);
+        let request: Observable<string> = entity.kind === MetadataTypes.FILTER ?
+            this.entityService.preview(entity.getId()) : this.providerService.preview(entity.getId());
         request.subscribe(xml => {
             let modal = this.modalService.open(PreviewDialogComponent, {
                 size: 'lg',
diff --git a/ui/src/app/domain/entity/entity-attributes.filter.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
similarity index 71%
rename from ui/src/app/domain/entity/entity-attributes.filter.ts
rename to ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
index b10cde00f..82b5ae9d6 100644
--- a/ui/src/app/domain/entity/entity-attributes.filter.ts
+++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
@@ -1,8 +1,8 @@
-import { MetadataFilter, RelyingPartyOverrides } from '../model/metadata-filter';
-import { DomainEntityKinds } from '../domain.type';
-import { FilterTarget } from '../model/filter-target';
+import { MetadataFilter, MetadataEntity, RelyingPartyOverrides } from '../../model';
+import { MetadataTypes } from '../../domain.type';
+import { FilterTarget } from '../../model';
 
-export class EntityAttributesFilter implements MetadataFilter {
+export class EntityAttributesFilter implements MetadataFilter, MetadataEntity {
     createdDate?: string;
     modifiedDate?: string;
     version: string;
@@ -29,6 +29,22 @@ export class EntityAttributesFilter implements MetadataFilter {
         Object.assign(this, { ...obj });
     }
 
+    getId(): string {
+        return this.entityId;
+    }
+
+    getDisplayId(): string {
+        return this.entityId;
+    }
+
+    isDraft(): boolean {
+        return false;
+    }
+
+    getCreationDate(): Date {
+        return new Date(this.createdDate);
+    }
+
     get id(): string {
         return this.resourceId;
     }
@@ -42,7 +58,7 @@ export class EntityAttributesFilter implements MetadataFilter {
     }
 
     get kind(): string {
-        return DomainEntityKinds.filter;
+        return MetadataTypes.FILTER;
     }
 
     get entityId(): string {
diff --git a/ui/src/app/metadata/domain/entity/index.ts b/ui/src/app/metadata/domain/entity/index.ts
new file mode 100644
index 000000000..1adb3735e
--- /dev/null
+++ b/ui/src/app/metadata/domain/entity/index.ts
@@ -0,0 +1,3 @@
+export * from './filter/entity-attributes-filter';
+export * from './provider/file-backed-http-metadata-provider';
+export * from './resolver/file-backed-http-metadata-resolver';
diff --git a/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts
new file mode 100644
index 000000000..37d74a6a8
--- /dev/null
+++ b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.spec.ts
@@ -0,0 +1,104 @@
+import { FileBackedHttpMetadataProvider } from './file-backed-http-metadata-provider';
+
+describe('Resolver construct', () => {
+
+    const config = {
+        id: 'foo',
+        entityId: 'string',
+        serviceProviderName: 'string',
+        organization: {
+            'name': 'string',
+            'displayName': 'string',
+            'url': 'string'
+        },
+        contacts: [
+            {
+                'name': 'string',
+                'type': 'string',
+                'emailAddress': 'string'
+            }
+        ],
+        mdui: {
+            'displayName': 'string',
+            'informationUrl': 'string',
+            'privacyStatementUrl': 'string',
+            'logoUrl': 'string',
+            'logoHeight': 100,
+            'logoWidth': 100,
+            'description': 'string'
+        },
+        securityInfo: {
+            'x509CertificateAvailable': true,
+            'authenticationRequestsSigned': true,
+            'wantAssertionsSigned': true,
+            'x509Certificates': [
+                {
+                    'name': 'string',
+                    'type': 'string',
+                    'value': 'string'
+                }
+            ]
+        },
+        assertionConsumerServices: [
+            {
+                'binding': 'string',
+                'locationUrl': 'string',
+                'makeDefault': true
+            }
+        ],
+        serviceProviderSsoDescriptor: {
+            'protocolSupportEnum': 'string',
+            'nameIdFormats': [
+                'string'
+            ]
+        },
+
+        logoutEndpoints: [
+            {
+                'url': 'string',
+                'bindingType': 'string'
+            }
+        ],
+        serviceEnabled: true,
+        createdDate: new Date().toDateString(),
+        modifiedDate: new Date().toDateString(),
+        relyingPartyOverrides: {
+            'signAssertion': true,
+            'dontSignResponse': true,
+            'turnOffEncryption': true,
+            'useSha': true,
+            'ignoreAuthenticationMethod': true,
+            'omitNotBefore': true,
+            'responderId': 'string',
+            'nameIdFormats': [
+                'string'
+            ],
+            'authenticationMethods': [
+                'string'
+            ]
+        },
+        attributeRelease: [
+            'eduPersonPrincipalName',
+            'uid',
+            'mail'
+        ]
+    };
+
+    let entity;
+
+    beforeEach(() => {
+        entity = new FileBackedHttpMetadataProvider(config);
+    });
+
+    it('should populate its own values', () => {
+        Object.keys(config).forEach(key => {
+            expect(entity[key]).toEqual(config[key]);
+        });
+    });
+
+    describe('interface methods', () => {
+        it('should return a date object from getCreationDate', () => {
+            expect(entity.getCreationDate()).toEqual(new Date(config.createdDate));
+        });
+    });
+});
diff --git a/ui/src/app/domain/entity/provider.ts b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
similarity index 74%
rename from ui/src/app/domain/entity/provider.ts
rename to ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
index 6d87d0bcd..41898afa5 100644
--- a/ui/src/app/domain/entity/provider.ts
+++ b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
@@ -1,5 +1,6 @@
 import {
     MetadataProvider,
+    MetadataEntity,
     Organization,
     Contact,
     MDUI,
@@ -9,10 +10,10 @@ import {
     SsoService,
     IdpSsoDescriptor,
     RelyingPartyOverrides
-} from '../model/metadata-provider';
-import { DomainEntityKinds } from '../domain.type';
+} from '../../model';
+import { MetadataTypes } from '../../domain.type';
 
-export class Provider implements MetadataProvider {
+export class FileBackedHttpMetadataProvider implements MetadataProvider, MetadataEntity {
     id = '';
     createdDate?: string;
     modifiedDate?: string;
@@ -51,6 +52,22 @@ export class Provider implements MetadataProvider {
         Object.assign(this, descriptor);
     }
 
+    getId(): string {
+        return this.id;
+    }
+
+    getDisplayId(): string {
+        return this.id;
+    }
+
+    isDraft(): boolean {
+        return false;
+    }
+
+    getCreationDate(): Date {
+        return new Date(this.createdDate);
+    }
+
     get name(): string {
         return this.serviceProviderName;
     }
@@ -60,7 +77,7 @@ export class Provider implements MetadataProvider {
     }
 
     get kind(): string {
-        return DomainEntityKinds.provider;
+        return MetadataTypes.PROVIDER;
     }
 
     serialize(): any {
diff --git a/ui/src/app/domain/entity/provider.spec.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.spec.ts
similarity index 92%
rename from ui/src/app/domain/entity/provider.spec.ts
rename to ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.spec.ts
index c5607e257..669033c19 100644
--- a/ui/src/app/domain/entity/provider.spec.ts
+++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.spec.ts
@@ -1,7 +1,6 @@
-import { Provider } from './provider';
-import { MetadataProvider } from '../model/metadata-provider';
+import { FileBackedHttpMetadataResolver } from './file-backed-http-metadata-resolver';
 
-describe('Provider construct', () => {
+describe('Resolver construct', () => {
 
     const config = {
         id: 'foo',
@@ -84,7 +83,7 @@ describe('Provider construct', () => {
             'mail'
         ]
     };
-    const entity = new Provider(config);
+    const entity = new FileBackedHttpMetadataResolver(config);
 
     it('should populate its own values', () => {
         Object.keys(config).forEach(key => {
diff --git a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts
new file mode 100644
index 000000000..982d86d35
--- /dev/null
+++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts
@@ -0,0 +1,86 @@
+import {
+    Organization,
+    Contact,
+    MDUI,
+    LogoutEndpoint,
+    SecurityInfo,
+    Certificate,
+    SsoService,
+    IdpSsoDescriptor,
+    RelyingPartyOverrides,
+    MetadataResolver
+} from '../../model';
+import { MetadataTypes } from '../../domain.type';
+import { MetadataEntity } from '../../model/metadata-entity';
+
+export class FileBackedHttpMetadataResolver implements MetadataResolver, MetadataEntity {
+    id = '';
+    createdDate?: string;
+    modifiedDate?: string;
+    version: string;
+
+    entityId = '';
+    serviceProviderName = '';
+    organization = {} as Organization;
+    contacts = [] as Contact[];
+    mdui = {} as MDUI;
+
+    securityInfo = {
+        x509CertificateAvailable: false,
+        authenticationRequestsSigned: false,
+        wantAssertionsSigned: false,
+        x509Certificates: [] as Certificate[]
+    } as SecurityInfo;
+
+    assertionConsumerServices = [] as SsoService[];
+    serviceProviderSsoDescriptor = {
+        nameIdFormats: []
+    } as IdpSsoDescriptor;
+
+    logoutEndpoints: LogoutEndpoint[] = [];
+
+    serviceEnabled = false;
+
+    relyingPartyOverrides = {
+        nameIdFormats: [] as string[],
+        authenticationMethods: [] as string[]
+    } as RelyingPartyOverrides;
+
+    attributeRelease = [] as string[];
+
+    constructor(descriptor?: Partial<MetadataResolver>) {
+        Object.assign(this, descriptor);
+    }
+
+    getId(): string {
+        return this.id ? this.id : this.entityId;
+    }
+
+    getDisplayId(): string {
+        return this.entityId;
+    }
+
+    isDraft(): boolean {
+        return this.id ? false : true;
+    }
+
+    getCreationDate(): Date {
+        return new Date(this.createdDate);
+    }
+
+    get name(): string {
+        return this.serviceProviderName;
+    }
+
+    get enabled(): boolean {
+        return this.serviceEnabled;
+    }
+
+    get kind(): string {
+        return MetadataTypes.RESOLVER;
+    }
+
+    serialize(): any {
+        return this;
+    }
+}
diff --git a/ui/src/app/metadata/domain/model/index.ts b/ui/src/app/metadata/domain/model/index.ts
new file mode 100644
index 000000000..cd00d92fe
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/index.ts
@@ -0,0 +1,15 @@
+export * from './metadata-base';
+export * from './metadata-entity';
+export * from './metadata-filter';
+export * from './metadata-provider';
+export * from './metadata-resolver';
+export * from './properties/certificate';
+export * from './properties/contact';
+export * from './properties/filter-target';
+export * from './properties/logout-endpoint';
+export * from './properties/mdui';
+export * from './properties/organization';
+export * from './properties/relying-party-overrides';
+export * from './properties/security-info';
+export * from './properties/sso-descriptor';
+export * from './properties/sso-service';
diff --git a/ui/src/app/domain/model/metadata-base.ts b/ui/src/app/metadata/domain/model/metadata-base.ts
similarity index 50%
rename from ui/src/app/domain/model/metadata-base.ts
rename to ui/src/app/metadata/domain/model/metadata-base.ts
index fc5ea1ca7..2de4e32bf 100644
--- a/ui/src/app/domain/model/metadata-base.ts
+++ b/ui/src/app/metadata/domain/model/metadata-base.ts
@@ -2,11 +2,5 @@ export interface MetadataBase {
     id?: string;
     createdDate?: string;
     modifiedDate?: string;
-    version: string;
-
-    name: string;
-    enabled: boolean;
-    kind: string;
-
-    serialize(): any;
+    version?: string;
 }
diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts
new file mode 100644
index 000000000..49d34a78a
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/metadata-entity.ts
@@ -0,0 +1,12 @@
+export interface MetadataEntity {
+    name: string;
+    enabled: boolean;
+    kind: string;
+
+    getId(): string;
+    getDisplayId(): string;
+    isDraft(): boolean;
+    getCreationDate(): Date;
+
+    serialize(): any;
+}
diff --git a/ui/src/app/domain/model/metadata-filter.ts b/ui/src/app/metadata/domain/model/metadata-filter.ts
similarity index 84%
rename from ui/src/app/domain/model/metadata-filter.ts
rename to ui/src/app/metadata/domain/model/metadata-filter.ts
index 869bbc3c0..093fc4cf6 100644
--- a/ui/src/app/domain/model/metadata-filter.ts
+++ b/ui/src/app/metadata/domain/model/metadata-filter.ts
@@ -9,5 +9,3 @@ export interface MetadataFilter extends MetadataBase {
 
     serialize(): any;
 }
-
-export * from './relying-party-overrides';
diff --git a/ui/src/app/metadata/domain/model/metadata-provider.ts b/ui/src/app/metadata/domain/model/metadata-provider.ts
new file mode 100644
index 000000000..22da67257
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/metadata-provider.ts
@@ -0,0 +1,25 @@
+import {
+    MetadataBase,
+    Organization,
+    Contact,
+    MDUI,
+    SecurityInfo,
+    SsoService,
+    IdpSsoDescriptor,
+    LogoutEndpoint,
+    RelyingPartyOverrides
+} from '../model';
+
+export interface MetadataProvider extends MetadataBase {
+    serviceProviderName: string;
+    organization?: Organization;
+    contacts?: Contact[];
+    mdui?: MDUI;
+    securityInfo?: SecurityInfo;
+    assertionConsumerServices?: SsoService[];
+    serviceProviderSsoDescriptor?: IdpSsoDescriptor;
+    logoutEndpoints?: LogoutEndpoint[];
+    serviceEnabled?: boolean;
+    relyingPartyOverrides: RelyingPartyOverrides;
+    attributeRelease: string[];
+}
diff --git a/ui/src/app/metadata/domain/model/metadata-resolver.ts b/ui/src/app/metadata/domain/model/metadata-resolver.ts
new file mode 100644
index 000000000..431d9d448
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/metadata-resolver.ts
@@ -0,0 +1,26 @@
+import {
+    MetadataBase,
+    Organization,
+    Contact,
+    MDUI,
+    SecurityInfo,
+    SsoService,
+    IdpSsoDescriptor,
+    LogoutEndpoint,
+    RelyingPartyOverrides
+} from '../model';
+
+export interface MetadataResolver extends MetadataBase {
+    entityId: string;
+    serviceProviderName: string;
+    organization?: Organization;
+    contacts?: Contact[];
+    mdui?: MDUI;
+    securityInfo?: SecurityInfo;
+    assertionConsumerServices?: SsoService[];
+    serviceProviderSsoDescriptor?: IdpSsoDescriptor;
+    logoutEndpoints?: LogoutEndpoint[];
+    serviceEnabled?: boolean;
+    relyingPartyOverrides: RelyingPartyOverrides;
+    attributeRelease: string[];
+}
diff --git a/ui/src/app/domain/model/certificate.ts b/ui/src/app/metadata/domain/model/properties/certificate.ts
similarity index 97%
rename from ui/src/app/domain/model/certificate.ts
rename to ui/src/app/metadata/domain/model/properties/certificate.ts
index e46be4e38..bb8ad9088 100644
--- a/ui/src/app/domain/model/certificate.ts
+++ b/ui/src/app/metadata/domain/model/properties/certificate.ts
@@ -2,4 +2,4 @@ export interface Certificate {
     name: string;
     type: string;
     value: string;
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/domain/model/contact.ts b/ui/src/app/metadata/domain/model/properties/contact.ts
similarity index 97%
rename from ui/src/app/domain/model/contact.ts
rename to ui/src/app/metadata/domain/model/properties/contact.ts
index 1485522d5..52d1fe905 100644
--- a/ui/src/app/domain/model/contact.ts
+++ b/ui/src/app/metadata/domain/model/properties/contact.ts
@@ -2,4 +2,4 @@ export interface Contact {
     type: string;
     name: string;
     emailAddress: string;
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/domain/model/filter-target.ts b/ui/src/app/metadata/domain/model/properties/filter-target.ts
similarity index 100%
rename from ui/src/app/domain/model/filter-target.ts
rename to ui/src/app/metadata/domain/model/properties/filter-target.ts
diff --git a/ui/src/app/domain/model/logout-endpoint.ts b/ui/src/app/metadata/domain/model/properties/logout-endpoint.ts
similarity index 97%
rename from ui/src/app/domain/model/logout-endpoint.ts
rename to ui/src/app/metadata/domain/model/properties/logout-endpoint.ts
index 9f149b4d2..31354277a 100644
--- a/ui/src/app/domain/model/logout-endpoint.ts
+++ b/ui/src/app/metadata/domain/model/properties/logout-endpoint.ts
@@ -1,4 +1,4 @@
 export interface LogoutEndpoint {
     url: string;
     bindingType: string;
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/domain/model/mdui.ts b/ui/src/app/metadata/domain/model/properties/mdui.ts
similarity index 100%
rename from ui/src/app/domain/model/mdui.ts
rename to ui/src/app/metadata/domain/model/properties/mdui.ts
diff --git a/ui/src/app/domain/model/organization.ts b/ui/src/app/metadata/domain/model/properties/organization.ts
similarity index 100%
rename from ui/src/app/domain/model/organization.ts
rename to ui/src/app/metadata/domain/model/properties/organization.ts
diff --git a/ui/src/app/domain/model/relying-party-overrides.ts b/ui/src/app/metadata/domain/model/properties/relying-party-overrides.ts
similarity index 100%
rename from ui/src/app/domain/model/relying-party-overrides.ts
rename to ui/src/app/metadata/domain/model/properties/relying-party-overrides.ts
diff --git a/ui/src/app/domain/model/security-info.ts b/ui/src/app/metadata/domain/model/properties/security-info.ts
similarity index 100%
rename from ui/src/app/domain/model/security-info.ts
rename to ui/src/app/metadata/domain/model/properties/security-info.ts
diff --git a/ui/src/app/domain/model/sso-descriptor.ts b/ui/src/app/metadata/domain/model/properties/sso-descriptor.ts
similarity index 100%
rename from ui/src/app/domain/model/sso-descriptor.ts
rename to ui/src/app/metadata/domain/model/properties/sso-descriptor.ts
diff --git a/ui/src/app/domain/model/sso-service.ts b/ui/src/app/metadata/domain/model/properties/sso-service.ts
similarity index 100%
rename from ui/src/app/domain/model/sso-service.ts
rename to ui/src/app/metadata/domain/model/properties/sso-service.ts
diff --git a/ui/src/app/domain/service/entity-draft.service.spec.ts b/ui/src/app/metadata/domain/service/draft.service.spec.ts
similarity index 74%
rename from ui/src/app/domain/service/entity-draft.service.spec.ts
rename to ui/src/app/metadata/domain/service/draft.service.spec.ts
index c30b8761a..bc88dc941 100644
--- a/ui/src/app/domain/service/entity-draft.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/draft.service.spec.ts
@@ -1,9 +1,6 @@
 import { TestBed } from '@angular/core/testing';
-import { HttpClientModule, HttpRequest, HttpParams } from '@angular/common/http';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { EntityDraftService } from './entity-draft.service';
-import { Provider } from '../entity/provider';
-
+import { EntityDraftService } from './draft.service';
+import { FileBackedHttpMetadataResolver } from '../entity';
 
 describe(`EntityDraftService`, () => {
     let service: EntityDraftService;
@@ -20,7 +17,7 @@ describe(`EntityDraftService`, () => {
 
     describe('query', () => {
         it(`should return an observable of the list from the store`, (done: DoneFn) => {
-            let list = [new Provider()];
+            let list = [new FileBackedHttpMetadataResolver()];
             spyOn(service.storage, 'query').and.returnValue(list);
             service.query().subscribe(l => {
                 expect(l).toEqual(list);
@@ -31,7 +28,7 @@ describe(`EntityDraftService`, () => {
     describe('find', () => {
         it(`should return an observable of the list from the store`, (done: DoneFn) => {
             let id = 'foo';
-            let e = new Provider({ entityId: id });
+            let e = new FileBackedHttpMetadataResolver({ entityId: id });
             let list = [e];
             spyOn(service.storage, 'query').and.returnValue(list);
             service.find(id).subscribe(entity => {
diff --git a/ui/src/app/domain/service/entity-draft.service.ts b/ui/src/app/metadata/domain/service/draft.service.ts
similarity index 60%
rename from ui/src/app/domain/service/entity-draft.service.ts
rename to ui/src/app/metadata/domain/service/draft.service.ts
index 687d4d441..a31f8c798 100644
--- a/ui/src/app/domain/service/entity-draft.service.ts
+++ b/ui/src/app/metadata/domain/service/draft.service.ts
@@ -3,23 +3,22 @@ import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { MOCK_DESCRIPTORS } from '../../../data/descriptors.mock';
-import { Storage } from '../../shared/storage';
+import { MetadataResolver } from '../../domain/model';
+import { Storage } from '../../../shared/storage';
 
 @Injectable()
 export class EntityDraftService {
 
-    readonly storage: Storage<MetadataProvider>;
+    readonly storage: Storage<MetadataResolver>;
 
     constructor() {
-        this.storage = new Storage<MetadataProvider>('provider_drafts');
+        this.storage = new Storage<MetadataResolver>('provider_drafts');
     }
-    query(): Observable<MetadataProvider[]> {
+    query(): Observable<MetadataResolver[]> {
         return of(this.storage.query());
     }
 
-    find(entityId: string): Observable<MetadataProvider> {
+    find(entityId: string): Observable<MetadataResolver> {
         return this.query().pipe(
             switchMap(
                 list => of(
@@ -29,17 +28,17 @@ export class EntityDraftService {
         );
     }
 
-    save(provider: MetadataProvider): Observable<MetadataProvider> {
+    save(provider: MetadataResolver): Observable<MetadataResolver> {
         this.storage.add(provider);
         return of(provider);
     }
 
-    remove(provider: MetadataProvider): Observable<MetadataProvider> {
+    remove(provider: MetadataResolver): Observable<MetadataResolver> {
         this.storage.removeByAttr(provider.entityId, 'entityId');
         return of(provider);
     }
 
-    update(provider: MetadataProvider): Observable<MetadataProvider> {
+    update(provider: MetadataResolver): Observable<MetadataResolver> {
         let stored = this.storage.findByAttr(provider.id, 'entityId');
         stored = Object.assign({}, stored, provider);
         this.storage.removeByAttr(provider.entityId, 'entityId');
diff --git a/ui/src/app/domain/service/entity-id.service.spec.ts b/ui/src/app/metadata/domain/service/entity-id.service.spec.ts
similarity index 100%
rename from ui/src/app/domain/service/entity-id.service.spec.ts
rename to ui/src/app/metadata/domain/service/entity-id.service.spec.ts
diff --git a/ui/src/app/domain/service/entity-id.service.ts b/ui/src/app/metadata/domain/service/entity-id.service.ts
similarity index 82%
rename from ui/src/app/domain/service/entity-id.service.ts
rename to ui/src/app/metadata/domain/service/entity-id.service.ts
index f95e5d653..8daec78df 100644
--- a/ui/src/app/domain/service/entity-id.service.ts
+++ b/ui/src/app/metadata/domain/service/entity-id.service.ts
@@ -1,18 +1,11 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 
-import * as XmlFormatter from 'xml-formatter';
-
 import { Observable, Subject, throwError } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 
-import { IDS } from '../../../data/ids.mock';
-import { Storage } from '../../shared/storage';
-import { environment } from '../../../environments/environment';
-import { QueryParams } from '../../core/model/query';
-import { MDUI } from '../model/mdui';
-
-const MOCK_INTERVAL = 500;
+import { QueryParams } from '../../../core/model/query';
+import { MDUI } from '../model';
 
 @Injectable()
 export class EntityIdService {
diff --git a/ui/src/app/domain/service/entity-validators.service.spec.ts b/ui/src/app/metadata/domain/service/entity-validators.service.spec.ts
similarity index 100%
rename from ui/src/app/domain/service/entity-validators.service.spec.ts
rename to ui/src/app/metadata/domain/service/entity-validators.service.spec.ts
diff --git a/ui/src/app/domain/service/entity-validators.service.ts b/ui/src/app/metadata/domain/service/entity-validators.service.ts
similarity index 96%
rename from ui/src/app/domain/service/entity-validators.service.ts
rename to ui/src/app/metadata/domain/service/entity-validators.service.ts
index 0e7a26716..638ba0c63 100644
--- a/ui/src/app/domain/service/entity-validators.service.ts
+++ b/ui/src/app/metadata/domain/service/entity-validators.service.ts
@@ -1,7 +1,7 @@
 import { Observable, of } from 'rxjs';
 import { map, take, startWith } from 'rxjs/operators';
 
-import { AbstractControl, FormGroup } from '@angular/forms';
+import { AbstractControl } from '@angular/forms';
 
 export class EntityValidators {
     static createUniqueIdValidator(ids$: Observable<string[]>) {
diff --git a/ui/src/app/domain/service/list-values.service.spec.ts b/ui/src/app/metadata/domain/service/list-values.service.spec.ts
similarity index 100%
rename from ui/src/app/domain/service/list-values.service.spec.ts
rename to ui/src/app/metadata/domain/service/list-values.service.spec.ts
diff --git a/ui/src/app/domain/service/list-values.service.ts b/ui/src/app/metadata/domain/service/list-values.service.ts
similarity index 100%
rename from ui/src/app/domain/service/list-values.service.ts
rename to ui/src/app/metadata/domain/service/list-values.service.ts
diff --git a/ui/src/app/domain/service/provider-change-emitter.service.spec.ts b/ui/src/app/metadata/domain/service/provider-change-emitter.service.spec.ts
similarity index 96%
rename from ui/src/app/domain/service/provider-change-emitter.service.spec.ts
rename to ui/src/app/metadata/domain/service/provider-change-emitter.service.spec.ts
index f77a10b01..97dba2257 100644
--- a/ui/src/app/domain/service/provider-change-emitter.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/provider-change-emitter.service.spec.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { AbstractControl, FormBuilder, ReactiveFormsModule } from '@angular/forms';
 import { ProviderStatusEmitter, ProviderValueEmitter } from './provider-change-emitter.service';
 
-describe(`Provider Change emitter service`, () => {
+describe(`Resolver Change emitter service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
diff --git a/ui/src/app/domain/service/provider-change-emitter.service.ts b/ui/src/app/metadata/domain/service/provider-change-emitter.service.ts
similarity index 100%
rename from ui/src/app/domain/service/provider-change-emitter.service.ts
rename to ui/src/app/metadata/domain/service/provider-change-emitter.service.ts
diff --git a/ui/src/app/domain/service/metadata-resolver.service.spec.ts b/ui/src/app/metadata/domain/service/provider.service.spec.ts
similarity index 78%
rename from ui/src/app/domain/service/metadata-resolver.service.spec.ts
rename to ui/src/app/metadata/domain/service/provider.service.spec.ts
index 95c9840d5..814c413ac 100644
--- a/ui/src/app/domain/service/metadata-resolver.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.spec.ts
@@ -1,11 +1,10 @@
 import { TestBed, async, inject } from '@angular/core/testing';
 import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
 import { HttpClientModule, HttpRequest } from '@angular/common/http';
-import { MetadataResolverService } from './metadata-resolver.service';
-import { EntityAttributesFilter } from '../entity/entity-attributes.filter';
+import { MetadataProviderService } from './provider.service';
+import { EntityAttributesFilter } from '../entity';
 
-
-describe(`Metadata Resolver Service`, () => {
+describe(`Metadata Provider Service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -14,26 +13,26 @@ describe(`Metadata Resolver Service`, () => {
                 HttpClientTestingModule
             ],
             providers: [
-                MetadataResolverService
+                MetadataProviderService
             ]
         });
     });
 
     describe('query method', () => {
-        it(`should send an expected GET[] request`, async(inject([MetadataResolverService, HttpTestingController],
-            (service: MetadataResolverService, backend: HttpTestingController) => {
+        it(`should send an expected GET[] request`, async(inject([MetadataProviderService, HttpTestingController],
+            (service: MetadataProviderService, backend: HttpTestingController) => {
                 service.query().subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
-                    return req.url === `${service.base}${service.endpoint}s`
+                    return req.url === `${service.base}${service.endpoint}`
                         && req.method === 'GET';
                 }, `GET MetadataResolvers collection`);
             }
         )));
     });
     describe('find method', () => {
-        it(`should send an expected GET request`, async(inject([MetadataResolverService, HttpTestingController],
-            (service: MetadataResolverService, backend: HttpTestingController) => {
+        it(`should send an expected GET request`, async(inject([MetadataProviderService, HttpTestingController],
+            (service: MetadataProviderService, backend: HttpTestingController) => {
                 const id = 'foo';
                 service.find(id).subscribe();
 
@@ -45,8 +44,8 @@ describe(`Metadata Resolver Service`, () => {
         )));
     });
     describe('update method', () => {
-        it(`should send an expected PUT request`, async(inject([MetadataResolverService, HttpTestingController],
-            (service: MetadataResolverService, backend: HttpTestingController) => {
+        it(`should send an expected PUT request`, async(inject([MetadataProviderService, HttpTestingController],
+            (service: MetadataProviderService, backend: HttpTestingController) => {
                 const id = 'foo';
                 const filter = new EntityAttributesFilter({id});
                 service.update(filter).subscribe();
@@ -59,8 +58,8 @@ describe(`Metadata Resolver Service`, () => {
         )));
     });
     describe('save method', () => {
-        it(`should send an expected POST request`, async(inject([MetadataResolverService, HttpTestingController],
-            (service: MetadataResolverService, backend: HttpTestingController) => {
+        it(`should send an expected POST request`, async(inject([MetadataProviderService, HttpTestingController],
+            (service: MetadataProviderService, backend: HttpTestingController) => {
                 const id = 'foo';
                 const filter = new EntityAttributesFilter({ id });
                 service.save(filter).subscribe();
diff --git a/ui/src/app/domain/service/metadata-resolver.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
similarity index 89%
rename from ui/src/app/domain/service/metadata-resolver.service.ts
rename to ui/src/app/metadata/domain/service/provider.service.ts
index db62a0a9d..0644e4ab8 100644
--- a/ui/src/app/domain/service/metadata-resolver.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -1,12 +1,11 @@
-
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 
-import { MetadataFilter } from '../../domain/model/metadata-filter';
+import { MetadataFilter } from '../../domain/model';
 
 @Injectable()
-export class MetadataResolverService {
+export class MetadataProviderService {
 
     readonly endpoint = '/MetadataResolver/incommon/Filters';
     readonly base = '/api';
diff --git a/ui/src/app/domain/service/entity-descriptor.service.spec.ts b/ui/src/app/metadata/domain/service/resolver.service.spec.ts
similarity index 66%
rename from ui/src/app/domain/service/entity-descriptor.service.spec.ts
rename to ui/src/app/metadata/domain/service/resolver.service.spec.ts
index 299733fb6..d4a32cbdc 100644
--- a/ui/src/app/domain/service/entity-descriptor.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/resolver.service.spec.ts
@@ -1,10 +1,10 @@
 import { TestBed, async, inject } from '@angular/core/testing';
-import { HttpClientModule, HttpRequest, HttpParams } from '@angular/common/http';
+import { HttpClientModule, HttpRequest } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { EntityDescriptorService } from './entity-descriptor.service';
+import { ResolverService } from './resolver.service';
 
 
-describe(`EntityDescriptorService`, () => {
+describe(`Resolver Service`, () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -13,7 +13,7 @@ describe(`EntityDescriptorService`, () => {
                 HttpClientTestingModule
             ],
             providers: [
-                EntityDescriptorService
+                ResolverService
             ]
         });
     });
@@ -23,8 +23,8 @@ describe(`EntityDescriptorService`, () => {
     }));
 
     describe('query', () => {
-        it(`should send an expected query request`, async(inject([EntityDescriptorService, HttpTestingController],
-            (service: EntityDescriptorService, backend: HttpTestingController) => {
+        it(`should send an expected query request`, async(inject([ResolverService, HttpTestingController],
+            (service: ResolverService, backend: HttpTestingController) => {
                 service.query().subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
@@ -34,8 +34,8 @@ describe(`EntityDescriptorService`, () => {
             }
         )));
 
-        xit(`should emit an empty array if an error is thrown`, async(inject([EntityDescriptorService, HttpTestingController],
-            (service: EntityDescriptorService, backend: HttpTestingController) => {
+        xit(`should emit an empty array if an error is thrown`, async(inject([ResolverService, HttpTestingController],
+            (service: ResolverService, backend: HttpTestingController) => {
                 service.query().subscribe((next) => {
                     expect(next).toEqual([]);
                 });
@@ -44,8 +44,8 @@ describe(`EntityDescriptorService`, () => {
             }
         )));
 
-        it(`should emit 'true' for 200 Ok`, async(inject([EntityDescriptorService, HttpTestingController],
-            (service: EntityDescriptorService, backend: HttpTestingController) => {
+        it(`should emit 'true' for 200 Ok`, async(inject([ResolverService, HttpTestingController],
+            (service: ResolverService, backend: HttpTestingController) => {
                 service.query().subscribe((next) => {
                     expect(next).toBeTruthy();
                 });
@@ -58,8 +58,8 @@ describe(`EntityDescriptorService`, () => {
     describe('find', () => {
         let id = 'foo';
 
-        it(`should send an expected GET request`, async(inject([EntityDescriptorService, HttpTestingController],
-            (service: EntityDescriptorService, backend: HttpTestingController) => {
+        it(`should send an expected GET request`, async(inject([ResolverService, HttpTestingController],
+            (service: ResolverService, backend: HttpTestingController) => {
                 service.find(id).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
@@ -69,8 +69,8 @@ describe(`EntityDescriptorService`, () => {
             }
         )));
 
-        xit(`should emit an error is thrown`, async(inject([EntityDescriptorService, HttpTestingController],
-            (service: EntityDescriptorService, backend: HttpTestingController) => {
+        xit(`should emit an error is thrown`, async(inject([ResolverService, HttpTestingController],
+            (service: ResolverService, backend: HttpTestingController) => {
                 service.find(id).subscribe((next) => {
                     expect(next).toBeFalsy();
                 });
@@ -79,8 +79,8 @@ describe(`EntityDescriptorService`, () => {
             }
         )));
 
-        xit(`should emit 'true' for 200 Ok`, async(inject([EntityDescriptorService, HttpTestingController],
-            (service: EntityDescriptorService, backend: HttpTestingController) => {
+        xit(`should emit 'true' for 200 Ok`, async(inject([ResolverService, HttpTestingController],
+            (service: ResolverService, backend: HttpTestingController) => {
                 service.find(id).subscribe((next) => {
                     expect(next).toBeTruthy();
                 });
diff --git a/ui/src/app/domain/service/entity-descriptor.service.ts b/ui/src/app/metadata/domain/service/resolver.service.ts
similarity index 55%
rename from ui/src/app/domain/service/entity-descriptor.service.ts
rename to ui/src/app/metadata/domain/service/resolver.service.ts
index 9bc8c88eb..c3486de76 100644
--- a/ui/src/app/domain/service/entity-descriptor.service.ts
+++ b/ui/src/app/metadata/domain/service/resolver.service.ts
@@ -1,18 +1,11 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { MOCK_DESCRIPTORS } from '../../../data/descriptors.mock';
-import { Storage } from '../../shared/storage';
-import { environment } from '../../../environments/environment';
-import { MetadataEntity } from '../domain.type';
-
+import { MetadataResolver } from '../model';
 
 @Injectable()
-export class EntityDescriptorService {
+export class ResolverService {
 
     private endpoint = '/EntityDescriptor';
     private base = '/api';
@@ -21,42 +14,42 @@ export class EntityDescriptorService {
         private http: HttpClient
     ) {}
 
-    query(): Observable<MetadataProvider[]> {
-        return this.http.get<MetadataProvider[]>(`${ this.base }${ this.endpoint }s`, {})
+    query(): Observable<MetadataResolver[]> {
+        return this.http.get<MetadataResolver[]>(`${ this.base }${ this.endpoint }s`, {})
             .pipe(
                 catchError(err => throwError([]))
             );
     }
 
-    find(id: string): Observable<MetadataProvider> {
-        return this.http.get<MetadataProvider>(`${ this.base }${ this.endpoint }/${ id }`)
+    find(id: string): Observable<MetadataResolver> {
+        return this.http.get<MetadataResolver>(`${ this.base }${ this.endpoint }/${ id }`)
             .pipe(
                 catchError(err => throwError(err))
             );
     }
 
-    update(provider: MetadataProvider): Observable<MetadataProvider> {
-        return this.http.put<MetadataProvider>(`${this.base}${this.endpoint}/${provider.id}`, provider);
+    update(provider: MetadataResolver): Observable<MetadataResolver> {
+        return this.http.put<MetadataResolver>(`${this.base}${this.endpoint}/${provider.id}`, provider);
     }
 
-    save(provider: MetadataProvider): Observable<MetadataProvider> {
-        return this.http.post<MetadataProvider>(`${this.base}${this.endpoint}`, provider);
+    save(provider: MetadataResolver): Observable<MetadataResolver> {
+        return this.http.post<MetadataResolver>(`${this.base}${this.endpoint}`, provider);
     }
 
-    remove(provider: MetadataProvider): Observable<MetadataProvider> {
-        return this.http.delete<MetadataProvider>(`${this.base}${this.endpoint}/${provider.id}`);
+    remove(provider: MetadataResolver): Observable<MetadataResolver> {
+        return this.http.delete<MetadataResolver>(`${this.base}${this.endpoint}/${provider.id}`);
     }
 
-    upload(name: string, xml: string): Observable<MetadataProvider> {
-        return this.http.post<MetadataProvider>(`${this.base}${this.endpoint}`, xml, {
+    upload(name: string, xml: string): Observable<MetadataResolver> {
+        return this.http.post<MetadataResolver>(`${this.base}${this.endpoint}`, xml, {
             headers: new HttpHeaders().set('Content-Type', 'application/xml'),
             params: new HttpParams().set('spName', name)
         });
     }
 
-    createFromUrl(name: string, url: string): Observable<MetadataProvider> {
+    createFromUrl(name: string, url: string): Observable<MetadataResolver> {
         let body = `metadataUrl=${url}`;
-        return this.http.post<MetadataProvider>(`${this.base}${this.endpoint}`, body, {
+        return this.http.post<MetadataResolver>(`${this.base}${this.endpoint}`, body, {
             headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'),
             params: new HttpParams().set('spName', name)
         });
diff --git a/ui/src/app/domain/action/filter-collection.action.ts b/ui/src/app/metadata/filter/action/collection.action.ts
similarity index 100%
rename from ui/src/app/domain/action/filter-collection.action.ts
rename to ui/src/app/metadata/filter/action/collection.action.ts
diff --git a/ui/src/app/metadata/filter/action/filter.action.spec.ts b/ui/src/app/metadata/filter/action/filter.action.spec.ts
new file mode 100644
index 000000000..db844107e
--- /dev/null
+++ b/ui/src/app/metadata/filter/action/filter.action.spec.ts
@@ -0,0 +1,8 @@
+import { FilterActionTypes, CancelCreateFilter, SelectId } from './filter.action';
+
+describe('Filter Actions', () => {
+    it('should provide actions', () => {
+        expect(new CancelCreateFilter().type).toBe(FilterActionTypes.CANCEL_CREATE_FILTER);
+        expect(new SelectId('foo').type).toBe(FilterActionTypes.SELECT_ID);
+    });
+});
diff --git a/ui/src/app/metadata-filter/action/filter.action.ts b/ui/src/app/metadata/filter/action/filter.action.ts
similarity index 50%
rename from ui/src/app/metadata-filter/action/filter.action.ts
rename to ui/src/app/metadata/filter/action/filter.action.ts
index af0f6f4c0..ad9ef8d28 100644
--- a/ui/src/app/metadata-filter/action/filter.action.ts
+++ b/ui/src/app/metadata/filter/action/filter.action.ts
@@ -1,51 +1,49 @@
 import { Action } from '@ngrx/store';
-
-import { QueryParams } from '../../core/model/query';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
-import { MDUI } from '../../domain/model/mdui';
-
-export const SELECT_ID = '[Filter] Select Entity ID';
-
-export const UPDATE_FILTER = '[Filter] Update Filter';
-export const CANCEL_CREATE_FILTER = '[Filter] Cancel Create Filter';
-
-export const LOAD_ENTITY_PREVIEW = '[Filter] Load Preview data';
-export const LOAD_ENTITY_PREVIEW_SUCCESS = '[Filter] Load Preview data success';
-export const LOAD_ENTITY_PREVIEW_ERROR = '[Filter] Load Preview data error';
+import { MDUI } from '../../domain/model';
+
+export enum FilterActionTypes {
+    SELECT_ID = '[Filter] Select Entity ID',
+    UPDATE_FILTER = '[Filter] Update Filter',
+    CANCEL_CREATE_FILTER = '[Filter] Cancel Create Filter',
+    LOAD_ENTITY_PREVIEW = '[Filter] Load Preview data',
+    LOAD_ENTITY_PREVIEW_SUCCESS = '[Filter] Load Preview data success',
+    LOAD_ENTITY_PREVIEW_ERROR = '[Filter] Load Preview data error'
+}
 
 export class SelectId implements Action {
-    readonly type = SELECT_ID;
+    readonly type = FilterActionTypes.SELECT_ID;
 
     constructor(public payload: string) { }
 }
 
 export class LoadEntityPreview implements Action {
-    readonly type = LOAD_ENTITY_PREVIEW;
+    readonly type = FilterActionTypes.LOAD_ENTITY_PREVIEW;
 
     constructor(public payload: string) { }
 }
 export class LoadEntityPreviewSuccess implements Action {
-    readonly type = LOAD_ENTITY_PREVIEW_SUCCESS;
+    readonly type = FilterActionTypes.LOAD_ENTITY_PREVIEW_SUCCESS;
 
     constructor(public payload: MDUI) { }
 }
 export class LoadEntityPreviewError implements Action {
-    readonly type = LOAD_ENTITY_PREVIEW_ERROR;
+    readonly type = FilterActionTypes.LOAD_ENTITY_PREVIEW_ERROR;
 
     constructor(public payload: string) { }
 }
 
 export class CancelCreateFilter implements Action {
-    readonly type = CANCEL_CREATE_FILTER;
+    readonly type = FilterActionTypes.CANCEL_CREATE_FILTER;
 }
 
 export class UpdateFilterChanges implements Action {
-    readonly type = UPDATE_FILTER;
+    readonly type = FilterActionTypes.UPDATE_FILTER;
 
     constructor(public payload: Partial<MetadataFilter>) { }
 }
 
-export type Actions =
+export type FilterActionsUnion =
     | SelectId
     | UpdateFilterChanges
     | CancelCreateFilter
diff --git a/ui/src/app/metadata-filter/action/search.action.spec.ts b/ui/src/app/metadata/filter/action/search.action.spec.ts
similarity index 100%
rename from ui/src/app/metadata-filter/action/search.action.spec.ts
rename to ui/src/app/metadata/filter/action/search.action.spec.ts
diff --git a/ui/src/app/metadata/filter/action/search.action.ts b/ui/src/app/metadata/filter/action/search.action.ts
new file mode 100644
index 000000000..cd9638a54
--- /dev/null
+++ b/ui/src/app/metadata/filter/action/search.action.ts
@@ -0,0 +1,52 @@
+import { Action } from '@ngrx/store';
+
+import { QueryParams } from '../../../core/model/query';
+
+export enum SearchActionTypes {
+    QUERY_ENTITY_IDS = '[Filter] Query Entity Ids',
+    VIEW_MORE_IDS = '[Filter] View More Ids Modal',
+    CANCEL_VIEW_MORE = '[Filter] Cancel View More',
+    CLEAR_SEARCH = '[Filter] Clear Search',
+    LOAD_ENTITY_IDS_SUCCESS = '[Entity ID Collection] Load Entity Ids Success',
+    LOAD_ENTITY_IDS_ERROR = '[Entity ID Collection] Load Entity Ids Error'
+}
+
+export class QueryEntityIds implements Action {
+    readonly type = SearchActionTypes.QUERY_ENTITY_IDS;
+
+    constructor(public payload: QueryParams) { }
+}
+
+export class ViewMoreIds implements Action {
+    readonly type = SearchActionTypes.VIEW_MORE_IDS;
+
+    constructor(public payload: string) { }
+}
+
+export class ClearSearch implements Action {
+    readonly type = SearchActionTypes.CLEAR_SEARCH;
+}
+
+export class CancelViewMore implements Action {
+    readonly type = SearchActionTypes.CANCEL_VIEW_MORE;
+}
+
+export class LoadEntityIdsSuccess implements Action {
+    readonly type = SearchActionTypes.LOAD_ENTITY_IDS_SUCCESS;
+
+    constructor(public payload: string[]) { }
+}
+
+export class LoadEntityIdsError implements Action {
+    readonly type = SearchActionTypes.LOAD_ENTITY_IDS_ERROR;
+
+    constructor(public payload: Error) { }
+}
+
+export type SearchActionsUnion =
+    | ViewMoreIds
+    | CancelViewMore
+    | ClearSearch
+    | LoadEntityIdsSuccess
+    | LoadEntityIdsError
+    | QueryEntityIds;
diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.html b/ui/src/app/metadata/filter/component/search-dialog.component.html
similarity index 100%
rename from ui/src/app/metadata-filter/component/search-dialog.component.html
rename to ui/src/app/metadata/filter/component/search-dialog.component.html
diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.scss b/ui/src/app/metadata/filter/component/search-dialog.component.scss
similarity index 100%
rename from ui/src/app/metadata-filter/component/search-dialog.component.scss
rename to ui/src/app/metadata/filter/component/search-dialog.component.scss
diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.spec.ts b/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts
similarity index 82%
rename from ui/src/app/metadata-filter/component/search-dialog.component.spec.ts
rename to ui/src/app/metadata/filter/component/search-dialog.component.spec.ts
index aa86d0289..82144a232 100644
--- a/ui/src/app/metadata-filter/component/search-dialog.component.spec.ts
+++ b/ui/src/app/metadata/filter/component/search-dialog.component.spec.ts
@@ -1,11 +1,11 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { ReactiveFormsModule, FormBuilder } from '@angular/forms';
-import { NgbModalModule, NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ReactiveFormsModule } from '@angular/forms';
+import { NgbModalModule, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { SearchDialogComponent } from './search-dialog.component';
-import { NgbActiveModalStub } from '../../../testing/modal.stub';
+import { NgbActiveModalStub } from '../../../../testing/modal.stub';
 import * as fromFilter from '../reducer';
-import { SharedModule } from '../../shared/shared.module';
+import { SharedModule } from '../../../shared/shared.module';
 
 describe('Search Dialog', () => {
     let fixture: ComponentFixture<SearchDialogComponent>;
@@ -21,7 +21,7 @@ describe('Search Dialog', () => {
                 ReactiveFormsModule,
                 NgbModalModule,
                 StoreModule.forRoot({
-                    'metadata-filter': combineReducers(fromFilter.reducers),
+                    'filter': combineReducers(fromFilter.reducers),
                 }),
                 SharedModule
             ],
diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.ts b/ui/src/app/metadata/filter/component/search-dialog.component.ts
similarity index 95%
rename from ui/src/app/metadata-filter/component/search-dialog.component.ts
rename to ui/src/app/metadata/filter/component/search-dialog.component.ts
index 41f75be8b..545684077 100644
--- a/ui/src/app/metadata-filter/component/search-dialog.component.ts
+++ b/ui/src/app/metadata/filter/component/search-dialog.component.ts
@@ -1,5 +1,5 @@
 import { Component, AfterViewInit, Input, OnInit, SimpleChange, SimpleChanges } from '@angular/core';
-import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs';
 
 import { Store } from '@ngrx/store';
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
similarity index 98%
rename from ui/src/app/metadata-filter/container/edit-filter.component.html
rename to ui/src/app/metadata/filter/container/edit-filter.component.html
index fb26a3a62..2a2267d26 100644
--- a/ui/src/app/metadata-filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -171,10 +171,10 @@
                     </div>
                     <div class="row" *ngIf="filter$ | async">
                         <div class="col-lg-6">
-                            <relying-party-form [provider]="filter$ | async"></relying-party-form>
+                            <relying-party-form [resolver]="filter$ | async"></relying-party-form>
                         </div>
                         <div class="col-lg-6">
-                            <attribute-release-form [provider]="filter$ | async"></attribute-release-form>
+                            <attribute-release-form [resolver]="filter$ | async"></attribute-release-form>
                         </div>
                     </div>
                 </section>
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.spec.ts b/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts
similarity index 100%
rename from ui/src/app/metadata-filter/container/edit-filter.component.spec.ts
rename to ui/src/app/metadata/filter/container/edit-filter.component.spec.ts
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.ts b/ui/src/app/metadata/filter/container/edit-filter.component.ts
similarity index 91%
rename from ui/src/app/metadata-filter/container/edit-filter.component.ts
rename to ui/src/app/metadata/filter/container/edit-filter.component.ts
index b1581c8a4..41d10a3e9 100644
--- a/ui/src/app/metadata-filter/container/edit-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.ts
@@ -4,21 +4,20 @@ import { Store } from '@ngrx/store';
 import { Observable, Subject } from 'rxjs';
 import { withLatestFrom, distinctUntilChanged, takeUntil, startWith, filter } from 'rxjs/operators';
 
-import * as fromRoot from '../../app.reducer';
+import * as fromRoot from '../../../app.reducer';
 import * as fromFilter from '../reducer';
-import * as fromCollection from '../../domain/reducer';
 
 import { ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
-import { UpdateFilterRequest } from '../../domain/action/filter-collection.action';
+import { UpdateFilterRequest } from '../../filter/action/collection.action';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { QueryEntityIds, ViewMoreIds, ClearSearch } from '../action/search.action';
-import { AutoCompleteComponent } from '../../shared/autocomplete/autocomplete.component';
-import { MDUI } from '../../domain/model/mdui';
+import { AutoCompleteComponent } from '../../../shared/autocomplete/autocomplete.component';
+import { MDUI } from '../../domain/model';
 import { PreviewEntity } from '../../domain/action/entity.action';
-import { MetadataEntity } from '../../domain/domain.type';
-import { EntityAttributesFilter } from '../../domain/entity/entity-attributes.filter';
+import { MetadataEntity } from '../../domain/model';
+import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
 
 @Component({
     selector: 'edit-filter-page',
@@ -73,7 +72,7 @@ export class EditFilterComponent implements OnInit, OnDestroy {
 
         this.showMore$ = this.store.select(fromFilter.getViewingMore);
         this.selected$ = this.store.select(fromFilter.getSelected);
-        this.filter$ = this.store.select(fromCollection.getSelectedFilter);
+        this.filter$ = this.store.select(fromFilter.getSelectedFilter);
         this.entityIds$ = this.store.select(fromFilter.getEntityCollection);
         this.loading$ = this.store.select(fromFilter.getIsLoading);
         this.processing$ = this.loading$.pipe(withLatestFrom(this.showMore$, (l, s) => !s && l));
diff --git a/ui/src/app/metadata-filter/container/filter.component.html b/ui/src/app/metadata/filter/container/filter.component.html
similarity index 100%
rename from ui/src/app/metadata-filter/container/filter.component.html
rename to ui/src/app/metadata/filter/container/filter.component.html
diff --git a/ui/src/app/metadata-filter/container/filter.component.scss b/ui/src/app/metadata/filter/container/filter.component.scss
similarity index 100%
rename from ui/src/app/metadata-filter/container/filter.component.scss
rename to ui/src/app/metadata/filter/container/filter.component.scss
diff --git a/ui/src/app/metadata-filter/container/filter.component.spec.ts b/ui/src/app/metadata/filter/container/filter.component.spec.ts
similarity index 100%
rename from ui/src/app/metadata-filter/container/filter.component.spec.ts
rename to ui/src/app/metadata/filter/container/filter.component.spec.ts
diff --git a/ui/src/app/metadata-filter/container/filter.component.ts b/ui/src/app/metadata/filter/container/filter.component.ts
similarity index 78%
rename from ui/src/app/metadata-filter/container/filter.component.ts
rename to ui/src/app/metadata/filter/container/filter.component.ts
index b7d139423..2f2d0aa44 100644
--- a/ui/src/app/metadata-filter/container/filter.component.ts
+++ b/ui/src/app/metadata/filter/container/filter.component.ts
@@ -6,9 +6,8 @@ import { Store } from '@ngrx/store';
 import { NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
 
 import { MetadataFilter } from '../../domain/model/metadata-filter';
-import { SelectFilter } from '../../domain/action/filter-collection.action';
-import * as fromFilters from '../reducer';
-import * as fromCollection from '../../domain/reducer';
+import { SelectFilter } from '../action/collection.action';
+import * as fromFilter from '../reducer';
 
 
 @Component({
@@ -22,7 +21,7 @@ export class FilterComponent implements OnDestroy {
     filter$: Observable<MetadataFilter>;
 
     constructor(
-        private store: Store<fromFilters.State>,
+        private store: Store<fromFilter.State>,
         private route: ActivatedRoute
     ) {
         this.actionsSubscription = this.route.params.pipe(
@@ -32,7 +31,7 @@ export class FilterComponent implements OnDestroy {
             })
         ).subscribe(store);
 
-        this.filter$ = this.store.select(fromCollection.getSelectedFilter);
+        this.filter$ = this.store.select(fromFilter.getSelectedFilter);
     }
 
     ngOnDestroy() {
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
similarity index 98%
rename from ui/src/app/metadata-filter/container/new-filter.component.html
rename to ui/src/app/metadata/filter/container/new-filter.component.html
index 55889cee7..0985f9764 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -137,10 +137,10 @@
                     </div>
                     <div class="row">
                         <div class="col-lg-6">
-                            <relying-party-form [provider]="filter"></relying-party-form>
+                            <relying-party-form [resolver]="filter"></relying-party-form>
                         </div>
                         <div class="col-lg-6">
-                            <attribute-release-form [provider]="filter"></attribute-release-form>
+                            <attribute-release-form [resolver]="filter"></attribute-release-form>
                         </div>
                     </div>
                 </section>
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
similarity index 81%
rename from ui/src/app/metadata-filter/container/new-filter.component.spec.ts
rename to ui/src/app/metadata/filter/container/new-filter.component.spec.ts
index 5872424fc..e954c1cbf 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
@@ -3,11 +3,11 @@ import { ReactiveFormsModule, FormBuilder } from '@angular/forms';
 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 { ProviderEditorFormModule } from '../../domain/component';
 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';
+import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
+import { NavigatorService } from '../../../core/service/navigator.service';
+import { SharedModule } from '../../../shared/shared.module';
 
 describe('New Metadata Filter Page', () => {
     let fixture: ComponentFixture<NewFilterComponent>;
@@ -25,7 +25,7 @@ describe('New Metadata Filter Page', () => {
             ],
             imports: [
                 StoreModule.forRoot({
-                    'metadata-filter': combineReducers(fromFilter.reducers),
+                    'filter': combineReducers(fromFilter.reducers),
                 }),
                 ReactiveFormsModule,
                 ProviderEditorFormModule,
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata/filter/container/new-filter.component.ts
similarity index 95%
rename from ui/src/app/metadata-filter/container/new-filter.component.ts
rename to ui/src/app/metadata/filter/container/new-filter.component.ts
index f56245dd7..840d2d9a4 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/new-filter.component.ts
@@ -7,12 +7,12 @@ import { withLatestFrom, distinctUntilChanged, startWith, takeUntil } from 'rxjs
 import * as fromFilter from '../reducer';
 import { ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
-import { AddFilterRequest } from '../../domain/action/filter-collection.action';
+import { AddFilterRequest } from '../action/collection.action';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { QueryEntityIds, ViewMoreIds, ClearSearch } from '../action/search.action';
-import { MDUI } from '../../domain/model/mdui';
-import { EntityAttributesFilter } from '../../domain/entity/entity-attributes.filter';
+import { MDUI } from '../../domain/model';
+import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
 
 @Component({
     selector: 'new-filter-page',
diff --git a/ui/src/app/domain/effect/filter-collection.effect.spec.ts b/ui/src/app/metadata/filter/effect/collection.effect.spec.ts
similarity index 59%
rename from ui/src/app/domain/effect/filter-collection.effect.spec.ts
rename to ui/src/app/metadata/filter/effect/collection.effect.spec.ts
index 178dfa650..d89c931ad 100644
--- a/ui/src/app/domain/effect/filter-collection.effect.spec.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.spec.ts
@@ -1,14 +1,12 @@
-import { TestBed, tick, fakeAsync } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { Actions } from '@ngrx/effects';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { empty, Observable, of } from 'rxjs';
 
-import { TestActions, getActions } from '../../../testing/effect.util';
-import { MetadataFilter } from '../domain.type';
-import { FilterCollectionEffects } from './filter-collection.effect';
-import { MetadataResolverService } from '../service/metadata-resolver.service';
+import { TestActions, getActions } from '../../../../testing/effect.util';
+import { MetadataFilter } from '../../domain/model';
+import { FilterCollectionEffects } from './collection.effect';
+import { MetadataProviderService } from '../../domain/service/provider.service';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { RouterStub } from '../../../../testing/router.stub';
 
 describe('Filter Collection Effects', () => {
     let effects: FilterCollectionEffects;
@@ -20,7 +18,7 @@ describe('Filter Collection Effects', () => {
             providers: [
                 FilterCollectionEffects,
                 {
-                    provide: MetadataResolverService,
+                    provide: MetadataProviderService,
                     useValue: {
                         query: () => { },
                         find: (id: string) => { },
@@ -34,7 +32,7 @@ describe('Filter Collection Effects', () => {
         });
 
         effects = TestBed.get(FilterCollectionEffects);
-        draftService = TestBed.get(MetadataResolverService);
+        draftService = TestBed.get(MetadataProviderService);
         actions$ = TestBed.get(Actions);
     });
 });
diff --git a/ui/src/app/domain/effect/filter-collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
similarity index 89%
rename from ui/src/app/domain/effect/filter-collection.effect.ts
rename to ui/src/app/metadata/filter/effect/collection.effect.ts
index f9b5d8589..da2a08a84 100644
--- a/ui/src/app/domain/effect/filter-collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -6,14 +6,14 @@ import { Router } from '@angular/router';
 import { of } from 'rxjs';
 import { switchMap, map, catchError, tap } from 'rxjs/operators';
 
-import * as actions from '../action/filter-collection.action';
-import { FilterCollectionActionTypes } from '../action/filter-collection.action';
+import * as actions from '../action/collection.action';
+import { FilterCollectionActionTypes } from '../action/collection.action';
 import * as fromFilter from '../reducer';
 
-import { MetadataResolverService } from '../service/metadata-resolver.service';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
-import { removeNulls } from '../../shared/util';
-import { EntityAttributesFilter } from '../entity/entity-attributes.filter';
+import { MetadataProviderService } from '../../domain/service/provider.service';
+import { MetadataFilter } from '../../domain/model';
+import { removeNulls } from '../../../shared/util';
+import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
 
 /* istanbul ignore next */
 @Injectable()
@@ -113,7 +113,7 @@ export class FilterCollectionEffects {
     constructor(
         private actions$: Actions,
         private router: Router,
-        private resolverService: MetadataResolverService,
+        private resolverService: MetadataProviderService,
         private store: Store<fromFilter.State>
     ) { }
 }
diff --git a/ui/src/app/metadata/filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts
new file mode 100644
index 000000000..87b5a7f1c
--- /dev/null
+++ b/ui/src/app/metadata/filter/effect/filter.effect.ts
@@ -0,0 +1,82 @@
+import { Injectable } from '@angular/core';
+import { Effect, Actions, ofType } from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { of } from 'rxjs';
+import { map, switchMap, catchError, withLatestFrom, tap } from 'rxjs/operators';
+
+import { Router } from '@angular/router';
+
+import * as fromFilter from '../reducer';
+import * as fromRoot from '../../../app.reducer';
+import {
+    FilterCollectionActionTypes,
+    UpdateFilterFail,
+    UpdateFilterRequest,
+    AddFilterSuccess,
+    LoadFilterRequest
+} from '../action/collection.action';
+import {
+    SelectId,
+    FilterActionTypes,
+    LoadEntityPreviewSuccess,
+    LoadEntityPreviewError,
+    CancelCreateFilter
+} from '../action/filter.action';
+import { EntityIdService } from '../../domain/service/entity-id.service';
+import { MetadataProviderService } from '../../domain/service/provider.service';
+import { ShowContentionAction } from '../../../contention/action/contention.action';
+import { MetadataFilter } from '../../domain/model';
+import { ContentionService } from '../../../contention/service/contention.service';
+
+@Injectable()
+export class FilterEffects {
+
+    @Effect()
+    loadEntityMdui$ = this.actions$.pipe(
+        ofType<SelectId>(FilterActionTypes.SELECT_ID),
+        map(action => action.payload),
+        switchMap(query =>
+            this.idService.findEntityById(query).pipe(
+                map(data => new LoadEntityPreviewSuccess(data)),
+                catchError(error => of(new LoadEntityPreviewError(error)))
+            )
+        )
+    );
+
+    @Effect()
+    openContention$ = this.actions$.pipe(
+        ofType<UpdateFilterFail>(FilterCollectionActionTypes.UPDATE_FILTER_FAIL),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromFilter.getSelectedFilter)),
+        switchMap(([filter, current]) =>
+            this.resolverService.find(filter.id).pipe(
+                map(data => new ShowContentionAction(this.contentionService.getContention(current, filter, data, {
+                    resolve: (obj) => this.store.dispatch(new UpdateFilterRequest(<MetadataFilter>{ ...obj })),
+                    reject: (obj) => this.store.dispatch(new CancelCreateFilter())
+                })))
+            )
+        )
+    );
+
+    @Effect({ dispatch: false })
+    saveFilterSuccess$ = this.actions$.pipe(
+        ofType<AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
+        switchMap(() => this.router.navigate(['/dashboard']))
+    );
+
+    @Effect()
+    cancelChanges$ = this.actions$.pipe(
+        ofType<CancelCreateFilter>(FilterActionTypes.CANCEL_CREATE_FILTER),
+        map(() => new LoadFilterRequest()),
+        tap(() => this.router.navigate(['/dashboard']))
+    );
+
+    constructor(
+        private store: Store<fromRoot.State>,
+        private actions$: Actions,
+        private router: Router,
+        private idService: EntityIdService,
+        private resolverService: MetadataProviderService,
+        private contentionService: ContentionService
+    ) { }
+}
diff --git a/ui/src/app/metadata-filter/effect/search.effect.ts b/ui/src/app/metadata/filter/effect/search.effect.ts
similarity index 74%
rename from ui/src/app/metadata-filter/effect/search.effect.ts
rename to ui/src/app/metadata/filter/effect/search.effect.ts
index ef03c30d9..7642728e5 100644
--- a/ui/src/app/metadata-filter/effect/search.effect.ts
+++ b/ui/src/app/metadata/filter/effect/search.effect.ts
@@ -5,7 +5,14 @@ import { of } from 'rxjs';
 import { catchError, map, debounceTime, switchMap } from 'rxjs/operators';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
-import * as search from '../action/search.action';
+import {
+    SearchActionTypes,
+    QueryEntityIds,
+    LoadEntityIdsError,
+    LoadEntityIdsSuccess,
+    ViewMoreIds,
+    CancelViewMore
+} from '../action/search.action';
 
 import { SearchDialogComponent } from '../component/search-dialog.component';
 import { EntityIdService } from '../../domain/service/entity-id.service';
@@ -19,20 +26,20 @@ export class SearchIdEffects {
     private dbounce = 500;
     @Effect()
     loadEntityIds$ = this.actions$.pipe(
-        ofType<search.QueryEntityIds>(search.QUERY_ENTITY_IDS),
+        ofType<QueryEntityIds>(SearchActionTypes.QUERY_ENTITY_IDS),
         map(action => action.payload),
         debounceTime(this.dbounce),
         switchMap(query =>
             this.idService.query(query).pipe(
-                map(ids => new search.LoadEntityIdsSuccess(ids)),
-                catchError(error => of(new search.LoadEntityIdsError(error)))
+                map(ids => new LoadEntityIdsSuccess(ids)),
+                catchError(error => of(new LoadEntityIdsError(error)))
             )
         )
     );
 
     @Effect()
     viewMore$ = this.actions$.pipe(
-        ofType<search.ViewMoreIds>(search.VIEW_MORE_IDS),
+        ofType<ViewMoreIds>(SearchActionTypes.VIEW_MORE_IDS),
         map(action => action.payload),
         switchMap(q => {
             const modal = this.modalService.open(SearchDialogComponent) as NgbModalRef;
@@ -40,7 +47,7 @@ export class SearchIdEffects {
             modal.componentInstance.term = q;
             return fromPromise(res).pipe(
                 map(id => new SelectId(id)),
-                catchError(() => of(new search.CancelViewMore()))
+                catchError(() => of(new CancelViewMore()))
             );
         })
     );
diff --git a/ui/src/app/metadata-filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts
similarity index 70%
rename from ui/src/app/metadata-filter/filter.module.ts
rename to ui/src/app/metadata/filter/filter.module.ts
index 61bf73a8a..22a7ed992 100644
--- a/ui/src/app/metadata-filter/filter.module.ts
+++ b/ui/src/app/metadata/filter/filter.module.ts
@@ -8,17 +8,17 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { NewFilterComponent } from './container/new-filter.component';
 import { reducers } from './reducer';
-import { ProviderFormFragmentComponent } from '../metadata-provider/component/forms/provider-form-fragment.component';
-import { ProviderEditorFormModule } from '../metadata-provider/component';
+import { ProviderEditorFormModule } from '../domain/component';
 import { FilterEffects } from './effect/filter.effect';
 import { NgbPopoverModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SearchDialogComponent } from './component/search-dialog.component';
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { EditFilterComponent } from './container/edit-filter.component';
 import { FilterComponent } from './container/filter.component';
 import { SearchIdEffects } from './effect/search.effect';
-import { FilterExistsGuard } from '../domain/guard/filter-exists.guard';
-import { PreviewDialogModule } from '../shared/preview/preview-dialog.module';
+import { FilterExistsGuard } from './guard/filter-exists.guard';
+import { DomainModule } from '../domain/domain.module';
+import { ModuleWithProviders } from '@angular/compiler/src/core';
 
 
 export const routes: Routes = [
@@ -52,20 +52,34 @@ export const routes: Routes = [
         SearchDialogComponent
     ],
     imports: [
-        RouterModule.forChild(routes),
-        StoreModule.forFeature('metadata-filter', reducers),
-        EffectsModule.forFeature([FilterEffects, SearchIdEffects]),
         CommonModule,
         ReactiveFormsModule,
         ProviderEditorFormModule,
         NgbPopoverModule,
         NgbModalModule,
         SharedModule,
-        PreviewDialogModule,
-        HttpClientModule
-    ],
-    providers: [
-        FilterExistsGuard
+        DomainModule,
+        HttpClientModule,
+        RouterModule
     ]
 })
-export class FilterModule { }
+export class FilterModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: RootFilterModule,
+            providers: [
+                FilterExistsGuard
+            ]
+        };
+    }
+}
+
+@NgModule({
+    imports: [
+        FilterModule,
+        RouterModule.forChild(routes),
+        StoreModule.forFeature('filter', reducers),
+        EffectsModule.forFeature([FilterEffects, SearchIdEffects]),
+    ],
+})
+export class RootFilterModule { }
diff --git a/ui/src/app/domain/guard/filter-exists.guard.ts b/ui/src/app/metadata/filter/guard/filter-exists.guard.ts
similarity index 90%
rename from ui/src/app/domain/guard/filter-exists.guard.ts
rename to ui/src/app/metadata/filter/guard/filter-exists.guard.ts
index a7ac24414..048e5ae9f 100644
--- a/ui/src/app/domain/guard/filter-exists.guard.ts
+++ b/ui/src/app/metadata/filter/guard/filter-exists.guard.ts
@@ -4,9 +4,8 @@ import { select, Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
 
-import * as FilterActions from '../action/filter-collection.action';
 import * as fromCollection from '../reducer';
-import { MetadataResolverService } from '../service/metadata-resolver.service';
+import { MetadataProviderService } from '../../domain/service/provider.service';
 
 /**
  * Guards are hooks into the route resolution process, providing an opportunity
@@ -17,7 +16,7 @@ import { MetadataResolverService } from '../service/metadata-resolver.service';
 export class FilterExistsGuard implements CanActivate {
     constructor(
         private store: Store<fromCollection.State>,
-        private mdResolverService: MetadataResolverService,
+        private mdResolverService: MetadataProviderService,
         private router: Router
     ) { }
 
diff --git a/ui/src/app/domain/reducer/filter-collection.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
similarity index 85%
rename from ui/src/app/domain/reducer/filter-collection.reducer.spec.ts
rename to ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
index 7ecfd7314..0a5d9f74f 100644
--- a/ui/src/app/domain/reducer/filter-collection.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
@@ -1,14 +1,14 @@
-import { reducer } from './filter-collection.reducer';
-import * as fromFilter from './filter-collection.reducer';
+import { reducer } from './collection.reducer';
+import * as fromFilter from './collection.reducer';
 import {
     FilterCollectionActionTypes,
     LoadFilterSuccess,
     UpdateFilterSuccess,
     SelectFilter
-} from '../action/filter-collection.action';
-import { EntityAttributesFilter } from '../entity/entity-attributes.filter';
+} from '../action/collection.action';
+import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
 
-const snapshot: fromFilter.FilterCollectionState = {
+const snapshot: fromFilter.CollectionState = {
     ids: [],
     entities: {},
     selectedFilterId: null,
@@ -24,7 +24,7 @@ describe('Filter Reducer', () => {
         });
     });
 
-    describe(`${FilterCollectionActionTypes.SELECT}`, () => {
+    describe(`${FilterCollectionActionTypes.SELECT_FILTER}`, () => {
         it('should set the selected id in the store', () => {
             const selectedFilterId = 'foo';
             const action = new SelectFilter(selectedFilterId);
diff --git a/ui/src/app/domain/reducer/filter-collection.reducer.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
similarity index 69%
rename from ui/src/app/domain/reducer/filter-collection.reducer.ts
rename to ui/src/app/metadata/filter/reducer/collection.reducer.ts
index f665a6c50..2eeff6ff1 100644
--- a/ui/src/app/domain/reducer/filter-collection.reducer.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
@@ -1,9 +1,8 @@
-import { EntityState, EntityAdapter, createEntityAdapter, Update } from '@ngrx/entity';
-import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../action/filter-collection.action';
-import { MetadataFilter } from '../domain.type';
-import { UpdateChanges } from '../../edit-provider/action/editor.action';
+import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
+import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../action/collection.action';
+import { MetadataFilter } from '../../domain/model';
 
-export interface FilterCollectionState extends EntityState<MetadataFilter> {
+export interface CollectionState extends EntityState<MetadataFilter> {
     selectedFilterId: string | null;
     loaded: boolean;
 }
@@ -17,12 +16,12 @@ export const adapter: EntityAdapter<MetadataFilter> = createEntityAdapter<Metada
     selectId: (model: MetadataFilter) => model.resourceId
 });
 
-export const initialState: FilterCollectionState = adapter.getInitialState({
+export const initialState: CollectionState = adapter.getInitialState({
     selectedFilterId: null,
     loaded: false
 });
 
-export function reducer(state = initialState, action: FilterCollectionActionsUnion): FilterCollectionState {
+export function reducer(state = initialState, action: FilterCollectionActionsUnion): CollectionState {
     switch (action.type) {
         case FilterCollectionActionTypes.LOAD_FILTER_SUCCESS: {
             let s = adapter.addAll(action.payload, {
@@ -50,8 +49,8 @@ export function reducer(state = initialState, action: FilterCollectionActionsUni
     }
 }
 
-export const getSelectedFilterId = (state: FilterCollectionState) => state.selectedFilterId;
-export const getIsLoaded = (state: FilterCollectionState) => state.loaded;
+export const getSelectedFilterId = (state: CollectionState) => state.selectedFilterId;
+export const getIsLoaded = (state: CollectionState) => state.loaded;
 export const {
     selectIds: selectFilterIds,
     selectEntities: selectFilterEntities,
diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
similarity index 76%
rename from ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts
rename to ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
index 8dd49f54f..f4f4cbe82 100644
--- a/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
@@ -1,8 +1,7 @@
 import { reducer } from './filter.reducer';
 import * as fromFilter from './filter.reducer';
-import * as actions from '../action/filter.action';
-import * as searchActions from '../action/search.action';
-import { CancelCreateFilter } from '../action/filter.action';
+import { SelectId, LoadEntityPreviewSuccess, UpdateFilterChanges, FilterActionTypes, CancelCreateFilter } from '../action/filter.action';
+import { SearchActionTypes } from '../action/search.action';
 
 import {
     ClearSearch
@@ -14,10 +13,11 @@ import {
     UpdateFilterRequest,
     AddFilterSuccess,
     UpdateFilterSuccess
-} from '../../domain/action/filter-collection.action';
-import { MDUI } from '../../domain/model/mdui';
-import { MetadataFilter } from '../../domain/domain.type';
-import { EntityAttributesFilter } from '../../domain/entity/entity-attributes.filter';
+} from '../action/collection.action';
+import { MDUI } from '../../domain/model';
+import { MetadataFilter } from '../../domain/model';
+import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+
 
 const snapshot: fromFilter.FilterState = {
     selected: null,
@@ -45,27 +45,27 @@ describe('Filter Reducer', () => {
         });
     });
 
-    describe(`${actions.SELECT_ID} action`, () => {
+    describe(`${FilterActionTypes.SELECT_ID} action`, () => {
         it('should set selected property to the provided payload', () => {
             const id = 'foo';
-            const result = reducer(snapshot, new actions.SelectId(id));
+            const result = reducer(snapshot, new SelectId(id));
             expect(result.selected).toBe(id);
         });
     });
 
-    describe(`${actions.LOAD_ENTITY_PREVIEW_SUCCESS} action`, () => {
+    describe(`${FilterActionTypes.LOAD_ENTITY_PREVIEW_SUCCESS} action`, () => {
         it('should set preview property to the provided payload', () => {
             let sampleMdui = { ...mdui };
-            const result = reducer(snapshot, new actions.LoadEntityPreviewSuccess(sampleMdui));
+            const result = reducer(snapshot, new LoadEntityPreviewSuccess(sampleMdui));
             expect(result.preview).toEqual(sampleMdui);
         });
     });
 
-    describe(`${actions.UPDATE_FILTER} action`, () => {
+    describe(`${FilterActionTypes.UPDATE_FILTER} action`, () => {
         it('should update the state of changes', () => {
             const changes = { filterEnabled: false };
             const current = { ...snapshot, changes: { filterEnabled: true } as MetadataFilter };
-            const result = reducer(current, new actions.UpdateFilterChanges(changes));
+            const result = reducer(current, new UpdateFilterChanges(changes));
             expect(result.changes.filterEnabled).toBe(false);
         });
     });
@@ -96,13 +96,13 @@ describe('Filter Reducer', () => {
             expect(result).toEqual(fromFilter.initialState);
         });
     });
-    describe(`${searchActions.CLEAR_SEARCH} action`, () => {
+    describe(`${SearchActionTypes.CLEAR_SEARCH} action`, () => {
         it('should set saving to true', () => {
             const result = reducer(snapshot, new ClearSearch());
             expect(result).toEqual(fromFilter.initialState);
         });
     });
-    describe(`${actions.CANCEL_CREATE_FILTER} action`, () => {
+    describe(`${FilterActionTypes.CANCEL_CREATE_FILTER} action`, () => {
         it('should set saving to true', () => {
             const result = reducer(snapshot, new CancelCreateFilter());
             expect(result).toEqual(fromFilter.initialState);
diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.ts
similarity index 72%
rename from ui/src/app/metadata-filter/reducer/filter.reducer.ts
rename to ui/src/app/metadata/filter/reducer/filter.reducer.ts
index 1b7d54c01..3bce96ae3 100644
--- a/ui/src/app/metadata-filter/reducer/filter.reducer.ts
+++ b/ui/src/app/metadata/filter/reducer/filter.reducer.ts
@@ -1,7 +1,13 @@
-import * as filter from '../action/filter.action';
-import * as search from '../action/search.action';
-import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../../domain/action/filter-collection.action';
-import { MetadataFilter, MDUI } from '../../domain/domain.type';
+import {
+    FilterActionTypes,
+    FilterActionsUnion
+} from '../action/filter.action';
+import {
+    SearchActionTypes,
+    SearchActionsUnion
+} from '../action/search.action';
+import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../action/collection.action';
+import { MetadataFilter, MDUI } from '../../domain/model';
 
 export interface FilterState {
     selected: string | null;
@@ -17,21 +23,21 @@ export const initialState: FilterState = {
     saving: false
 };
 
-export function reducer(state = initialState, action: filter.Actions | search.Actions | FilterCollectionActionsUnion): FilterState {
+export function reducer(state = initialState, action: FilterActionsUnion | SearchActionsUnion | FilterCollectionActionsUnion): FilterState {
     switch (action.type) {
-        case filter.SELECT_ID: {
+        case FilterActionTypes.SELECT_ID: {
             return {
                 ...state,
                 selected: action.payload
             };
         }
-        case filter.LOAD_ENTITY_PREVIEW_SUCCESS: {
+        case FilterActionTypes.LOAD_ENTITY_PREVIEW_SUCCESS: {
             return {
                 ...state,
                 preview: action.payload
             };
         }
-        case filter.UPDATE_FILTER: {
+        case FilterActionTypes.UPDATE_FILTER: {
             return {
                 ...state,
                 changes: {
@@ -56,8 +62,8 @@ export function reducer(state = initialState, action: filter.Actions | search.Ac
         }
         case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
         case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS:
-        case search.CLEAR_SEARCH:
-        case filter.CANCEL_CREATE_FILTER: {
+        case SearchActionTypes.CLEAR_SEARCH:
+        case FilterActionTypes.CANCEL_CREATE_FILTER: {
             return {
                 ...initialState
             };
diff --git a/ui/src/app/metadata-filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts
similarity index 56%
rename from ui/src/app/metadata-filter/reducer/index.ts
rename to ui/src/app/metadata/filter/reducer/index.ts
index f94f5d385..5ae10da51 100644
--- a/ui/src/app/metadata-filter/reducer/index.ts
+++ b/ui/src/app/metadata/filter/reducer/index.ts
@@ -1,35 +1,57 @@
 import { createSelector, createFeatureSelector } from '@ngrx/store';
-import * as fromRoot from '../../core/reducer';
+import * as fromRoot from '../../../core/reducer';
 import * as fromFilter from './filter.reducer';
 import * as fromSearch from './search.reducer';
+import * as fromCollection from './collection.reducer';
+import * as utils from '../../domain/domain.util';
 
 export interface FilterState {
     filter: fromFilter.FilterState;
     search: fromSearch.SearchState;
+    collection: fromCollection.CollectionState;
 }
 
 export const reducers = {
     filter: fromFilter.reducer,
-    search: fromSearch.reducer
+    search: fromSearch.reducer,
+    collection: fromCollection.reducer
 };
 
 export interface State extends fromRoot.State {
-    'metadata-filter': FilterState;
+    'filter': FilterState;
 }
 
 export const getFiltersFromStateFn = (state: FilterState) => state.filter;
 export const getSearchFromStateFn = (state: FilterState) => state.search;
-export const getFilterState = createFeatureSelector<FilterState>('metadata-filter');
+export const getCollectionFromStateFn = (state: FilterState) => state.collection;
+
+export const getFilterState = createFeatureSelector<FilterState>('filter');
 
 export const getFilterFromState = createSelector(getFilterState, getFiltersFromStateFn);
+
 export const getSelected = createSelector(getFilterFromState, fromFilter.getSelected);
 export const getFilter = createSelector(getFilterFromState, fromFilter.getFilterChanges);
 export const getPreview = createSelector(getFilterFromState, fromFilter.getPreview);
 export const getSaving = createSelector(getFilterFromState, fromFilter.getSaving);
 
+/*
+ *   Select pieces of Search Collection
+*/
+
 export const getSearchFromState = createSelector(getFilterState, getSearchFromStateFn);
 export const getEntityCollection = createSelector(getSearchFromState, fromSearch.getEntityIds);
 export const getIsLoading = createSelector(getSearchFromState, fromSearch.getLoading);
 export const getError = createSelector(getSearchFromState, fromSearch.getError);
 export const getTerm = createSelector(getSearchFromState, fromSearch.getTerm);
 export const getViewingMore = createSelector(getSearchFromState, fromSearch.getViewMore);
+
+/*
+ *   Select pieces of Filter Collection
+*/
+export const getCollectionState = createSelector(getFilterState, getCollectionFromStateFn);
+export const getAllFilters = createSelector(getCollectionState, fromCollection.selectAllFilters);
+export const getFilterEntities = createSelector(getCollectionState, fromCollection.selectFilterEntities);
+export const getSelectedFilterId = createSelector(getCollectionState, fromCollection.getSelectedFilterId);
+export const getSelectedFilter = createSelector(getFilterEntities, getSelectedFilterId, utils.getInCollectionFn);
+export const getFilterIds = createSelector(getCollectionState, fromCollection.selectFilterIds);
+export const getFilterCollectionIsLoaded = createSelector(getCollectionState, fromCollection.getIsLoaded);
diff --git a/ui/src/app/metadata-filter/reducer/search.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/search.reducer.spec.ts
similarity index 61%
rename from ui/src/app/metadata-filter/reducer/search.reducer.spec.ts
rename to ui/src/app/metadata/filter/reducer/search.reducer.spec.ts
index 576294cf3..7c77afc30 100644
--- a/ui/src/app/metadata-filter/reducer/search.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/search.reducer.spec.ts
@@ -1,6 +1,13 @@
 import { reducer } from './search.reducer';
 import * as fromFilter from './search.reducer';
-import * as actions from '../action/search.action';
+import {
+    SearchActionTypes,
+    ViewMoreIds,
+    CancelViewMore,
+    QueryEntityIds,
+    LoadEntityIdsError,
+    LoadEntityIdsSuccess
+} from '../action/search.action';
 
 const snapshot: fromFilter.SearchState = {
     entityIds: [],
@@ -19,44 +26,44 @@ describe('Filter Reducer', () => {
         });
     });
 
-    describe(`${actions.VIEW_MORE_IDS} action`, () => {
+    describe(`${SearchActionTypes.VIEW_MORE_IDS} action`, () => {
         it('should set viewMore property to true', () => {
-            const result = reducer(snapshot, new actions.ViewMoreIds('foo'));
+            const result = reducer(snapshot, new ViewMoreIds('foo'));
 
             expect(result.viewMore).toBe(true);
         });
     });
 
-    describe(`${actions.CANCEL_VIEW_MORE} action`, () => {
+    describe(`${SearchActionTypes.CANCEL_VIEW_MORE} action`, () => {
         it('should set viewMore property to false', () => {
-            const result = reducer(snapshot, new actions.CancelViewMore());
+            const result = reducer(snapshot, new CancelViewMore());
 
             expect(result.viewMore).toBe(false);
         });
     });
 
-    describe(`${actions.QUERY_ENTITY_IDS} action`, () => {
+    describe(`${SearchActionTypes.QUERY_ENTITY_IDS} action`, () => {
         it('should set loading property to true', () => {
-            const result = reducer(snapshot, new actions.QueryEntityIds({ term: 'foo' }));
+            const result = reducer(snapshot, new QueryEntityIds({ term: 'foo' }));
 
             expect(result.loading).toBe(true);
         });
     });
 
-    describe(`${actions.LOAD_ENTITY_IDS_SUCCESS} action`, () => {
+    describe(`${SearchActionTypes.LOAD_ENTITY_IDS_SUCCESS} action`, () => {
         it('should set loading property to false and the entityIds property to the provided payload', () => {
             const ids = ['foo'];
-            const result = reducer(snapshot, new actions.LoadEntityIdsSuccess(ids));
+            const result = reducer(snapshot, new LoadEntityIdsSuccess(ids));
 
             expect(result.loading).toBe(false);
             expect(result.entityIds).toBe(ids);
         });
     });
 
-    describe(`${actions.LoadEntityIdsError} action`, () => {
+    describe(`${SearchActionTypes.LOAD_ENTITY_IDS_ERROR} action`, () => {
         it('should set loading property to false and the error property to the provided payload', () => {
             const err = new Error('Foobar!');
-            const result = reducer(snapshot, new actions.LoadEntityIdsError(err));
+            const result = reducer(snapshot, new LoadEntityIdsError(err));
 
             expect(result.loading).toBe(false);
             expect(result.error).toBe(err);
diff --git a/ui/src/app/metadata-filter/reducer/search.reducer.ts b/ui/src/app/metadata/filter/reducer/search.reducer.ts
similarity index 69%
rename from ui/src/app/metadata-filter/reducer/search.reducer.ts
rename to ui/src/app/metadata/filter/reducer/search.reducer.ts
index 47d5948bc..1d63609e9 100644
--- a/ui/src/app/metadata-filter/reducer/search.reducer.ts
+++ b/ui/src/app/metadata/filter/reducer/search.reducer.ts
@@ -1,6 +1,6 @@
-import * as search from '../action/search.action';
-import * as filter from '../action/filter.action';
-import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../../domain/action/filter-collection.action';
+import { FilterActionsUnion, FilterActionTypes } from '../action/filter.action';
+import { SearchActionsUnion, SearchActionTypes } from '../action/search.action';
+import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../action/collection.action';
 
 export interface SearchState {
     entityIds: string[];
@@ -18,28 +18,28 @@ export const initialState: SearchState = {
     term: '',
 };
 
-export function reducer(state = initialState, action: search.Actions | filter.Actions | FilterCollectionActionsUnion): SearchState {
+export function reducer(state = initialState, action: SearchActionsUnion | FilterActionsUnion | FilterCollectionActionsUnion): SearchState {
     switch (action.type) {
-        case search.VIEW_MORE_IDS: {
+        case SearchActionTypes.VIEW_MORE_IDS: {
             return {
                 ...state,
                 viewMore: true
             };
         }
-        case search.CANCEL_VIEW_MORE: {
+        case SearchActionTypes.CANCEL_VIEW_MORE: {
             return {
                 ...state,
                 viewMore: false
             };
         }
-        case search.QUERY_ENTITY_IDS: {
+        case SearchActionTypes.QUERY_ENTITY_IDS: {
             return {
                 ...state,
                 loading: true,
                 term: action.payload.term
             };
         }
-        case search.LOAD_ENTITY_IDS_SUCCESS: {
+        case SearchActionTypes.LOAD_ENTITY_IDS_SUCCESS: {
             return {
                 ...state,
                 loading: false,
@@ -47,7 +47,7 @@ export function reducer(state = initialState, action: search.Actions | filter.Ac
                 entityIds: action.payload
             };
         }
-        case search.LOAD_ENTITY_IDS_ERROR: {
+        case SearchActionTypes.LOAD_ENTITY_IDS_ERROR: {
             return {
                 ...state,
                 loading: false,
@@ -56,8 +56,8 @@ export function reducer(state = initialState, action: search.Actions | filter.Ac
         }
         case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
         case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS:
-        case search.CLEAR_SEARCH:
-        case filter.CANCEL_CREATE_FILTER: {
+        case SearchActionTypes.CLEAR_SEARCH:
+        case FilterActionTypes.CANCEL_CREATE_FILTER: {
             return {
                 ...initialState
             };
diff --git a/ui/src/app/dashboard/action/dashboard.action.ts b/ui/src/app/metadata/manager/action/manager.action.ts
similarity index 100%
rename from ui/src/app/dashboard/action/dashboard.action.ts
rename to ui/src/app/metadata/manager/action/manager.action.ts
diff --git a/ui/src/app/dashboard/action/search.action.ts b/ui/src/app/metadata/manager/action/search.action.ts
similarity index 73%
rename from ui/src/app/dashboard/action/search.action.ts
rename to ui/src/app/metadata/manager/action/search.action.ts
index 11df79fc4..457a9c371 100644
--- a/ui/src/app/dashboard/action/search.action.ts
+++ b/ui/src/app/metadata/manager/action/search.action.ts
@@ -1,13 +1,12 @@
 import { Action } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
+import { MetadataEntity } from '../../domain/model';
 
 export const ENTITY_SEARCH = '[Metadata Entity Search] Entity Search';
 export const ENTITY_FILTER = '[Metadata Entity Filter] Entity Filter';
 export const ENTITY_SEARCH_COMPLETE = '[Metadata Entity Search] Entity Search COMPLETE';
 
 /**
- * Add Provider to Collection Actions
+ * Add Resolver to Collection Actions
  */
 export class SearchAction implements Action {
     readonly type = ENTITY_SEARCH;
@@ -24,7 +23,7 @@ export class FilterAction implements Action {
 export class SearchCompleteAction implements Action {
     readonly type = ENTITY_SEARCH_COMPLETE;
 
-    constructor(public payload: Array<MetadataProvider | MetadataFilter>) { }
+    constructor(public payload: Array<MetadataEntity>) { }
 }
 
 export type Actions =
diff --git a/ui/src/app/dashboard/component/delete-dialog.component.html b/ui/src/app/metadata/manager/component/delete-dialog.component.html
similarity index 100%
rename from ui/src/app/dashboard/component/delete-dialog.component.html
rename to ui/src/app/metadata/manager/component/delete-dialog.component.html
diff --git a/ui/src/app/dashboard/component/delete-dialog.component.ts b/ui/src/app/metadata/manager/component/delete-dialog.component.ts
similarity index 100%
rename from ui/src/app/dashboard/component/delete-dialog.component.ts
rename to ui/src/app/metadata/manager/component/delete-dialog.component.ts
diff --git a/ui/src/app/dashboard/component/entity-item.component.html b/ui/src/app/metadata/manager/component/entity-item.component.html
similarity index 67%
rename from ui/src/app/dashboard/component/entity-item.component.html
rename to ui/src/app/metadata/manager/component/entity-item.component.html
index 4b48336ca..5be89b505 100644
--- a/ui/src/app/dashboard/component/entity-item.component.html
+++ b/ui/src/app/metadata/manager/component/entity-item.component.html
@@ -6,23 +6,23 @@
                     <i class="fa fa-fw fa-3x text-primary" [class.fa-caret-right]="!isOpen" [class.fa-caret-down]="isOpen"></i>
                     &nbsp;
                     <span class="label-icon sr-hidden" [ngSwitch]="entity.kind">
-                        <i class="fa fa-fw fa-3x text-info fa-cubes" *ngSwitchCase="types.filter"></i>
-                        <i class="fa fa-fw fa-3x text-info fa-cube" *ngSwitchCase="types.provider"></i>
+                        <i class="fa fa-fw fa-3x text-info fa-cubes" *ngSwitchCase="types.FILTER"></i>
+                        <i class="fa fa-fw fa-3x text-info fa-cube" *ngSwitchCase="types.RESOLVER"></i>
                         <i class="fa fa-fw fa-3x text-info fa-" *ngSwitchDefault></i>
                     </span>
                 </div>
                 <div>
                     {{ entity.name }}
-                    <i *ngIf="entity.createdDate" class="fa fa-fw" [ngClass]="{
-                                    'fa-check-circle text-success': entity.enabled,
-                                    'fa-times-circle text-danger': !entity.enabled
-                                }"></i>
-                    <span *ngIf="!entity.createdDate" class="badge badge-warning" i18n="@@warning--incomplete-form" aria-label="Warning Badge: Incomplete Form">Incomplete Form</span>
-                    <small class="d-block">{{ entity.entityId }}</small>
+                    <i *ngIf="!entity.isDraft()" class="fa fa-fw" [ngClass]="{
+                        'fa-check-circle text-success': entity.enabled,
+                        'fa-times-circle text-danger': !entity.enabled
+                    }"></i>
+                    <span *ngIf="entity.isDraft()" class="badge badge-warning" i18n="@@warning--incomplete-form" aria-label="Warning Badge: Incomplete Form">Incomplete Form</span>
+                    <small class="d-block">{{ entity.getDisplayId() }}</small>
                 </div>
             </div>
             <div class="col-3 text-right">
-                <button class="btn btn-link" (click)="preview.emit(entity)" *ngIf="entity.createdDate" aria-label="Review the XML of the selected service provider">
+                <button class="btn btn-link" (click)="preview.emit(entity)" *ngIf="!entity.isDraft()" aria-label="Review the XML of the selected service provider">
                     <i class="fa fa-fw fa-eye fa-2x"></i>
                 </button>
                 <button class="btn btn-link" (click)="select.emit(entity)" aria-label="Edit selected service provider">
@@ -37,22 +37,22 @@
                 <div class="col-10">
                     <div class="row">
                         <div class="col text-right font-weight-bold" i18n="@@label--service-provider">
-                            {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Name:
+                            Metadata Source Name:
                         </div>
                         <div class="col">{{ entity.name }}</div>
                         <div class="col text-right font-weight-bold" i18n="@@label--created-date">Created Date:</div>
-                        <div class="col" *ngIf="entity.createdDate">{{ entity.createdDate | date:'medium' }}</div>
-                        <div class="col" *ngIf="!entity.createdDate"> &mdash; </div>
+                        <div class="col" *ngIf="!entity.isDraft()">{{ entity.getCreationDate() | date:'medium' }}</div>
+                        <div class="col" *ngIf="entity.isDraft()"> &mdash; </div>
                     </div>
                     <div class="row">
                         <div class="col text-right font-weight-bold" i18n="@@label--service-entity-id">
-                            {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Entity ID:
+                            Metadata Source Entity ID:
                         </div>
-                        <div class="col">{{ entity.entityId }}</div>
+                        <div class="col">{{ entity.getDisplayId() }}</div>
                         <div class="col text-right font-weight-bold" i18n="@@label--service-provider-status">
-                            {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Status:
+                            Metadata Source Status:
                         </div>
-                        <div class="col" *ngIf="entity.createdDate">
+                        <div class="col" *ngIf="!entity.isDraft()">
                             <i class="fa fa-fw" [ngClass]="{
                                 'fa-check-circle text-success': entity.enabled,
                                 'fa-times-circle text-danger': !entity.enabled
@@ -60,13 +60,13 @@
                             <span *ngIf="entity.enabled" i18n="@@value--enabled">Enabled</span>
                             <span *ngIf="!entity.enabled" i18n="@@value--disabled">Disabled</span>
                         </div>
-                        <div class="col" *ngIf="!entity.createdDate">
+                        <div class="col" *ngIf="entity.isDraft()">
                             <span class="badge badge-warning" i18n="@@warning--incomplete-form">Incomplete Form</span>
                         </div>
                     </div>
                 </div>
                 <div class="col-2">
-                    <button *ngIf="!entity.createdDate && entity.kind === 'provider'"
+                    <button *ngIf="entity.isDraft() && entity.kind === types.RESOLVER"
                         class="btn btn-link pull-right"
                         (click)="delete.emit(entity)"
                         aria-label="Delete selected service provider">
diff --git a/ui/src/app/dashboard/component/entity-item.component.scss b/ui/src/app/metadata/manager/component/entity-item.component.scss
similarity index 90%
rename from ui/src/app/dashboard/component/entity-item.component.scss
rename to ui/src/app/metadata/manager/component/entity-item.component.scss
index 71b76bfe5..eb762129a 100644
--- a/ui/src/app/dashboard/component/entity-item.component.scss
+++ b/ui/src/app/metadata/manager/component/entity-item.component.scss
@@ -1,4 +1,4 @@
-@import '../../../theme/palette';
+@import '../../../../theme/palette';
 
 .card {
     background-color: rgba($light-grey, 0.5);
diff --git a/ui/src/app/dashboard/component/entity-item.component.spec.ts b/ui/src/app/metadata/manager/component/entity-item.component.spec.ts
similarity index 75%
rename from ui/src/app/dashboard/component/entity-item.component.spec.ts
rename to ui/src/app/metadata/manager/component/entity-item.component.spec.ts
index 4a1f3e4d9..b71ce9f57 100644
--- a/ui/src/app/dashboard/component/entity-item.component.spec.ts
+++ b/ui/src/app/metadata/manager/component/entity-item.component.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { EntityItemComponent } from './entity-item.component';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
 
-describe('Provider List item', () => {
+describe('Resolver List item', () => {
     let fixture: ComponentFixture<EntityItemComponent>;
     let instance: EntityItemComponent;
 
-    let provider = { entityId: 'foo', serviceProviderName: 'bar' } as MetadataProvider;
+    let resolver = new FileBackedHttpMetadataResolver({ entityId: 'foo', serviceProviderName: 'bar' });
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -20,7 +20,7 @@ describe('Provider List item', () => {
 
         fixture = TestBed.createComponent(EntityItemComponent);
         instance = fixture.componentInstance;
-        instance.entity = provider;
+        instance.entity = resolver;
     });
 
     it('should compile', () => {
diff --git a/ui/src/app/dashboard/component/entity-item.component.ts b/ui/src/app/metadata/manager/component/entity-item.component.ts
similarity index 82%
rename from ui/src/app/dashboard/component/entity-item.component.ts
rename to ui/src/app/metadata/manager/component/entity-item.component.ts
index 83236f5b4..b5aed3756 100644
--- a/ui/src/app/dashboard/component/entity-item.component.ts
+++ b/ui/src/app/metadata/manager/component/entity-item.component.ts
@@ -1,6 +1,7 @@
 import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter } from '@angular/core';
 
-import { MetadataEntity, DomainEntityKinds } from '../../domain/domain.type';
+import { MetadataEntity } from '../../domain/model';
+import { MetadataTypes } from '../../domain/domain.type';
 
 @Component({
     selector: 'entity-item',
@@ -10,7 +11,7 @@ import { MetadataEntity, DomainEntityKinds } from '../../domain/domain.type';
 })
 export class EntityItemComponent {
 
-    types = DomainEntityKinds;
+    types = MetadataTypes;
 
     @Input() entity: MetadataEntity;
     @Input() isOpen: boolean;
diff --git a/ui/src/app/dashboard/component/provider-search.component.html b/ui/src/app/metadata/manager/component/provider-search.component.html
similarity index 79%
rename from ui/src/app/dashboard/component/provider-search.component.html
rename to ui/src/app/metadata/manager/component/provider-search.component.html
index 8866261d8..ad739471d 100644
--- a/ui/src/app/dashboard/component/provider-search.component.html
+++ b/ui/src/app/metadata/manager/component/provider-search.component.html
@@ -6,9 +6,9 @@
             type="text"
             tabindex="0"
             class="form-control"
-            i18n-placeholder="@@message--search-sources"
-            placeholder="Search sources"
-            aria-label="To search, enter name then press enter"
+            i18n-placeholder="@@message--search-files"
+            placeholder="Search Files"
+            aria-label="To search for a source, enter name then press enter"
             formControlName="search"
             (keyup)="search.emit($event.target.value)">
         <div class="input-group-append">
diff --git a/ui/src/app/dashboard/component/provider-search.component.ts b/ui/src/app/metadata/manager/component/provider-search.component.ts
similarity index 100%
rename from ui/src/app/dashboard/component/provider-search.component.ts
rename to ui/src/app/metadata/manager/component/provider-search.component.ts
diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html
new file mode 100644
index 000000000..10df850b2
--- /dev/null
+++ b/ui/src/app/metadata/manager/container/manager.component.html
@@ -0,0 +1,42 @@
+<div class="container-fluid p-3" role="main">
+    <section class="section">
+        <div class="section-header bg-primary p-2 text-light">
+            <div class="row justify-content-between">
+                <div class="col-md-8">
+                    <span class="lead" i18n="@@label--current-metadata-sources">Current Metadata Sources</span>
+                </div>
+                <div class="col-md-4">
+                    <provider-search
+                        [query]="searchQuery$ | async"
+                        [searching]="loading$ | async"
+                        (search)="search($event)">
+                    </provider-search>
+                </div>
+            </div>
+        </div>
+        <div class="section-body p-2 border border-top-0 border-primary">
+            <ul class="list-unstyled m-0">
+                <li *ngFor="let entity of limited$ | async; index as i" [ngClass]="{'mt-2': i > 0}" aria-label="Provider Item Accordion. Press Spacebar to open">
+                    <entity-item
+                        [entity]="entity"
+                        [isOpen]="(entitiesOpen$ | async)[entity.getId()]"
+                        (select)="edit(entity)"
+                        (toggle)="toggleEntity(entity)"
+                        (preview)="openPreviewDialog(entity)"
+                        (delete)="deleteResolver(entity)">
+                    </entity-item>
+                </li>
+            </ul>
+            <div class="mt-3 clearfix" *ngIf="(total$ | async) > limit">
+                <ngb-pagination
+                    class="float-right"
+                    [collectionSize]="total$ | async"
+                    [page]="page"
+                    [pageSize]="limit"
+                    (pageChange)="changePage($event)"
+                    aria-label="Pages">
+                </ngb-pagination>
+            </div>
+        </div>
+    </section>
+</div>
diff --git a/ui/src/app/dashboard/container/dashboard.component.scss b/ui/src/app/metadata/manager/container/manager.component.scss
similarity index 100%
rename from ui/src/app/dashboard/container/dashboard.component.scss
rename to ui/src/app/metadata/manager/container/manager.component.scss
diff --git a/ui/src/app/dashboard/container/dashboard.component.spec.ts b/ui/src/app/metadata/manager/container/manager.component.spec.ts
similarity index 71%
rename from ui/src/app/dashboard/container/dashboard.component.spec.ts
rename to ui/src/app/metadata/manager/container/manager.component.spec.ts
index 1c6a064bc..7d92250bd 100644
--- a/ui/src/app/dashboard/container/dashboard.component.spec.ts
+++ b/ui/src/app/metadata/manager/container/manager.component.spec.ts
@@ -5,30 +5,30 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap/pagination/pagination.module';
 import { NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap/modal/modal.module';
-import { DashboardComponent } from './dashboard.component';
+import { ManagerComponent } from './manager.component';
 import * as fromDashboard from '../reducer';
 import { ProviderSearchComponent } from '../component/provider-search.component';
 import { EntityItemComponent } from '../component/entity-item.component';
 import { DeleteDialogComponent } from '../component/delete-dialog.component';
-import { RouterStub } from '../../../testing/router.stub';
-import { NgbModalStub } from '../../../testing/modal.stub';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { Provider } from '../../domain/entity/provider';
+import { RouterStub } from '../../../../testing/router.stub';
+import { NgbModalStub } from '../../../../testing/modal.stub';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
 
 
-describe('Dashboard Page', () => {
-    let fixture: ComponentFixture<DashboardComponent>;
+describe('Metadata Manager Page', () => {
+    let fixture: ComponentFixture<ManagerComponent>;
     let store: Store<fromDashboard.DashboardState>;
     let router: Router;
     let modal: NgbModal;
-    let instance: DashboardComponent;
+    let instance: ManagerComponent;
 
-    let draft = new Provider({
+    let draft = new FileBackedHttpMetadataResolver({
             entityId: 'foo',
             serviceProviderName: 'bar'
         }),
-        provider = new Provider({
-            ...draft,
+        resolver = new FileBackedHttpMetadataResolver({
+            entityId: 'foo',
+            serviceProviderName: 'foo',
             id: '1'
         });
 
@@ -41,21 +41,21 @@ describe('Dashboard Page', () => {
             imports: [
                 NoopAnimationsModule,
                 StoreModule.forRoot({
-                    dashboard: combineReducers(fromDashboard.reducers),
+                    manager: combineReducers(fromDashboard.reducers),
                 }),
                 ReactiveFormsModule,
                 NgbPaginationModule,
                 NgbModalModule
             ],
             declarations: [
-                DashboardComponent,
+                ManagerComponent,
                 ProviderSearchComponent,
                 EntityItemComponent,
                 DeleteDialogComponent
             ],
         });
 
-        fixture = TestBed.createComponent(DashboardComponent);
+        fixture = TestBed.createComponent(ManagerComponent);
         instance = fixture.componentInstance;
         store = TestBed.get(Store);
         router = TestBed.get(Router);
@@ -70,7 +70,7 @@ describe('Dashboard Page', () => {
         expect(fixture).toBeDefined();
     });
 
-    xdescribe('getPagedProviders method', () => {});
+    xdescribe('getPagedResolvers method', () => {});
 
     describe('changePage method', () => {
         it('should update the page value', () => {
@@ -79,24 +79,24 @@ describe('Dashboard Page', () => {
             expect(instance.page).toBe(page);
         });
 
-        it('should update the paged providers list', () => {
+        it('should update the paged resolvers list', () => {
             let page = 2;
-            spyOn(instance, 'getPagedProviders');
+            spyOn(instance, 'getPagedResolvers');
             instance.changePage(page);
-            expect(instance.getPagedProviders).toHaveBeenCalled();
+            expect(instance.getPagedResolvers).toHaveBeenCalled();
         });
     });
 
-    describe('toggleProvider method', () => {
+    describe('toggleResolver method', () => {
         it('should fire a redux action', () => {
-            instance.toggleProvider(draft);
+            instance.toggleEntity(draft);
             expect(store.dispatch).toHaveBeenCalled();
         });
     });
 
     describe('openPreviewDialog method', () => {
         it('should fire a redux action', () => {
-            instance.openPreviewDialog(provider);
+            instance.openPreviewDialog(resolver);
             expect(store.dispatch).toHaveBeenCalled();
         });
     });
@@ -115,24 +115,24 @@ describe('Dashboard Page', () => {
     describe('edit method', () => {
         it('should route to the edit page', () => {
             spyOn(router, 'navigate');
-            instance.edit(provider);
-            expect(router.navigate).toHaveBeenCalledWith(['provider', provider.id, 'edit']);
+            instance.edit(resolver);
+            expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', resolver.id, 'edit']);
         });
         it('should route to the wizard page', () => {
             spyOn(router, 'navigate');
             instance.edit(draft);
-            expect(router.navigate).toHaveBeenCalledWith(['provider', draft.entityId, 'wizard']);
+            expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', draft.entityId, 'wizard']);
         });
     });
 
-    describe('deleteProvider method', () => {
+    describe('deleteResolver method', () => {
         it('should call the modal service', () => {
             spyOn(modal, 'open').and.callFake(() => {
                 return {
                     result: Promise.resolve(true)
                 };
             });
-            instance.deleteProvider(provider);
+            instance.deleteResolver(resolver);
             expect(modal.open).toHaveBeenCalled();
         });
         it('should log an error to the console on failure', () => {
@@ -141,7 +141,7 @@ describe('Dashboard Page', () => {
                     result: Promise.reject(false)
                 };
             });
-            instance.deleteProvider(provider);
+            instance.deleteResolver(resolver);
             expect(modal.open).toHaveBeenCalled();
         });
     });
diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/metadata/manager/container/manager.component.ts
similarity index 63%
rename from ui/src/app/dashboard/container/dashboard.component.ts
rename to ui/src/app/metadata/manager/container/manager.component.ts
index 45be4ad4c..0fe3a8a42 100644
--- a/ui/src/app/dashboard/container/dashboard.component.ts
+++ b/ui/src/app/metadata/manager/container/manager.component.ts
@@ -2,28 +2,27 @@ import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { MetadataEntity, MetadataProvider, DomainEntityKinds } from '../../domain/domain.type';
+import { MetadataEntity, MetadataResolver } from '../../domain/model';
+import { MetadataTypes, Metadata } from '../../domain/domain.type';
 import * as searchActions from '../action/search.action';
-import * as draftActions from '../../domain/action/draft-collection.action';
 import * as fromDashboard from '../reducer';
-import { ToggleEntityDisplay } from '../action/dashboard.action';
-import { PreviewEntity } from '../../domain/action/entity.action';
-
+import { ToggleEntityDisplay } from '../action/manager.action';
 import { DeleteDialogComponent } from '../component/delete-dialog.component';
+import { PreviewEntity } from '../../domain/action/entity.action';
+import { RemoveDraftRequest } from '../../resolver/action/draft.action';
 
 @Component({
-    selector: 'dashboard-page',
+    selector: 'manager-page',
     changeDetection: ChangeDetectionStrategy.OnPush,
-    templateUrl: './dashboard.component.html',
-    styleUrls: ['./dashboard.component.scss']
+    templateUrl: './manager.component.html',
+    styleUrls: ['./manager.component.scss']
 })
-export class DashboardComponent implements OnInit {
+export class ManagerComponent implements OnInit {
     searchQuery$: Observable<string>;
-    providers$: Observable<MetadataEntity[]>;
+    resolvers$: Observable<MetadataEntity[]>;
     loading$: Observable<boolean>;
 
     total$: Observable<number>;
@@ -33,7 +32,7 @@ export class DashboardComponent implements OnInit {
 
     entitiesOpen$: Observable<{[key: string]: boolean}>;
 
-    filterOptions = ['all', DomainEntityKinds.filter, DomainEntityKinds.provider];
+    filterOptions = ['all', MetadataTypes.FILTER, MetadataTypes.PROVIDER];
     filtering$: Observable<string>;
     filtering = 'all';
 
@@ -42,18 +41,16 @@ export class DashboardComponent implements OnInit {
         private router: Router,
         private modalService: NgbModal
     ) {
-        this.providers$ = store.select(fromDashboard.getSearchResults);
+        this.resolvers$ = store.select(fromDashboard.getSearchResults);
         this.searchQuery$ = store.select(fromDashboard.getSearchQuery);
         this.loading$ = store.select(fromDashboard.getSearchLoading);
         this.entitiesOpen$ = store.select(fromDashboard.getOpenProviders);
         this.filtering$ = store.select(fromDashboard.getFilterType);
         this.filtering$.subscribe(f => this.filtering = f);
 
-        this.total$ = this.providers$.pipe(map(list => list.length));
-
-        this.limited$ = this.getPagedProviders(this.page, this.providers$);
+        this.total$ = this.resolvers$.pipe(map(list => list.length));
 
-        // this.providers$.subscribe(p => console.log(p));
+        this.limited$ = this.getPagedResolvers(this.page, this.resolvers$);
     }
 
     ngOnInit (): void {
@@ -61,12 +58,12 @@ export class DashboardComponent implements OnInit {
         this.changeFilter('all');
     }
 
-    getPagedProviders(page: number, list$: Observable<MetadataEntity[]>): Observable<MetadataEntity[]> {
+    getPagedResolvers(page: number, list$: Observable<MetadataEntity[]>): Observable<MetadataEntity[]> {
         return list$.pipe(
             map((providers: MetadataEntity[]) => {
                 let maxIndex = (page * this.limit) - 1,
                     minIndex = ((page - 1) * this.limit);
-                return providers.filter((provider: MetadataEntity, index: number) =>  (maxIndex >= index && index >= minIndex) );
+                return providers.filter((resolver: MetadataEntity, index: number) =>  (maxIndex >= index && index >= minIndex) );
             })
         );
     }
@@ -77,7 +74,7 @@ export class DashboardComponent implements OnInit {
 
     changePage(index: number): void {
         this.page = index;
-        this.limited$ = this.getPagedProviders(index, this.providers$);
+        this.limited$ = this.getPagedResolvers(index, this.resolvers$);
     }
 
     search(query: string = ''): void {
@@ -86,31 +83,28 @@ export class DashboardComponent implements OnInit {
     }
 
     edit(entity: MetadataEntity): void {
-        let path = entity.id ? 'edit' : 'wizard',
-            id = entity.id ? entity.id : entity.entityId;
-        this.router.navigate([entity.kind, id, path]);
+        this.router.navigate(['metadata', 'resolver', entity.getId(), entity.isDraft() ? 'wizard' : 'edit']);
     }
 
-    toggleProvider(entity: MetadataEntity): void {
-        let id = entity.id ? entity.id : entity.entityId;
-        this.store.dispatch(new ToggleEntityDisplay(id));
+    toggleEntity(entity: MetadataEntity): void {
+        this.store.dispatch(new ToggleEntityDisplay(entity.getId()));
     }
 
     openPreviewDialog(entity: MetadataEntity): void {
         this.store.dispatch(new PreviewEntity(entity));
     }
 
-    deleteProvider(entity: MetadataProvider): void {
+    deleteResolver(entity: MetadataResolver): void {
         this.modalService
             .open(DeleteDialogComponent)
             .result
             .then(
                 success => {
-                    this.store.dispatch(new draftActions.RemoveDraftRequest(entity));
+                    this.store.dispatch(new RemoveDraftRequest(entity));
                 },
                 err => {
                     console.log('Cancelled');
                 }
             );
     }
-} /* istanbul ignore next */
+}
diff --git a/ui/src/app/dashboard/effect/search.effects.ts b/ui/src/app/metadata/manager/effect/search.effects.ts
similarity index 59%
rename from ui/src/app/dashboard/effect/search.effects.ts
rename to ui/src/app/metadata/manager/effect/search.effects.ts
index 5eed9710b..fa3386def 100644
--- a/ui/src/app/dashboard/effect/search.effects.ts
+++ b/ui/src/app/metadata/manager/effect/search.effects.ts
@@ -5,12 +5,10 @@ import { Observable, of } from 'rxjs';
 import { switchMap, map, combineLatest } from 'rxjs/operators';
 
 import * as entitySearch from '../action/search.action';
-import * as fromCollections from '../../domain/reducer';
-import * as fromDashboard from '../reducer';
+import * as fromManager from '../reducer';
+import * as fromResolver from '../../resolver/reducer';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { Provider } from '../../domain/entity/provider';
-import { MetadataEntity, MetadataFilter } from '../../domain/domain.type';
-import { EntityAttributesFilter } from '../../domain/entity/entity-attributes.filter';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
 
 
 @Injectable()
@@ -32,27 +30,21 @@ export class SearchEffects {
 
     constructor(
         private actions$: Actions,
-        private store: Store<fromCollections.CollectionState>
+        private store: Store<fromManager.State>
     ) { }
 
     private performSearch(): Observable<entitySearch.Actions> {
         return of([]).pipe(
             combineLatest(
-                this.store.select(fromCollections.getAllProviders),
-                this.store.select(fromCollections.getAllFilters),
-                (o: any[], p: MetadataProvider[], f: MetadataFilter[]): Array<MetadataEntity> => {
+                this.store.select(fromResolver.getAllResolvers),
+                (o: any[], p: MetadataProvider[]): Array<FileBackedHttpMetadataResolver> => {
                     return o.concat(
-                        f.map(filter => new EntityAttributesFilter(filter)),
-                        p.map(provider => new Provider(provider))
+                        p.map(provider => new FileBackedHttpMetadataResolver(provider))
                     );
                 }
             ),
             combineLatest(
-                this.store.select(fromDashboard.getFilterType),
-                (entities, kind) => kind !== 'all' ? entities.filter(e => e.kind === kind) : entities
-            ),
-            combineLatest(
-                this.store.select(fromDashboard.getSearchQuery),
+                this.store.select(fromManager.getSearchQuery),
                 (entities, term) => entities.filter(
                     e => this.matcher(e.name, term) || this.matcher(e.entityId, term)
                 )
diff --git a/ui/src/app/dashboard/dashboard.module.ts b/ui/src/app/metadata/manager/manager.module.ts
similarity index 68%
rename from ui/src/app/dashboard/dashboard.module.ts
rename to ui/src/app/metadata/manager/manager.module.ts
index 06efbc2b0..e94b4192a 100644
--- a/ui/src/app/dashboard/dashboard.module.ts
+++ b/ui/src/app/metadata/manager/manager.module.ts
@@ -1,13 +1,13 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
-import { RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap/pagination/pagination.module';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 
-import { DashboardComponent } from './container/dashboard.component';
+import { ManagerComponent } from './container/manager.component';
 import { EntityItemComponent } from './component/entity-item.component';
 import { ProviderSearchComponent } from './component/provider-search.component';
 import { reducers } from './reducer';
@@ -15,11 +15,10 @@ import { SearchEffects } from './effect/search.effects';
 import { DeleteDialogComponent } from './component/delete-dialog.component';
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap/modal/modal.module';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import { PreviewDialogModule } from '../shared/preview/preview-dialog.module';
 
 @NgModule({
     declarations: [
-        DashboardComponent,
+        ManagerComponent,
         EntityItemComponent,
         ProviderSearchComponent,
         DeleteDialogComponent
@@ -28,19 +27,29 @@ import { PreviewDialogModule } from '../shared/preview/preview-dialog.module';
         DeleteDialogComponent
     ],
     imports: [
-        RouterModule.forChild([
-            { path: '', component: DashboardComponent }
-        ]),
-        StoreModule.forFeature('dashboard', reducers),
-        EffectsModule.forFeature([SearchEffects]),
         CommonModule,
         ReactiveFormsModule,
         NgbPaginationModule,
+        RouterModule,
         NgbModalModule,
         NgbDropdownModule,
-        PreviewDialogModule,
         HttpClientModule
+    ]
+})
+export class ManagerModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: RootManagerModule,
+            providers: []
+        };
+    }
+}
+
+@NgModule({
+    imports: [
+        ManagerModule,
+        StoreModule.forFeature('manager', reducers),
+        EffectsModule.forFeature([SearchEffects]),
     ],
-    providers: []
 })
-export class DashboardModule { }
+export class RootManagerModule { }
diff --git a/ui/src/app/dashboard/reducer/index.ts b/ui/src/app/metadata/manager/reducer/index.ts
similarity index 74%
rename from ui/src/app/dashboard/reducer/index.ts
rename to ui/src/app/metadata/manager/reducer/index.ts
index 4fb55bf4e..d35d2b66e 100644
--- a/ui/src/app/dashboard/reducer/index.ts
+++ b/ui/src/app/metadata/manager/reducer/index.ts
@@ -1,25 +1,25 @@
 import { createSelector, createFeatureSelector } from '@ngrx/store';
-import * as fromRoot from '../../core/reducer';
-import * as fromDashboard from './dashboard.reducer';
+import * as fromRoot from '../../../core/reducer';
+import * as fromDashboard from './manager.reducer';
 import * as fromSearch from './search.reducer';
 
 export interface DashboardState {
-    dashboard: fromDashboard.State;
+    manager: fromDashboard.State;
     search: fromSearch.SearchState;
 }
 
 export interface State extends fromRoot.State {
-    'dashboard': DashboardState;
+    'manager': DashboardState;
 }
 
 export const reducers = {
-    dashboard: fromDashboard.reducer,
+    manager: fromDashboard.reducer,
     search: fromSearch.reducer
 };
 
-export const getFeatureState = createFeatureSelector<DashboardState>('dashboard');
-export const getDashboardState = createSelector(getFeatureState, (state: DashboardState) => state.dashboard);
-export const getOpenProviders = createSelector(getDashboardState, (dashboard: fromDashboard.State) => dashboard.providersOpen);
+export const getFeatureState = createFeatureSelector<DashboardState>('manager');
+export const getDashboardState = createSelector(getFeatureState, (state: DashboardState) => state.manager);
+export const getOpenProviders = createSelector(getDashboardState, (manager: fromDashboard.State) => manager.resolversOpen);
 
 export const getSearchState = createSelector(getFeatureState,
     (state: DashboardState) => state.search
diff --git a/ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
similarity index 67%
rename from ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts
rename to ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
index 93662e652..9a57ad2fc 100644
--- a/ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts
+++ b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
@@ -1,10 +1,10 @@
-import { reducer } from './dashboard.reducer';
-import * as fromDashboard from './dashboard.reducer';
-import { ToggleEntityDisplay } from '../action/dashboard.action';
+import { reducer } from './manager.reducer';
+import * as fromDashboard from './manager.reducer';
+import { ToggleEntityDisplay } from '../action/manager.action';
 
 describe('Dashboard Reducer', () => {
     const initialState: fromDashboard.State = {
-        providersOpen: {}
+        resolversOpen: {}
     };
 
     describe('undefined action', () => {
@@ -15,7 +15,7 @@ describe('Dashboard Reducer', () => {
         });
     });
 
-    describe('Toggle Provider Display', () => {
+    describe('Toggle Resolver Display', () => {
         it('should toggle the selected providers open state', () => {
             const id = 'foo';
             const action = new ToggleEntityDisplay(id);
@@ -23,7 +23,7 @@ describe('Dashboard Reducer', () => {
             const result = reducer(initialState, action);
 
             expect(result).toEqual(
-                Object.assign({}, initialState, { providersOpen: { foo: true } })
+                Object.assign({}, initialState, { resolversOpen: { foo: true } })
             );
         });
     });
diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.ts
new file mode 100644
index 000000000..b37bb940f
--- /dev/null
+++ b/ui/src/app/metadata/manager/reducer/manager.reducer.ts
@@ -0,0 +1,29 @@
+import * as manager from '../action/manager.action';
+
+export interface State {
+    resolversOpen: {[key: string]: boolean};
+}
+
+export const initialState: State = {
+    resolversOpen: {}
+};
+
+export function reducer(state = initialState, action: manager.Actions): State {
+    switch (action.type) {
+        case manager.TOGGLE_ENTITY_DISPLAY: {
+            return {
+                ...state,
+                resolversOpen: {
+                    ...state.resolversOpen,
+                    ...{[action.payload]: !state.resolversOpen[action.payload]}
+                }
+            };
+        }
+        default: {
+            // console.log(state);
+            return state;
+        }
+    }
+}
+
+export const resolversOpen = (state: State) => state.resolversOpen;
diff --git a/ui/src/app/dashboard/reducer/search.reducer.ts b/ui/src/app/metadata/manager/reducer/search.reducer.ts
similarity index 83%
rename from ui/src/app/dashboard/reducer/search.reducer.ts
rename to ui/src/app/metadata/manager/reducer/search.reducer.ts
index e002cd75d..2ab931fc0 100644
--- a/ui/src/app/dashboard/reducer/search.reducer.ts
+++ b/ui/src/app/metadata/manager/reducer/search.reducer.ts
@@ -1,9 +1,8 @@
 import * as searchActions from '../action/search.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
+import { MetadataEntity } from '../../domain/model';
 
 export interface SearchState {
-    entities: (MetadataProvider | MetadataFilter)[];
+    entities: MetadataEntity[];
     loading: boolean;
     query: string;
     kind: string;
@@ -55,4 +54,4 @@ export const getQuery = (state: SearchState) => state.query;
 
 export const getLoading = (state: SearchState) => state.loading;
 
-export const getFilter = (state: SearchState) => state.kind;
\ No newline at end of file
+export const getFilter = (state: SearchState) => state.kind;
diff --git a/ui/src/app/edit-provider/container/draft.component.html b/ui/src/app/metadata/metadata.component.html
similarity index 100%
rename from ui/src/app/edit-provider/container/draft.component.html
rename to ui/src/app/metadata/metadata.component.html
diff --git a/ui/src/app/metadata/metadata.component.spec.ts b/ui/src/app/metadata/metadata.component.spec.ts
new file mode 100644
index 000000000..fb9d5f329
--- /dev/null
+++ b/ui/src/app/metadata/metadata.component.spec.ts
@@ -0,0 +1,55 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+import { MetadataPageComponent } from './metadata.component';
+
+import * as fromRoot from '../core/reducer';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+    template: `
+        <metadata-page></metadata-page>
+    `
+})
+class TestHostComponent {
+    @ViewChild(MetadataPageComponent)
+    public componentUnderTest: MetadataPageComponent;
+}
+
+describe('AppComponent', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: MetadataPageComponent;
+    let store: Store<fromRoot.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                StoreModule.forRoot({
+                    core: combineReducers(fromRoot.reducers)
+                })
+            ],
+            declarations: [
+                MetadataPageComponent,
+                TestHostComponent
+            ],
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should create the app', async(() => {
+        expect(app).toBeTruthy();
+        expect(store.dispatch).toHaveBeenCalledTimes(3);
+    }));
+});
diff --git a/ui/src/app/metadata/metadata.component.ts b/ui/src/app/metadata/metadata.component.ts
new file mode 100644
index 000000000..52ca814e2
--- /dev/null
+++ b/ui/src/app/metadata/metadata.component.ts
@@ -0,0 +1,24 @@
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { Store } from '@ngrx/store';
+
+import { LoadResolverRequest } from './resolver/action/collection.action';
+import { LoadFilterRequest } from './filter/action/collection.action';
+import { LoadDraftRequest } from './resolver/action/draft.action';
+import * as fromRoot from '../app.reducer';
+
+@Component({
+    selector: 'metadata-page',
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    templateUrl: './metadata.component.html',
+    styleUrls: []
+})
+export class MetadataPageComponent {
+
+    constructor(
+        private store: Store<fromRoot.State>
+    ) {
+        this.store.dispatch(new LoadResolverRequest());
+        this.store.dispatch(new LoadFilterRequest());
+        this.store.dispatch(new LoadDraftRequest());
+    }
+}
diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts
new file mode 100644
index 000000000..c0f3e3657
--- /dev/null
+++ b/ui/src/app/metadata/metadata.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+
+
+import { ResolverModule } from './resolver/resolver.module';
+import { FilterModule } from './filter/filter.module';
+import { DomainModule } from './domain/domain.module';
+import { MetadataPageComponent } from './metadata.component';
+import { ManagerModule } from './manager/manager.module';
+import { MetadataRoutingModule } from './metadata.routing';
+
+
+@NgModule({
+    imports: [
+        ResolverModule.forRoot(),
+        FilterModule.forRoot(),
+        DomainModule.forRoot(),
+        ManagerModule.forRoot(),
+        MetadataRoutingModule
+    ],
+    providers: [],
+    declarations: [
+        MetadataPageComponent
+    ]
+})
+export class MetadataModule { }
diff --git a/ui/src/app/metadata/metadata.routing.ts b/ui/src/app/metadata/metadata.routing.ts
new file mode 100644
index 000000000..4ff73f652
--- /dev/null
+++ b/ui/src/app/metadata/metadata.routing.ts
@@ -0,0 +1,90 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ManagerComponent } from './manager/container/manager.component';
+import { BlankResolverComponent } from './resolver/container/blank-resolver.component';
+import { NewResolverComponent } from './resolver/container/new-resolver.component';
+import { UploadResolverComponent } from './resolver/container/upload-resolver.component';
+import { CopyResolverComponent } from './resolver/container/copy-resolver.component';
+import { ConfirmCopyComponent } from './resolver/container/confirm-copy.component';
+import { CopyIsSetGuard } from './resolver/guard/copy-isset.guard';
+import { MetadataPageComponent } from './metadata.component';
+import { ResolverComponent } from './resolver/container/resolver.component';
+import { EditorComponent } from './resolver/container/editor.component';
+import { CanDeactivateGuard } from '../core/service/can-deactivate.guard';
+import { DraftComponent } from './resolver/container/draft.component';
+import { WizardComponent } from './resolver/container/wizard.component';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: MetadataPageComponent,
+        children: [
+            { path: '', component: ManagerComponent },
+            {
+                path: 'resolver',
+                children: [
+                    {
+                        path: 'new',
+                        component: NewResolverComponent,
+                        children: [
+                            { path: '', redirectTo: 'blank', pathMatch: 'prefix' },
+                            {
+                                path: 'blank',
+                                component: BlankResolverComponent,
+                                canDeactivate: []
+                            },
+                            {
+                                path: 'upload',
+                                component: UploadResolverComponent,
+                                canDeactivate: []
+                            },
+                            {
+                                path: 'copy',
+                                component: CopyResolverComponent,
+                                canDeactivate: []
+                            }
+                        ]
+                    },
+                    {
+                        path: 'new/copy/confirm',
+                        component: ConfirmCopyComponent,
+                        canActivate: [CopyIsSetGuard]
+                    },
+                    {
+                        path: ':id',
+                        component: ResolverComponent,
+                        canActivate: [],
+                        children: [
+                            { path: 'edit', redirectTo: 'edit/2' },
+                            {
+                                path: 'edit/:index',
+                                component: EditorComponent,
+                                canDeactivate: [CanDeactivateGuard]
+                            }
+                        ]
+                    },
+                    {
+                        path: ':entityId',
+                        component: DraftComponent,
+                        canActivate: [],
+                        children: [
+                            { path: 'wizard', redirectTo: 'wizard/2' },
+                            {
+                                path: 'wizard/:index',
+                                component: WizardComponent,
+                                canDeactivate: [CanDeactivateGuard]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class MetadataRoutingModule { }
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
new file mode 100644
index 000000000..891d34a7c
--- /dev/null
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -0,0 +1,25 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+
+@NgModule({
+    declarations: [],
+    entryComponents: [],
+    imports: [],
+    exports: []
+})
+export class ProviderModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: RootProviderModule,
+            providers: []
+        };
+    }
+}
+
+@NgModule({
+    imports: [
+        ProviderModule,
+        // StoreModule.forFeature('provider', fromResolver.reducers),
+        // EffectsModule.forFeature([])
+    ],
+})
+export class RootProviderModule { }
diff --git a/ui/src/app/metadata/resolver/action/collection.action.ts b/ui/src/app/metadata/resolver/action/collection.action.ts
new file mode 100644
index 000000000..f0aebd69a
--- /dev/null
+++ b/ui/src/app/metadata/resolver/action/collection.action.ts
@@ -0,0 +1,147 @@
+import { Action } from '@ngrx/store';
+import { MetadataResolver } from '../../domain/model';
+import { Update } from '@ngrx/entity';
+
+export enum ResolverCollectionActionTypes {
+    FIND = '[Metadata Resolver] Find',
+    SELECT = '[Metadata Resolver] Select',
+    SELECT_SUCCESS = '[Metadata Resolver] Select Success',
+
+    UPDATE_RESOLVER_REQUEST = '[Metadata Resolver] Update Request',
+    UPDATE_RESOLVER_SUCCESS = '[Metadata Resolver] Update Success',
+    UPDATE_RESOLVER_FAIL = '[Metadata Resolver] Update Fail',
+
+    LOAD_RESOLVER_REQUEST = '[Metadata Resolver Collection] Resolver REQUEST',
+    LOAD_RESOLVER_SUCCESS = '[Metadata Resolver Collection] Resolver SUCCESS',
+    LOAD_RESOLVER_ERROR = '[Metadata Resolver Collection] Resolver ERROR',
+    ADD_RESOLVER = '[Metadata Resolver Collection] Add Resolver',
+    ADD_RESOLVER_SUCCESS = '[Metadata Resolver Collection] Add Resolver Success',
+    ADD_RESOLVER_FAIL = '[Metadata Resolver Collection] Add Resolver Fail',
+    REMOVE_RESOLVER = '[Metadata Resolver Collection] Remove Resolver',
+    REMOVE_RESOLVER_SUCCESS = '[Metadata Resolver Collection] Remove Resolver Success',
+    REMOVE_RESOLVER_FAIL = '[Metadata Resolver Collection] Remove Resolver Fail',
+
+    UPLOAD_RESOLVER_REQUEST = '[Metadata Resolver Collection] Upload Resolver Request',
+    CREATE_RESOLVER_FROM_URL_REQUEST = '[Metadata Resolver Collection] Create Resolver From URL Request',
+}
+
+export class FindResolver implements Action {
+    readonly type = ResolverCollectionActionTypes.FIND;
+
+    constructor(public payload: string) { }
+}
+
+export class SelectResolver implements Action {
+    readonly type = ResolverCollectionActionTypes.SELECT;
+
+    constructor(public payload: string) { }
+}
+
+export class SelectResolverSuccess implements Action {
+    readonly type = ResolverCollectionActionTypes.SELECT_SUCCESS;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class LoadResolverRequest implements Action {
+    readonly type = ResolverCollectionActionTypes.LOAD_RESOLVER_REQUEST;
+
+    constructor() { }
+}
+
+export class LoadResolverSuccess implements Action {
+    readonly type = ResolverCollectionActionTypes.LOAD_RESOLVER_SUCCESS;
+
+    constructor(public payload: MetadataResolver[]) { }
+}
+
+export class LoadResolverError implements Action {
+    readonly type = ResolverCollectionActionTypes.LOAD_RESOLVER_ERROR;
+
+    constructor(public payload: any) { }
+}
+
+export class UpdateResolverRequest implements Action {
+    readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_REQUEST;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class UpdateResolverSuccess implements Action {
+    readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS;
+
+    constructor(public payload: Update<MetadataResolver>) { }
+}
+
+export class UpdateResolverFail implements Action {
+    readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class AddResolverRequest implements Action {
+    readonly type = ResolverCollectionActionTypes.ADD_RESOLVER;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class AddResolverSuccess implements Action {
+    readonly type = ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class AddResolverFail implements Action {
+    readonly type = ResolverCollectionActionTypes.ADD_RESOLVER_FAIL;
+
+    constructor(public payload: any) { }
+}
+
+export class RemoveResolverRequest implements Action {
+    readonly type = ResolverCollectionActionTypes.REMOVE_RESOLVER;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class RemoveResolverSuccess implements Action {
+    readonly type = ResolverCollectionActionTypes.REMOVE_RESOLVER_SUCCESS;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class RemoveResolverFail implements Action {
+    readonly type = ResolverCollectionActionTypes.REMOVE_RESOLVER_FAIL;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class UploadResolverRequest implements Action {
+    readonly type = ResolverCollectionActionTypes.UPLOAD_RESOLVER_REQUEST;
+
+    constructor(public payload: { name: string, body: string }) { }
+}
+
+export class CreateResolverFromUrlRequest implements Action {
+    readonly type = ResolverCollectionActionTypes.CREATE_RESOLVER_FROM_URL_REQUEST;
+
+    constructor(public payload: { name: string, url: string }) { }
+}
+
+export type ResolverCollectionActionsUnion =
+    | LoadResolverRequest
+    | LoadResolverSuccess
+    | LoadResolverError
+    | AddResolverRequest
+    | AddResolverSuccess
+    | AddResolverFail
+    | RemoveResolverRequest
+    | RemoveResolverSuccess
+    | RemoveResolverFail
+    | FindResolver
+    | SelectResolver
+    | SelectResolverSuccess
+    | UpdateResolverRequest
+    | UpdateResolverSuccess
+    | UpdateResolverFail
+    | UploadResolverRequest
+    | CreateResolverFromUrlRequest;
diff --git a/ui/src/app/metadata/resolver/action/copy.action.ts b/ui/src/app/metadata/resolver/action/copy.action.ts
new file mode 100644
index 000000000..8d70af76c
--- /dev/null
+++ b/ui/src/app/metadata/resolver/action/copy.action.ts
@@ -0,0 +1,53 @@
+import { Action } from '@ngrx/store';
+import { MetadataResolver } from '../../domain/model';
+
+export enum CopySourceActionTypes {
+    CREATE_RESOLVER_COPY_REQUEST = '[Copy Resolver] Create Resolver Copy Request',
+    CREATE_RESOLVER_COPY_SUCCESS = '[Copy Resolver] Create Resolver Copy Success',
+    CREATE_RESOLVER_COPY_ERROR = '[Copy Resolver] Create Resolver Copy Error',
+
+    UPDATE_RESOLVER_COPY = '[Copy Resolver] Update Resolver Copy Request',
+
+    UPDATE_RESOLVER_COPY_SECTIONS = '[Copy Resolver] Update Resolver Sections',
+
+    SAVE_RESOLVER_COPY_REQUEST = '[Copy Resolver] Save Resolver Copy Request',
+    SAVE_RESOLVER_COPY_SUCCESS = '[Copy Resolver] Save Resolver Copy Request',
+    SAVE_RESOLVER_COPY_ERROR = '[Copy Resolver] Save Resolver Copy Request',
+}
+
+export class CreateResolverCopyRequest implements Action {
+    readonly type = CopySourceActionTypes.CREATE_RESOLVER_COPY_REQUEST;
+
+    constructor(public payload: { entityId: string, serviceProviderName: string, target: string }) { }
+}
+
+export class CreateResolverCopySuccess implements Action {
+    readonly type = CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS;
+
+    constructor(public payload: MetadataResolver) { }
+}
+
+export class CreateResolverCopyError implements Action {
+    readonly type = CopySourceActionTypes.CREATE_RESOLVER_COPY_ERROR;
+
+    constructor(public payload: Error) { }
+}
+
+export class UpdateResolverCopy implements Action {
+    readonly type = CopySourceActionTypes.UPDATE_RESOLVER_COPY;
+
+    constructor(public payload: Partial<MetadataResolver>) { }
+}
+
+export class UpdateResolverCopySections implements Action {
+    readonly type = CopySourceActionTypes.UPDATE_RESOLVER_COPY_SECTIONS;
+
+    constructor(public payload: string[]) { }
+}
+
+export type CopySourceActionUnion =
+    | CreateResolverCopyRequest
+    | CreateResolverCopySuccess
+    | CreateResolverCopyError
+    | UpdateResolverCopy
+    | UpdateResolverCopySections;
diff --git a/ui/src/app/domain/action/draft-collection.action.ts b/ui/src/app/metadata/resolver/action/draft.action.ts
similarity index 58%
rename from ui/src/app/domain/action/draft-collection.action.ts
rename to ui/src/app/metadata/resolver/action/draft.action.ts
index 39a631b2c..f4bba2744 100644
--- a/ui/src/app/domain/action/draft-collection.action.ts
+++ b/ui/src/app/metadata/resolver/action/draft.action.ts
@@ -1,8 +1,8 @@
 import { Action } from '@ngrx/store';
 import { Update } from '@ngrx/entity/entity';
-import { MetadataProvider } from '../model/metadata-provider';
+import { MetadataResolver } from '../../domain/model';
 
-export enum DraftCollectionActionTypes {
+export enum DraftActionTypes {
     FIND = '[Metadata Draft] Find',
     SELECT = '[Metadata Draft] Select',
     UPDATE_DRAFT_REQUEST = '[Metadata Draft] Update Request',
@@ -21,90 +21,90 @@ export enum DraftCollectionActionTypes {
 
 
 export class FindDraft implements Action {
-    readonly type = DraftCollectionActionTypes.FIND;
+    readonly type = DraftActionTypes.FIND;
 
     constructor(public payload: string) { }
 }
 
 export class SelectDraft implements Action {
-    readonly type = DraftCollectionActionTypes.SELECT;
+    readonly type = DraftActionTypes.SELECT;
 
     constructor(public payload: string) { }
 }
 
 export class UpdateDraftRequest implements Action {
-    readonly type = DraftCollectionActionTypes.UPDATE_DRAFT_REQUEST;
+    readonly type = DraftActionTypes.UPDATE_DRAFT_REQUEST;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class UpdateDraftSuccess implements Action {
-    readonly type = DraftCollectionActionTypes.UPDATE_DRAFT_SUCCESS;
+    readonly type = DraftActionTypes.UPDATE_DRAFT_SUCCESS;
 
-    constructor(public payload: Update<MetadataProvider>) { }
+    constructor(public payload: Update<MetadataResolver>) { }
 }
 
 export class UpdateDraftFail implements Action {
-    readonly type = DraftCollectionActionTypes.UPDATE_DRAFT_FAIL;
+    readonly type = DraftActionTypes.UPDATE_DRAFT_FAIL;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class AddDraftRequest implements Action {
-    readonly type = DraftCollectionActionTypes.ADD_DRAFT;
+    readonly type = DraftActionTypes.ADD_DRAFT;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class AddDraftSuccess implements Action {
-    readonly type = DraftCollectionActionTypes.ADD_DRAFT_SUCCESS;
+    readonly type = DraftActionTypes.ADD_DRAFT_SUCCESS;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class AddDraftFail implements Action {
-    readonly type = DraftCollectionActionTypes.ADD_DRAFT_FAIL;
+    readonly type = DraftActionTypes.ADD_DRAFT_FAIL;
 
     constructor(public payload: any) { }
 }
 
 export class RemoveDraftRequest implements Action {
-    readonly type = DraftCollectionActionTypes.REMOVE_DRAFT;
+    readonly type = DraftActionTypes.REMOVE_DRAFT;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class RemoveDraftSuccess implements Action {
-    readonly type = DraftCollectionActionTypes.REMOVE_DRAFT_SUCCESS;
+    readonly type = DraftActionTypes.REMOVE_DRAFT_SUCCESS;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class RemoveDraftFail implements Action {
-    readonly type = DraftCollectionActionTypes.REMOVE_DRAFT_FAIL;
+    readonly type = DraftActionTypes.REMOVE_DRAFT_FAIL;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class LoadDraftRequest implements Action {
-    readonly type = DraftCollectionActionTypes.LOAD_DRAFT_REQUEST;
+    readonly type = DraftActionTypes.LOAD_DRAFT_REQUEST;
 
     constructor() { }
 }
 
 export class LoadDraftSuccess implements Action {
-    readonly type = DraftCollectionActionTypes.LOAD_DRAFT_SUCCESS;
+    readonly type = DraftActionTypes.LOAD_DRAFT_SUCCESS;
 
-    constructor(public payload: MetadataProvider[]) { }
+    constructor(public payload: MetadataResolver[]) { }
 }
 
 export class LoadDraftError implements Action {
-    readonly type = DraftCollectionActionTypes.LOAD_DRAFT_ERROR;
+    readonly type = DraftActionTypes.LOAD_DRAFT_ERROR;
 
     constructor(public payload: any) { }
 }
 
-export type DraftCollectionActionsUnion =
+export type DraftActionsUnion =
     | LoadDraftRequest
     | LoadDraftSuccess
     | LoadDraftError
diff --git a/ui/src/app/edit-provider/action/editor.action.ts b/ui/src/app/metadata/resolver/action/editor.action.ts
similarity index 84%
rename from ui/src/app/edit-provider/action/editor.action.ts
rename to ui/src/app/metadata/resolver/action/editor.action.ts
index 6e8744d61..80da7774e 100644
--- a/ui/src/app/edit-provider/action/editor.action.ts
+++ b/ui/src/app/metadata/resolver/action/editor.action.ts
@@ -1,5 +1,5 @@
 import { Action } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../domain/model';
 
 export const UPDATE_STATUS = '[Editor] Update Status';
 export const UPDATE_SAVED = '[Editor] Update Saved';
@@ -17,7 +17,7 @@ export class UpdateStatus implements Action {
 export class UpdateChanges implements Action {
     readonly type = UPDATE_CHANGES;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class CancelChanges implements Action {
@@ -27,7 +27,7 @@ export class CancelChanges implements Action {
 export class SaveChanges implements Action {
     readonly type = SAVE_CHANGES;
 
-    constructor(public payload: MetadataProvider) { }
+    constructor(public payload: MetadataResolver) { }
 }
 
 export class ResetChanges implements Action {
diff --git a/ui/src/app/metadata-provider/action/search.action.ts b/ui/src/app/metadata/resolver/action/search.action.ts
similarity index 72%
rename from ui/src/app/metadata-provider/action/search.action.ts
rename to ui/src/app/metadata/resolver/action/search.action.ts
index e4623c8c9..7bfdd7d5b 100644
--- a/ui/src/app/metadata-provider/action/search.action.ts
+++ b/ui/src/app/metadata/resolver/action/search.action.ts
@@ -1,10 +1,9 @@
 import { Action } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
 
 export enum SearchActionTypes {
-    SEARCH_IDS = '[Search Provider Ids] Request',
-    SEARCH_IDS_SUCCESS = '[Search Provider Ids] Success',
-    SEARCH_IDS_ERROR = '[Search Provider Ids] Error'
+    SEARCH_IDS = '[Search Resolver Ids] Request',
+    SEARCH_IDS_SUCCESS = '[Search Resolver Ids] Success',
+    SEARCH_IDS_ERROR = '[Search Resolver Ids] Error'
 }
 
 export class SearchIds implements Action {
diff --git a/ui/src/app/edit-provider/component/unsaved-dialog.component.html b/ui/src/app/metadata/resolver/component/unsaved-dialog.component.html
similarity index 100%
rename from ui/src/app/edit-provider/component/unsaved-dialog.component.html
rename to ui/src/app/metadata/resolver/component/unsaved-dialog.component.html
diff --git a/ui/src/app/edit-provider/component/unsaved-dialog.component.ts b/ui/src/app/metadata/resolver/component/unsaved-dialog.component.ts
similarity index 65%
rename from ui/src/app/edit-provider/component/unsaved-dialog.component.ts
rename to ui/src/app/metadata/resolver/component/unsaved-dialog.component.ts
index d412d069e..9373e352f 100644
--- a/ui/src/app/edit-provider/component/unsaved-dialog.component.ts
+++ b/ui/src/app/metadata/resolver/component/unsaved-dialog.component.ts
@@ -1,14 +1,10 @@
 import { Component, Input, OnChanges } from '@angular/core';
 
-import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store, Action } from '@ngrx/store';
 import { Subject } from 'rxjs/Subject';
 
-import { MetadataProvider } from '../../domain/model/metadata-provider';
 import * as fromEditor from '../reducer';
-import { UpdateDraftRequest } from '../../domain/action/draft-collection.action';
-import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
-import { SaveChanges, CancelChanges } from '../action/editor.action';
 
 @Component({
     selector: 'unsaved-dialog',
diff --git a/ui/src/app/edit-provider/component/wizard-nav.component.html b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
similarity index 100%
rename from ui/src/app/edit-provider/component/wizard-nav.component.html
rename to ui/src/app/metadata/resolver/component/wizard-nav.component.html
diff --git a/ui/src/app/edit-provider/component/wizard-nav.component.spec.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
similarity index 87%
rename from ui/src/app/edit-provider/component/wizard-nav.component.spec.ts
rename to ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
index ec5369a06..edca7821c 100644
--- a/ui/src/app/edit-provider/component/wizard-nav.component.spec.ts
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
@@ -4,9 +4,10 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { WizardNavComponent } from './wizard-nav.component';
-import * as fromEditor from '../reducer';
-import { ProviderEditorFormModule } from '../../metadata-provider/component/index';
+import * as fromResolver from '../reducer';
+import { ProviderEditorFormModule } from '../../domain/component';
 import { DomainModule } from '../../domain/domain.module';
+import { SharedModule } from '../../../shared/shared.module';
 
 @Component({
     template:
@@ -35,7 +36,7 @@ class TestHostComponent {
 
 describe('Wizard Nav Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
-    let store: Store<fromEditor.State>;
+    let store: Store<fromResolver.State>;
     let instance: TestHostComponent;
     let wizard: WizardNavComponent;
 
@@ -45,10 +46,11 @@ describe('Wizard Nav Component', () => {
             imports: [
                 NoopAnimationsModule,
                 StoreModule.forRoot({
-                    'edit-provider': combineReducers(fromEditor.reducers),
+                    'resolver': combineReducers(fromResolver.reducers),
                 }),
                 ReactiveFormsModule,
                 DomainModule,
+                SharedModule,
                 ProviderEditorFormModule
             ],
             declarations: [TestHostComponent, WizardNavComponent],
diff --git a/ui/src/app/edit-provider/component/wizard-nav.component.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
similarity index 99%
rename from ui/src/app/edit-provider/component/wizard-nav.component.ts
rename to ui/src/app/metadata/resolver/component/wizard-nav.component.ts
index 5131b5771..ab9dd677e 100644
--- a/ui/src/app/edit-provider/component/wizard-nav.component.ts
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
@@ -1,9 +1,7 @@
 import { Component, Input, Output, EventEmitter, OnChanges } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-
 import { Store } from '@ngrx/store';
-
 import * as fromEditor from '../reducer';
 import { WIZARD as WizardDef, EditorFlowDefinition } from '../editor-definition.const';
 
diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.html b/ui/src/app/metadata/resolver/container/blank-resolver.component.html
similarity index 91%
rename from ui/src/app/metadata-provider/container/blank-provider.component.html
rename to ui/src/app/metadata/resolver/container/blank-resolver.component.html
index 0f37f6b5b..923d35548 100644
--- a/ui/src/app/metadata-provider/container/blank-provider.component.html
+++ b/ui/src/app/metadata/resolver/container/blank-resolver.component.html
@@ -24,19 +24,19 @@ <h3 class="tag tag-primary">
             <fieldset class="bg-light border rounded p-4">
                 <div class="form-group">
                     <label for="serviceProviderName">
-                        <ng-container i18n="@@label--service-provider-name-dashboard-display-only">Service Provider Name (Dashboard Display Only)</ng-container>
+                        <ng-container i18n="@@label--service-resolver-name-dashboard-display-only">Service Resolver Name (Dashboard Display Only)</ng-container>
                         <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
                     </label>
                     <input id="serviceProviderName" type="text" class="form-control" placeholder="" formControlName="serviceProviderName" />
                     <ng-container *ngIf="providerForm.get('serviceProviderName').touched && providerForm.get('serviceProviderName').invalid">
                         <small class="form-text text-danger" *ngIf="providerForm.get('serviceProviderName').hasError('required')">
-                            <ng-container i18n="@@message--service-provider-name-required">Service Provider Name is required</ng-container>
+                            <ng-container i18n="@@message--service-resolver-name-required">Service Resolver Name is required</ng-container>
                         </small>
                     </ng-container>
                 </div>
                 <div class="form-group">
                     <label for="entityId">
-                        <ng-container i18n="@@label--service-provider-entity-id">Service Provider Entity ID</ng-container>
+                        <ng-container i18n="@@label--service-resolver-entity-id">Service Resolver Entity ID</ng-container>
                         <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
                     </label>
                     <input id="entityId" type="text" class="form-control" placeholder="" formControlName="entityId" />
diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.spec.ts b/ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts
similarity index 57%
rename from ui/src/app/metadata-provider/container/blank-provider.component.spec.ts
rename to ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts
index e6f1e2eec..ff012f877 100644
--- a/ui/src/app/metadata-provider/container/blank-provider.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/blank-resolver.component.spec.ts
@@ -2,31 +2,29 @@ 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 { NewProviderComponent } from './new-provider.component';
-import * as fromCollections from '../../domain/reducer';
-import { BlankProviderComponent } from './blank-provider.component';
-import { UploadProviderComponent } from './upload-provider.component';
+import * as fromResolver from '../reducer';
+import { BlankResolverComponent } from './blank-resolver.component';
 
-describe('Blank Provider Page', () => {
-    let fixture: ComponentFixture<BlankProviderComponent>;
-    let store: Store<fromCollections.State>;
-    let instance: BlankProviderComponent;
+describe('Blank Resolver Page', () => {
+    let fixture: ComponentFixture<BlankResolverComponent>;
+    let store: Store<fromResolver.State>;
+    let instance: BlankResolverComponent;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [
                 NoopAnimationsModule,
                 StoreModule.forRoot({
-                    collections: combineReducers(fromCollections.reducers),
+                    resolver: combineReducers(fromResolver.reducers),
                 }),
                 ReactiveFormsModule,
             ],
             declarations: [
-                BlankProviderComponent
+                BlankResolverComponent
             ],
         });
 
-        fixture = TestBed.createComponent(BlankProviderComponent);
+        fixture = TestBed.createComponent(BlankResolverComponent);
         instance = fixture.componentInstance;
         store = TestBed.get(Store);
 
diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.ts b/ui/src/app/metadata/resolver/container/blank-resolver.component.ts
similarity index 50%
rename from ui/src/app/metadata-provider/container/blank-provider.component.ts
rename to ui/src/app/metadata/resolver/container/blank-resolver.component.ts
index 8d4fef304..b82c8c6fa 100644
--- a/ui/src/app/metadata-provider/container/blank-provider.component.ts
+++ b/ui/src/app/metadata/resolver/container/blank-resolver.component.ts
@@ -4,32 +4,30 @@ import {
     Output,
     EventEmitter
 } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormControlName, Validators, AbstractControl } from '@angular/forms';
-import { Observable, Subject } from 'rxjs';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 
-import { AddDraftRequest } from '../../domain/action/draft-collection.action';
-import { AddProviderRequest, UploadProviderRequest } from '../../domain/action/provider-collection.action';
-import * as fromCollections from '../../domain/reducer';
+import { AddDraftRequest } from '../action/draft.action';
+import * as fromResolver from '../reducer';
 import { EntityValidators } from '../../domain/service/entity-validators.service';
-import { MetadataProvider } from '../../domain/domain.type';
-import { Provider } from '../../domain/entity/provider';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity/resolver/file-backed-http-metadata-resolver';
 
 @Component({
-    selector: 'blank-provider-form',
-    templateUrl: './blank-provider.component.html'
+    selector: 'blank-resolver-form',
+    templateUrl: './blank-resolver.component.html'
 })
-export class BlankProviderComponent implements OnInit {
+export class BlankResolverComponent implements OnInit {
     @Output() save: EventEmitter<any> = new EventEmitter();
 
     providerForm: FormGroup;
     ids$: Observable<string[]>;
 
     constructor(
-        private store: Store<fromCollections.CollectionState>,
+        private store: Store<fromResolver.ResolverState>,
         private fb: FormBuilder
     ) {
-        this.ids$ = this.store.select(fromCollections.getAllEntityIds);
+        this.ids$ = this.store.select(fromResolver.getAllEntityIds);
     }
 
     ngOnInit(): void {
@@ -40,10 +38,10 @@ export class BlankProviderComponent implements OnInit {
     }
 
     next(): void {
-        const val: MetadataProvider = new Provider({
+        const val = new FileBackedHttpMetadataResolver({
             entityId: this.providerForm.get('entityId').value,
             serviceProviderName: this.providerForm.get('serviceProviderName').value
         });
         this.store.dispatch(new AddDraftRequest(val));
     }
-} /* istanbul ignore next */
+}
diff --git a/ui/src/app/metadata-provider/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
similarity index 94%
rename from ui/src/app/metadata-provider/container/confirm-copy.component.html
rename to ui/src/app/metadata/resolver/container/confirm-copy.component.html
index eb0b7881e..3939bf935 100644
--- a/ui/src/app/metadata-provider/container/confirm-copy.component.html
+++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -27,7 +27,7 @@ <h3 class="tag tag-primary">
                     </h3>
                 </li>
                 <li class="nav-item">
-                    <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave(provider)" [disabled]="saving$ | async">
+                    <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave(resolver)" [disabled]="saving$ | async">
                         <span class="label pull-left" i18n="@@action--save">Save</span>
                         <span class="direction pull-right">
                             <i class="fa fa-fw fa-save next d-block fa-2x"></i>
@@ -36,7 +36,7 @@ <h3 class="tag tag-primary">
                     </button>
                 </li>
             </ul>
-            <finish-form [provider]="values$ | async"></finish-form>
+            <finish-form [resolver]="values$ | async"></finish-form>
         </div>
     </section>
 </div>
diff --git a/ui/src/app/metadata-provider/container/confirm-copy.component.scss b/ui/src/app/metadata/resolver/container/confirm-copy.component.scss
similarity index 100%
rename from ui/src/app/metadata-provider/container/confirm-copy.component.scss
rename to ui/src/app/metadata/resolver/container/confirm-copy.component.scss
diff --git a/ui/src/app/metadata-provider/container/confirm-copy.component.spec.ts b/ui/src/app/metadata/resolver/container/confirm-copy.component.spec.ts
similarity index 100%
rename from ui/src/app/metadata-provider/container/confirm-copy.component.spec.ts
rename to ui/src/app/metadata/resolver/container/confirm-copy.component.spec.ts
diff --git a/ui/src/app/metadata-provider/container/confirm-copy.component.ts b/ui/src/app/metadata/resolver/container/confirm-copy.component.ts
similarity index 61%
rename from ui/src/app/metadata-provider/container/confirm-copy.component.ts
rename to ui/src/app/metadata/resolver/container/confirm-copy.component.ts
index 05579d3e4..42bbff14b 100644
--- a/ui/src/app/metadata-provider/container/confirm-copy.component.ts
+++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.ts
@@ -4,12 +4,11 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
 import * as fromProvider from '../reducer';
-import { MetadataProvider } from '../../domain/domain.type';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { MetadataResolver } from '../../domain/model';
 import { ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
-import { UpdateProviderCopy } from '../action/copy.action';
+import { UpdateResolverCopy } from '../action/copy.action';
 import { map, take } from 'rxjs/operators';
-import { AddProviderRequest } from '../../domain/action/provider-collection.action';
+import { AddResolverRequest } from '../action/collection.action';
 
 @Component({
     selector: 'confirm-copy-page',
@@ -18,11 +17,11 @@ import { AddProviderRequest } from '../../domain/action/provider-collection.acti
 })
 export class ConfirmCopyComponent {
 
-    copy$: Observable<MetadataProvider>;
-    values$: Observable<MetadataProvider>;
+    copy$: Observable<MetadataResolver>;
+    values$: Observable<MetadataResolver>;
     saving$: Observable<boolean>;
 
-    provider: MetadataProvider;
+    resolver: MetadataResolver;
 
     constructor(
         private store: Store<fromProvider.State>,
@@ -32,12 +31,12 @@ export class ConfirmCopyComponent {
         this.saving$ = this.store.select(fromProvider.getSaving);
 
         this.values$ = this.copy$.pipe(take(1));
-        this.valueEmitter.changeEmitted$.subscribe(changes => this.store.dispatch(new UpdateProviderCopy(changes)));
+        this.valueEmitter.changeEmitted$.subscribe(changes => this.store.dispatch(new UpdateResolverCopy(changes)));
 
-        this.copy$.subscribe(p => this.provider = p);
+        this.copy$.subscribe(p => this.resolver = p);
     }
 
-    onSave(provider: MetadataProvider): void {
-        this.store.dispatch(new AddProviderRequest(provider));
+    onSave(resolver: MetadataResolver): void {
+        this.store.dispatch(new AddResolverRequest(resolver));
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/container/copy-provider.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
similarity index 97%
rename from ui/src/app/metadata-provider/container/copy-provider.component.html
rename to ui/src/app/metadata/resolver/container/copy-resolver.component.html
index 1fd0f0763..62f420492 100644
--- a/ui/src/app/metadata-provider/container/copy-provider.component.html
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
@@ -38,7 +38,7 @@ <h3 class="tag tag-primary">
                     </auto-complete>
                     <ng-container *ngIf="providerForm.get('serviceProviderName').touched && providerForm.get('serviceProviderName').invalid">
                         <small class="form-text text-danger" *ngIf="providerForm.get('serviceProviderName').hasError('required')">
-                            <ng-container i18n="@@message--service-provider-name-required"></ng-container>
+                            <ng-container i18n="@@message--service-resolver-name-required"></ng-container>
                         </small>
                     </ng-container>
                 </div>
@@ -50,13 +50,13 @@ <h3 class="tag tag-primary">
                     <input id="serviceProviderName" type="text" class="form-control" placeholder="" formControlName="serviceProviderName" />
                     <ng-container *ngIf="providerForm.get('serviceProviderName').touched && providerForm.get('serviceProviderName').invalid">
                         <small class="form-text text-danger" *ngIf="providerForm.get('serviceProviderName').hasError('required')">
-                            <ng-container i18n="@@message--service-provider-name-required">Service Provider Name is required</ng-container>
+                            <ng-container i18n="@@message--service-resolver-name-required">Service Resolver Name is required</ng-container>
                         </small>
                     </ng-container>
                 </div>
                 <div class="form-group">
                     <label for="entityId">
-                        <ng-container i18n="@@label--service-provider-entity-id">New Entity ID</ng-container>
+                        <ng-container i18n="@@label--service-resolver-entity-id">New Entity ID</ng-container>
                         <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
                     </label>
                     <input id="entityId" type="text" class="form-control" placeholder="" formControlName="entityId" />
diff --git a/ui/src/app/metadata-provider/container/copy-provider.component.spec.ts b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
similarity index 65%
rename from ui/src/app/metadata-provider/container/copy-provider.component.spec.ts
rename to ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
index 1a1b3b406..ee432a7f4 100644
--- a/ui/src/app/metadata-provider/container/copy-provider.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
@@ -3,44 +3,40 @@ 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 { NewProviderComponent } from './new-provider.component';
-import * as fromCollections from '../../domain/reducer';
-import * as fromProvider from '../reducer';
-import { CopyProviderComponent } from './copy-provider.component';
-import { SharedModule } from '../../shared/shared.module';
-import { NavigatorService } from '../../core/service/navigator.service';
-import { I18nTextComponent } from '../../domain/component/i18n-text.component';
+import * as fromResolver from '../reducer';
+import { CopyResolverComponent } from './copy-resolver.component';
+import { SharedModule } from '../../../shared/shared.module';
+import { NavigatorService } from '../../../core/service/navigator.service';
+import { I18nTextComponent } from '../../../shared/component/i18n-text.component';
 
 @Component({
-    template: `<copy-provider-form
-                (save)="onSave($event)"></copy-provider-form>`
+    template: `<copy-resolver-form
+                (save)="onSave($event)"></copy-resolver-form>`
 })
 class TestHostComponent {
-    @ViewChild(CopyProviderComponent)
-    public formUnderTest: CopyProviderComponent;
+    @ViewChild(CopyResolverComponent)
+    public formUnderTest: CopyResolverComponent;
 
     onSave(event: any): void {}
 }
 
-describe('Copy Provider Page', () => {
+describe('Copy Resolver Page', () => {
     let fixture: ComponentFixture<TestHostComponent>;
-    let store: Store<fromCollections.State>;
-    let instance: CopyProviderComponent;
+    let store: Store<fromResolver.State>;
+    let instance: CopyResolverComponent;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [
                 NoopAnimationsModule,
                 StoreModule.forRoot({
-                    collections: combineReducers(fromCollections.reducers),
-                    provider: combineReducers(fromProvider.reducers)
+                    resolver: combineReducers(fromResolver.reducers)
                 }),
                 ReactiveFormsModule,
                 SharedModule
             ],
             declarations: [
-                CopyProviderComponent,
-                I18nTextComponent,
+                CopyResolverComponent,
                 TestHostComponent
             ],
             providers: [
diff --git a/ui/src/app/metadata-provider/container/copy-provider.component.ts b/ui/src/app/metadata/resolver/container/copy-resolver.component.ts
similarity index 76%
rename from ui/src/app/metadata-provider/container/copy-provider.component.ts
rename to ui/src/app/metadata/resolver/container/copy-resolver.component.ts
index c7b59b141..aec11cdb5 100644
--- a/ui/src/app/metadata-provider/container/copy-provider.component.ts
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.ts
@@ -10,21 +10,21 @@ import { Store } from '@ngrx/store';
 
 import { startWith, take, last } from 'rxjs/operators';
 
-import { AddDraftRequest } from '../../domain/action/draft-collection.action';
-import { AddProviderRequest, UploadProviderRequest } from '../../domain/action/provider-collection.action';
-import * as fromCollections from '../../domain/reducer';
+import { AddDraftRequest } from '../action/draft.action';
+import { AddResolverRequest, UploadResolverRequest } from '../action/collection.action';
+import * as fromResolver from '../reducer';
 import { EntityValidators } from '../../domain/service/entity-validators.service';
 import { SearchIds } from '../action/search.action';
 import * as fromProvider from '../reducer';
-import { Provider } from '../../domain/entity/provider';
-import { CreateProviderCopyRequest, UpdateProviderCopySections} from '../action/copy.action';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
+import { CreateResolverCopyRequest, UpdateResolverCopySections } from '../action/copy.action';
 
 
 @Component({
-    selector: 'copy-provider-form',
-    templateUrl: './copy-provider.component.html'
+    selector: 'copy-resolver-form',
+    templateUrl: './copy-resolver.component.html'
 })
-export class CopyProviderComponent implements OnInit {
+export class CopyResolverComponent implements OnInit {
     @Output() save: EventEmitter<any> = new EventEmitter();
 
     providerForm: FormGroup;
@@ -48,10 +48,10 @@ export class CopyProviderComponent implements OnInit {
     sections$ = of(this.sections);
 
     constructor(
-        private store: Store<fromCollections.CollectionState>,
+        private store: Store<fromResolver.ResolverState>,
         private fb: FormBuilder
     ) {
-        this.ids$ = this.store.select(fromCollections.getAllEntityIds);
+        this.ids$ = this.store.select(fromResolver.getAllEntityIds);
         this.searchResults$ = this.store.select(fromProvider.getSearchResults);
         this.selected$ = this.store.select(fromProvider.getSectionsToCopy);
 
@@ -78,23 +78,23 @@ export class CopyProviderComponent implements OnInit {
     }
 
     next(): void {
-        this.store.dispatch(new CreateProviderCopyRequest({
+        this.store.dispatch(new CreateResolverCopyRequest({
             ...this.providerForm.value
         }));
     }
 
     onChange(attr: string): void {
         this.store.dispatch(
-            new UpdateProviderCopySections(
+            new UpdateResolverCopySections(
                 this.selected.indexOf(attr) > -1 ? this.selected.filter(a => a !== attr) : [...this.selected, attr]
             )
         );
     }
 
     onCheckAll(): void {
-        this.store.dispatch(new UpdateProviderCopySections(this.sections.map(section => section.property)));
+        this.store.dispatch(new UpdateResolverCopySections(this.sections.map(section => section.property)));
     }
     onCheckNone(event: Event | null = null): void {
-        this.store.dispatch(new UpdateProviderCopySections([]));
+        this.store.dispatch(new UpdateResolverCopySections([]));
     }
 }
diff --git a/ui/src/app/edit-provider/container/provider.component.html b/ui/src/app/metadata/resolver/container/draft.component.html
similarity index 100%
rename from ui/src/app/edit-provider/container/provider.component.html
rename to ui/src/app/metadata/resolver/container/draft.component.html
diff --git a/ui/src/app/edit-provider/container/draft.component.ts b/ui/src/app/metadata/resolver/container/draft.component.ts
similarity index 70%
rename from ui/src/app/edit-provider/container/draft.component.ts
rename to ui/src/app/metadata/resolver/container/draft.component.ts
index 490cf594c..b1838f18e 100644
--- a/ui/src/app/edit-provider/container/draft.component.ts
+++ b/ui/src/app/metadata/resolver/container/draft.component.ts
@@ -6,22 +6,20 @@ import { distinctUntilChanged, map } from 'rxjs/operators';
 
 import { Store } from '@ngrx/store';
 import { NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
-
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { SelectDraft } from '../../domain/action/draft-collection.action';
-import * as fromCollection from '../../domain/reducer';
+import { SelectDraft } from '../action/draft.action';
+import * as fromCollection from '../reducer';
 
 @Component({
-    selector: 'provider-page',
-    templateUrl: './provider.component.html',
-    styleUrls: ['./provider.component.scss'],
+    selector: 'resolver-page',
+    templateUrl: './resolver.component.html',
+    styleUrls: ['./resolver.component.scss'],
     providers: [NgbPopoverConfig]
 })
 export class DraftComponent implements OnDestroy {
     actionsSubscription: Subscription;
 
     constructor(
-        store: Store<fromCollection.CollectionState>,
+        store: Store<fromCollection.State>,
         route: ActivatedRoute
     ) {
         this.actionsSubscription = route.params.pipe(
diff --git a/ui/src/app/edit-provider/container/editor.component.html b/ui/src/app/metadata/resolver/container/editor.component.html
similarity index 86%
rename from ui/src/app/edit-provider/container/editor.component.html
rename to ui/src/app/metadata/resolver/container/editor.component.html
index 5e387e595..422a1cbc2 100644
--- a/ui/src/app/edit-provider/container/editor.component.html
+++ b/ui/src/app/metadata/resolver/container/editor.component.html
@@ -1,9 +1,9 @@
-<div class="container-fluid p-3" *ngIf="provider$ | async" role="main">
-    <section class="section" [attr.aria-label]="'Edit metadata source - ' + (provider$ | async).serviceProviderName" tabindex="0">
+<div class="container-fluid p-3" *ngIf="resolver$ | async" role="main">
+    <section class="section" [attr.aria-label]="'Edit metadata source - ' + (resolver$ | async).serviceProviderName" tabindex="0">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
                 <div class="col-md-12">
-                    <span class="display-6"><i class="fa fa-fw fa-gears"></i> Edit Metadata Source - {{ (provider$ | async).serviceProviderName }}</span>
+                    <span class="display-6"><i class="fa fa-fw fa-gears"></i> Edit Metadata Source - {{ (resolver$ | async).serviceProviderName }}</span>
                 </div>
             </div>
         </div>
@@ -83,17 +83,17 @@
                 </div>
                 <div class="col-lg-9" *ngIf="latest">
                     <div [ngSwitch]="editorIndex$ | async" class="px-3">
-                        <adv-info-form *ngSwitchDefault [provider]="latest$ | async"></adv-info-form>
-                        <metadata-ui-form *ngSwitchCase="3" [provider]="latest$ | async"></metadata-ui-form>
-                        <descriptor-info-form *ngSwitchCase="4" [provider]="latest$ | async"></descriptor-info-form>
-                        <logout-form *ngSwitchCase="5" [provider]="latest$ | async"></logout-form>
-                        <key-info-form *ngSwitchCase="6" [provider]="latest$ | async"></key-info-form>
-                        <assertion-form *ngSwitchCase="7" [provider]="latest$ | async"></assertion-form>
+                        <adv-info-form *ngSwitchDefault [resolver]="latest$ | async" [ids]="ids$"></adv-info-form>
+                        <metadata-ui-form *ngSwitchCase="3" [resolver]="latest$ | async"></metadata-ui-form>
+                        <descriptor-info-form *ngSwitchCase="4" [resolver]="latest$ | async"></descriptor-info-form>
+                        <logout-form *ngSwitchCase="5" [resolver]="latest$ | async"></logout-form>
+                        <key-info-form *ngSwitchCase="6" [resolver]="latest$ | async"></key-info-form>
+                        <assertion-form *ngSwitchCase="7" [resolver]="latest$ | async"></assertion-form>
                         <div class="row" *ngSwitchCase="8">
-                            <relying-party-form [provider]="latest$ | async" class="form-section col-xl-6"></relying-party-form>
+                            <relying-party-form [resolver]="latest$ | async" class="form-section col-xl-6"></relying-party-form>
                         </div>
                         <div class="row" *ngSwitchCase="9">
-                            <attribute-release-form [provider]="latest$ | async" class="form-section col-xl-6"></attribute-release-form>
+                            <attribute-release-form [resolver]="latest$ | async" class="form-section col-xl-6"></attribute-release-form>
                         </div>
                     </div>
                 </div>
diff --git a/ui/src/app/edit-provider/container/editor.component.ts b/ui/src/app/metadata/resolver/container/editor.component.ts
similarity index 73%
rename from ui/src/app/edit-provider/container/editor.component.ts
rename to ui/src/app/metadata/resolver/container/editor.component.ts
index b8a84c50f..6aa252abe 100644
--- a/ui/src/app/edit-provider/container/editor.component.ts
+++ b/ui/src/app/metadata/resolver/container/editor.component.ts
@@ -1,29 +1,23 @@
 import {
     Component,
-    ViewChild,
-    AfterViewInit,
     OnInit,
-    OnDestroy,
-    EventEmitter
+    OnDestroy
 } from '@angular/core';
 import {
     ActivatedRoute,
     Router,
-    CanDeactivate,
     ActivatedRouteSnapshot,
     RouterStateSnapshot
 } from '@angular/router';
-import { FormBuilder, FormGroup, FormControl, Validators, NgModel } from '@angular/forms';
 import { Observable, Subject, of } from 'rxjs';
 import { combineLatest, map, takeUntil, withLatestFrom, debounceTime, skipWhile, distinctUntilChanged } from 'rxjs/operators';
 
 import { Store } from '@ngrx/store';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap/modal/modal';
 
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import * as fromProviders from '../../domain/reducer';
-import { UpdateProviderRequest } from '../../domain/action/provider-collection.action';
-import * as fromEditor from '../reducer';
+import { MetadataResolver } from '../../domain/model/metadata-resolver';
+import * as fromResolver from '../reducer';
+import { UpdateResolverRequest } from '../action/collection.action';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { UpdateStatus, UpdateChanges, CancelChanges } from '../action/editor.action';
@@ -43,15 +37,17 @@ export class EditorComponent implements OnInit, OnDestroy {
     modified = false;
     open = false;
 
-    changes$: Observable<MetadataProvider>;
-    changes: MetadataProvider;
-    updates: MetadataProvider;
-    latest: MetadataProvider;
-    latest$: Observable<MetadataProvider>;
+    changes$: Observable<MetadataResolver>;
+    changes: MetadataResolver;
+    updates: MetadataResolver;
+    latest: MetadataResolver;
+    latest$: Observable<MetadataResolver>;
 
-    provider$: Observable<MetadataProvider>;
+    ids$: Observable<string[]>;
+
+    resolver$: Observable<MetadataResolver>;
     providerName$: Observable<string>;
-    provider: MetadataProvider;
+    resolver: MetadataResolver;
     editorIndex$: Observable<number>;
     editor$: Observable<any[]>;
     editor: EditorFlowDefinition[];
@@ -65,35 +61,44 @@ export class EditorComponent implements OnInit, OnDestroy {
     wizardIsInvalid$: Observable<boolean>;
 
     constructor(
-        private store: Store<fromProviders.State>,
+        private store: Store<fromResolver.State>,
         private route: ActivatedRoute,
         private router: Router,
         private statusEmitter: ProviderStatusEmitter,
         private valueEmitter: ProviderValueEmitter,
         private modalService: NgbModal
     ) {
-        this.provider$ = this.store.select(fromProviders.getSelectedProvider);
-        this.changes$ = this.store.select(fromEditor.getEditorChanges);
+        this.resolver$ = this.store.select(fromResolver.getSelectedResolver);
+        this.changes$ = this.store.select(fromResolver.getEditorChanges);
 
-        this.latest$ = this.provider$.pipe(
+        this.latest$ = this.resolver$.pipe(
             combineLatest(this.changes$, (base, changes) => Object.assign({}, base, changes))
         );
 
-        this.providerName$ = this.provider$.pipe(map(p => p.serviceProviderName));
-        this.changes$ = this.store.select(fromEditor.getEditorChanges);
+        this.providerName$ = this.resolver$.pipe(map(p => p.serviceProviderName));
+        this.changes$ = this.store.select(fromResolver.getEditorChanges);
         this.editorIndex$ = this.route.params.pipe(map(params => Number(params.index)));
         this.currentPage$ = this.editorIndex$.pipe(map(index => EditorDef.find(r => r.index === index)));
         this.editor = EditorDef;
-        this.store.select(fromEditor.getEditorIsSaving).pipe(
+        this.store.select(fromResolver.getEditorIsSaving).pipe(
             takeUntil(this.ngUnsubscribe)
         ).subscribe(saving => this.saving = saving);
 
-        this.wizardIsValid$ = this.store.select(fromEditor.getEditorIsValid);
+        this.wizardIsValid$ = this.store.select(fromResolver.getEditorIsValid);
         this.wizardIsInvalid$ = this.wizardIsValid$.pipe(map(valid => !valid));
+
+        this.ids$ = this.store
+            .select(fromResolver.getAllEntityIds)
+            .pipe(
+                takeUntil(this.ngUnsubscribe),
+                combineLatest(this.store.select(fromResolver.getSelectedResolver), (ids: string[], provider: MetadataResolver) => {
+                    return ids.filter(id => provider.entityId !== id);
+                })
+            );
     }
 
     save(): void {
-        this.store.dispatch(new UpdateProviderRequest({
+        this.store.dispatch(new UpdateResolverRequest({
             ...this.latest,
             ...this.changes,
             ...this.updates
@@ -113,9 +118,9 @@ export class EditorComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit(): void {
-        this.provider$.pipe(
+        this.resolver$.pipe(
             takeUntil(this.ngUnsubscribe)
-        ).subscribe(provider => this.provider = provider);
+        ).subscribe(resolver => this.resolver = resolver);
         this.changes$.pipe(
             takeUntil(this.ngUnsubscribe)
         ).subscribe(changes => this.changes = changes);
@@ -143,7 +148,7 @@ export class EditorComponent implements OnInit, OnDestroy {
             skipWhile(() => this.saving)
         ).subscribe(latest => this.latest = latest);
 
-        this.invalidForms$ = this.store.select(fromEditor.getInvalidEditorForms);
+        this.invalidForms$ = this.store.select(fromResolver.getInvalidEditorForms);
 
         this.invalidForms$.pipe(
             distinctUntilChanged(),
@@ -170,7 +175,7 @@ export class EditorComponent implements OnInit, OnDestroy {
         if (nextState.url.match('edit')) { return of(true); }
         if (Object.keys({ ...this.changes }).length > 0) {
             let modal = this.modalService.open(UnsavedDialogComponent);
-            modal.componentInstance.provider = this.latest;
+            modal.componentInstance.resolver = this.latest;
             modal.componentInstance.message = 'editor';
             modal.componentInstance.action = new CancelChanges();
             modal.result.then(
@@ -178,6 +183,6 @@ export class EditorComponent implements OnInit, OnDestroy {
                 () => console.warn('denied')
             );
         }
-        return this.store.select(fromEditor.getEditorIsSaved);
+        return this.store.select(fromResolver.getEditorIsSaved);
     }
 }
diff --git a/ui/src/app/metadata-provider/container/new-provider.component.html b/ui/src/app/metadata/resolver/container/new-resolver.component.html
similarity index 93%
rename from ui/src/app/metadata-provider/container/new-provider.component.html
rename to ui/src/app/metadata/resolver/container/new-resolver.component.html
index ed4b65186..da87cfc6c 100644
--- a/ui/src/app/metadata-provider/container/new-provider.component.html
+++ b/ui/src/app/metadata/resolver/container/new-resolver.component.html
@@ -3,7 +3,7 @@
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
                 <div class="col-md-12">
-                    <span class="display-6" i18n="@@label--add-a-new-metadata-provider">Add a new metadata source</span>
+                    <span class="display-6" i18n="@@label--add-a-new-metadata-resolver">Add a new metadata source</span>
                 </div>
             </div>
         </div>
@@ -13,7 +13,7 @@ <h3 i18n="@@label--how-are-you-adding-the-metadata-information">How are you addi
             <div class="row">
                 <div class="col col-xl-6 col-lg-9 col-xs-12">
                     <div class="d-flex justify-content-between">
-                        <div class="provider-nav-option">
+                        <div class="resolver-nav-option">
                             <button type="button"
                                 class="btn btn-lg btn-block btn-secondary"
                                 aria-label="Upload local metadata file or use a metadata URL"
@@ -27,7 +27,7 @@ <h3 i18n="@@label--how-are-you-adding-the-metadata-information">How are you addi
                         <div class="">
                             <span class="subheading-1">&nbsp;<ng-container i18n="@@label--or">or</ng-container>&nbsp;</span>
                         </div>
-                        <div class="provider-nav-option">
+                        <div class="resolver-nav-option">
                             <button type="button"
                                 class="btn btn-lg btn-block btn-secondary"
                                 aria-label="Create metadata source using the wizard"
@@ -41,7 +41,7 @@ <h3 i18n="@@label--how-are-you-adding-the-metadata-information">How are you addi
                         <div class="">
                             <span class="subheading-1">&nbsp;<ng-container i18n="@@label--or">or</ng-container>&nbsp;</span>
                         </div>
-                        <div class="provider-nav-option">
+                        <div class="resolver-nav-option">
                             <button type="button"
                                 class="btn btn-lg btn-block btn-secondary"
                                 aria-label="Copy a metadata source"
diff --git a/ui/src/app/metadata-provider/container/new-provider.component.scss b/ui/src/app/metadata/resolver/container/new-resolver.component.scss
similarity index 57%
rename from ui/src/app/metadata-provider/container/new-provider.component.scss
rename to ui/src/app/metadata/resolver/container/new-resolver.component.scss
index ac956e4e7..ea5993713 100644
--- a/ui/src/app/metadata-provider/container/new-provider.component.scss
+++ b/ui/src/app/metadata/resolver/container/new-resolver.component.scss
@@ -1,5 +1,5 @@
 :host {
-    .provider-nav-option {
+    .resolver-nav-option {
         width: 160px;
     }
 }
\ No newline at end of file
diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts
new file mode 100644
index 000000000..ec374d4d8
--- /dev/null
+++ b/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts
@@ -0,0 +1,60 @@
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterModule, ActivatedRoute } from '@angular/router';
+import { APP_BASE_HREF } from '@angular/common';
+
+import { StoreModule, Store } from '@ngrx/store';
+import { NewResolverComponent } from './new-resolver.component';
+
+import { BlankResolverComponent } from './blank-resolver.component';
+import { UploadResolverComponent } from './upload-resolver.component';
+import { CopyResolverComponent } from './copy-resolver.component';
+import { SharedModule } from '../../../shared/shared.module';
+import { NavigatorService } from '../../../core/service/navigator.service';
+import * as fromResolver from '../reducer';
+import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
+import { I18nTextComponent } from '../../../shared/component/i18n-text.component';
+
+describe('New Resolver Page', () => {
+    let fixture: ComponentFixture<NewResolverComponent>;
+    let store: Store<fromResolver.State>;
+    let instance: NewResolverComponent;
+    let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub();
+    activatedRoute.testParamMap = { id: 'foo' };
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NoopAnimationsModule,
+                StoreModule.forRoot(fromResolver.reducers),
+                ReactiveFormsModule,
+                SharedModule,
+                RouterModule.forRoot([])
+            ],
+            declarations: [
+                NewResolverComponent,
+                BlankResolverComponent,
+                UploadResolverComponent,
+                CopyResolverComponent
+            ],
+            providers: [
+                NavigatorService,
+                { provide: ActivatedRoute, useValue: activatedRoute },
+                { provide: APP_BASE_HREF, useValue: '/' }
+            ]
+        });
+
+        fixture = TestBed.createComponent(NewResolverComponent);
+        instance = fixture.componentInstance;
+        store = TestBed.get(Store);
+
+        spyOn(store, 'dispatch').and.callThrough();
+    });
+
+    it('should compile', () => {
+        fixture.detectChanges();
+
+        expect(fixture).toBeDefined();
+    });
+});
diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.ts b/ui/src/app/metadata/resolver/container/new-resolver.component.ts
new file mode 100644
index 000000000..f7f71726c
--- /dev/null
+++ b/ui/src/app/metadata/resolver/container/new-resolver.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+    selector: 'new-resolver-page',
+    templateUrl: './new-resolver.component.html',
+    styleUrls: ['./new-resolver.component.scss']
+})
+export class NewResolverComponent {
+    constructor() {}
+} /* istanbul ignore next */
diff --git a/ui/src/app/metadata/resolver/container/resolver.component.html b/ui/src/app/metadata/resolver/container/resolver.component.html
new file mode 100644
index 000000000..90c6b6463
--- /dev/null
+++ b/ui/src/app/metadata/resolver/container/resolver.component.html
@@ -0,0 +1 @@
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/ui/src/app/edit-provider/container/provider.component.scss b/ui/src/app/metadata/resolver/container/resolver.component.scss
similarity index 100%
rename from ui/src/app/edit-provider/container/provider.component.scss
rename to ui/src/app/metadata/resolver/container/resolver.component.scss
diff --git a/ui/src/app/edit-provider/container/provider.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver.component.spec.ts
similarity index 73%
rename from ui/src/app/edit-provider/container/provider.component.spec.ts
rename to ui/src/app/metadata/resolver/container/resolver.component.spec.ts
index a86a52c43..d875994a9 100644
--- a/ui/src/app/edit-provider/container/provider.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/resolver.component.spec.ts
@@ -4,15 +4,14 @@ import { APP_BASE_HREF } from '@angular/common';
 import { RouterModule, ActivatedRoute } from '@angular/router';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { ProviderComponent } from './provider.component';
-import * as fromCollections from '../../domain/reducer';
-import { ActivatedRouteStub } from '../../../testing/activated-route.stub';
-import { routes } from '../editor.module';
+import { ResolverComponent } from './resolver.component';
+import * as fromCollections from '../reducer';
+import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 
-describe('Provider Select (Editor) Page', () => {
-    let fixture: ComponentFixture<ProviderComponent>;
+describe('Resolver Select (Editor) Page', () => {
+    let fixture: ComponentFixture<ResolverComponent>;
     let store: Store<fromCollections.State>;
-    let instance: ProviderComponent;
+    let instance: ResolverComponent;
     let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub();
     activatedRoute.testParamMap = { id: 'foo' };
 
@@ -30,10 +29,10 @@ describe('Provider Select (Editor) Page', () => {
                 ReactiveFormsModule,
                 RouterModule.forRoot([])
             ],
-            declarations: [ProviderComponent],
+            declarations: [ResolverComponent],
         });
 
-        fixture = TestBed.createComponent(ProviderComponent);
+        fixture = TestBed.createComponent(ResolverComponent);
         instance = fixture.componentInstance;
         store = TestBed.get(Store);
 
diff --git a/ui/src/app/metadata/resolver/container/resolver.component.ts b/ui/src/app/metadata/resolver/container/resolver.component.ts
new file mode 100644
index 000000000..8cac5c479
--- /dev/null
+++ b/ui/src/app/metadata/resolver/container/resolver.component.ts
@@ -0,0 +1,34 @@
+import { Component, OnDestroy } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+
+import { Store } from '@ngrx/store';
+import { NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
+
+import { SelectResolver } from '../action/collection.action';
+import * as fromProviders from '../reducer';
+
+@Component({
+    selector: 'resolver-page',
+    templateUrl: './resolver.component.html',
+    styleUrls: ['./resolver.component.scss'],
+    providers: [NgbPopoverConfig]
+})
+export class ResolverComponent implements OnDestroy {
+    actionsSubscription: Subscription;
+
+    constructor(
+        store: Store<fromProviders.State>,
+        route: ActivatedRoute
+    ) {
+        this.actionsSubscription = route.params.pipe(
+            distinctUntilChanged(),
+            map(params => new SelectResolver(params.id))
+        ).subscribe(store);
+    }
+
+    ngOnDestroy() {
+        this.actionsSubscription.unsubscribe();
+    }
+} /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.html b/ui/src/app/metadata/resolver/container/upload-resolver.component.html
similarity index 86%
rename from ui/src/app/metadata-provider/container/upload-provider.component.html
rename to ui/src/app/metadata/resolver/container/upload-resolver.component.html
index 3b00d5e1a..11ce69a7a 100644
--- a/ui/src/app/metadata-provider/container/upload-provider.component.html
+++ b/ui/src/app/metadata/resolver/container/upload-resolver.component.html
@@ -9,7 +9,7 @@ <h3 class="tag tag-primary">
                     </h3>
                 </li>
                 <li class="nav-item">
-                    <button class="nav-link next btn clearfix" (click)="save()" [disabled]="providerForm.invalid" aria-label="Save metadata provider" role="button">
+                    <button class="nav-link next btn clearfix" (click)="save()" [disabled]="providerForm.invalid" aria-label="Save metadata resolver" role="button">
                         <span class="label pull-left" i18n="@@action--save">
                             Save
                         </span>
@@ -23,20 +23,20 @@ <h3 class="tag tag-primary">
             <fieldset class="bg-light border rounded p-4">
                 <div class="form-group">
                     <label for="serviceProviderName">
-                        <ng-container i18n="@@label--service-provider-name-dashboard-display-only">Service Provider Name (Dashboard Display Only)</ng-container>
+                        <ng-container i18n="@@label--service-resolver-name-dashboard-display-only">Service Resolver Name (Dashboard Display Only)</ng-container>
                         <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
                     </label>
                     <input id="serviceProviderName" type="text" class="form-control" placeholder="" formControlName="serviceProviderName" />
                     <ng-container *ngIf="providerForm.get('serviceProviderName').touched && providerForm.get('serviceProviderName').invalid">
                         <small class="form-text text-danger"
                             *ngIf="providerForm.get('serviceProviderName').hasError('required')"
-                            i18n="@@message--service-provider-name-required">
-                            Service Provider Name is required
+                            i18n="@@message--service-resolver-name-required">
+                            Service Resolver Name is required
                         </small>
                     </ng-container>
                 </div>
                 <div class="form-group">
-                    <label i18n="@@label--service-provider-file" for="fileInput">Select Provider Metadata File</label>
+                    <label i18n="@@label--service-resolver-file" for="fileInput">Select Resolver Metadata File</label>
                     <div class="custom-file d-block">
                         <input id="fileInput" type="file" name="file" class="custom-file-input" (change)="fileChange($event)" />
                         <label for="fileInput" class="custom-file-label">
@@ -51,7 +51,7 @@ <h3 class="tag tag-primary">
                     &mdash;
                 </div>
                 <div class="form-group">
-                    <label i18n="@@label--service-provider-metadata-url" for="url">Service Provider Metadata URL</label>
+                    <label i18n="@@label--service-resolver-metadata-url" for="url">Service Resolver Metadata URL</label>
                     <input id="url" type="text" class="form-control" placeholder="" formControlName="url" />
                 </div>
                 <div class="alert alert-danger" role="alert">
diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts b/ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts
similarity index 83%
rename from ui/src/app/metadata-provider/container/upload-provider.component.spec.ts
rename to ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts
index afcba83c2..0c66244c8 100644
--- a/ui/src/app/metadata-provider/container/upload-provider.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/upload-resolver.component.spec.ts
@@ -4,20 +4,19 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 
-import { UploadProviderComponent } from './upload-provider.component';
-import { FileService } from '../../core/service/file.service';
-import { FileServiceStub } from '../../../testing/file.service.stub';
-import * as fromProvider from '../reducer';
-import * as fromCollections from '../../domain/reducer';
+import { UploadResolverComponent } from './upload-resolver.component';
+import { FileService } from '../../../core/service/file.service';
+import { FileServiceStub } from '../../../../testing/file.service.stub';
+import * as fromResolver from '../reducer';
 
 @Component({
-    template: `<upload-provider-form
+    template: `<upload-resolver-form
                 (upload)="upload($event)"
-                (fromUrl)="createFromUrl($event)"></upload-provider-form>`
+                (fromUrl)="createFromUrl($event)"></upload-resolver-form>`
 })
 class TestHostComponent {
-    @ViewChild(UploadProviderComponent)
-    public formUnderTest: UploadProviderComponent;
+    @ViewChild(UploadResolverComponent)
+    public formUnderTest: UploadResolverComponent;
 
     upload(event: Event): void {}
     createFromUrl(event: Event): void {}
@@ -30,10 +29,10 @@ const getFakeFile = (str: string) => {
     return <File>blob;
 };
 
-describe('Upload Provider Page', () => {
+describe('Upload Resolver Page', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let form: UploadProviderComponent;
+    let form: UploadResolverComponent;
     let fileService: FileServiceStub;
 
     beforeEach(() => {
@@ -43,13 +42,10 @@ describe('Upload Provider Page', () => {
             ],
             imports: [
                 ReactiveFormsModule,
-                StoreModule.forRoot({
-                    collections: combineReducers(fromCollections.reducers),
-                    provider: combineReducers(fromProvider.reducers)
-                }),
+                StoreModule.forRoot(fromResolver.reducers),
             ],
             declarations: [
-                UploadProviderComponent,
+                UploadResolverComponent,
                 TestHostComponent
             ],
         });
diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.ts b/ui/src/app/metadata/resolver/container/upload-resolver.component.ts
similarity index 73%
rename from ui/src/app/metadata-provider/container/upload-provider.component.ts
rename to ui/src/app/metadata/resolver/container/upload-resolver.component.ts
index 57ddec391..4bebb200f 100644
--- a/ui/src/app/metadata-provider/container/upload-provider.component.ts
+++ b/ui/src/app/metadata/resolver/container/upload-resolver.component.ts
@@ -1,18 +1,17 @@
 import { Component, OnInit, OnDestroy, Output, EventEmitter } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormControlName, Validators, AbstractControl } from '@angular/forms';
-import { Observable, Subject } from 'rxjs';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Subject } from 'rxjs';
 import { takeUntil, debounceTime } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
-import { EntityValidators } from '../../domain/service/entity-validators.service';
-import { FileService } from '../../core/service/file.service';
-import * as fromCollections from '../../domain/reducer';
-import { UploadProviderRequest, CreateProviderFromUrlRequest } from '../../domain/action/provider-collection.action';
+import { FileService } from '../../../core/service/file.service';
+import * as fromResolver from '../reducer';
+import { UploadResolverRequest, CreateResolverFromUrlRequest } from '../action/collection.action';
 
 @Component({
-    selector: 'upload-provider-form',
-    templateUrl: './upload-provider.component.html'
+    selector: 'upload-resolver-form',
+    templateUrl: './upload-resolver.component.html'
 })
-export class UploadProviderComponent implements OnInit, OnDestroy {
+export class UploadResolverComponent implements OnInit, OnDestroy {
     private ngUnsubscribe: Subject<void> = new Subject<void>();
 
     @Output() upload: EventEmitter<any> = new EventEmitter();
@@ -26,7 +25,7 @@ export class UploadProviderComponent implements OnInit, OnDestroy {
     constructor(
         private fb: FormBuilder,
         private fileService: FileService,
-        private store: Store<fromCollections.CollectionState>
+        private store: Store<fromResolver.State>
     ) {}
 
     ngOnInit(): void {
@@ -63,7 +62,7 @@ export class UploadProviderComponent implements OnInit, OnDestroy {
 
     saveFromFile(file: File, name: string): void {
         this.fileService.readAsText(file).subscribe(txt => {
-            this.store.dispatch(new UploadProviderRequest({
+            this.store.dispatch(new UploadResolverRequest({
                 name: name,
                 body: txt as string
             }));
@@ -71,7 +70,7 @@ export class UploadProviderComponent implements OnInit, OnDestroy {
     }
 
     saveFromUrl(values: {serviceProviderName: string, url: string}): void {
-        this.store.dispatch(new CreateProviderFromUrlRequest({
+        this.store.dispatch(new CreateResolverFromUrlRequest({
             name: values.serviceProviderName,
             url: values.url
         }));
diff --git a/ui/src/app/edit-provider/container/wizard.component.html b/ui/src/app/metadata/resolver/container/wizard.component.html
similarity index 59%
rename from ui/src/app/edit-provider/container/wizard.component.html
rename to ui/src/app/metadata/resolver/container/wizard.component.html
index 0a1d7117a..5987c1837 100644
--- a/ui/src/app/edit-provider/container/wizard.component.html
+++ b/ui/src/app/metadata/resolver/container/wizard.component.html
@@ -1,12 +1,12 @@
 <div class="container-fluid p-3" role="main">
-    <section class="section" *ngIf="provider$ | async" tabindex="0" [attr.aria-label]="'Add a new metadata source wizard form - ' + (currentPage$ | async).label + ' ' + (provider$ | async).serviceProviderName">
+    <section class="section" *ngIf="resolver$ | async" tabindex="0" [attr.aria-label]="'Add a new metadata source wizard form - ' + (currentPage$ | async).label + ' ' + (resolver$ | async).serviceProviderName">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
                 <div class="col-md-12">
                     <span class="display-6" role="heading" aria-level="1">
                         <i class="fa fa-fw fa-plus-square"></i>
-                        <ng-container i18n="@@message--add-new-md-provider">Add a new metadata source</ng-container>
-                        &ndash; {{ (currentPage$ | async).label }} ({{ (provider$ | async).serviceProviderName }})
+                        <ng-container i18n="@@message--add-new-md-resolver">Add a new metadata source</ng-container>
+                        &ndash; {{ (currentPage$ | async).label }} ({{ (resolver$ | async).serviceProviderName }})
                         <span class="pull-right">
                             (<ng-container i18n="@@message--wizard-status">Step {{ wizardIndex$ | async }} of {{ wizard.length + 1 }}</ng-container>)
                         </span>
@@ -21,19 +21,19 @@
                 (onSave)="save($event)"></wizard-nav>
             <hr />
             <div [ngSwitch]="wizardIndex$ | async" class="py-4">
-                <org-info-form *ngSwitchDefault [provider]="provider$ | async"></org-info-form>
-                <metadata-ui-form *ngSwitchCase="3" [provider]="provider$ | async"></metadata-ui-form>
-                <descriptor-info-form *ngSwitchCase="4" [provider]="provider$ | async"></descriptor-info-form>
-                <logout-form *ngSwitchCase="5" [provider]="provider$ | async"></logout-form>
-                <key-info-form *ngSwitchCase="6" [provider]="provider$ | async"></key-info-form>
-                <assertion-form *ngSwitchCase="7" [provider]="provider$ | async"></assertion-form>
+                <org-info-form *ngSwitchDefault [resolver]="resolver$ | async"></org-info-form>
+                <metadata-ui-form *ngSwitchCase="3" [resolver]="resolver$ | async"></metadata-ui-form>
+                <descriptor-info-form *ngSwitchCase="4" [resolver]="resolver$ | async"></descriptor-info-form>
+                <logout-form *ngSwitchCase="5" [resolver]="resolver$ | async"></logout-form>
+                <key-info-form *ngSwitchCase="6" [resolver]="resolver$ | async"></key-info-form>
+                <assertion-form *ngSwitchCase="7" [resolver]="resolver$ | async"></assertion-form>
                 <div class="row" *ngSwitchCase="8">
-                    <relying-party-form [provider]="provider$ | async" class="col-xl-6"></relying-party-form>
+                    <relying-party-form [resolver]="resolver$ | async" class="col-xl-6"></relying-party-form>
                 </div>
                 <div class="row" *ngSwitchCase="9">
-                    <attribute-release-form [provider]="provider$ | async" class="col-xl-6"></attribute-release-form>
+                    <attribute-release-form [resolver]="resolver$ | async" class="col-xl-6"></attribute-release-form>
                 </div>
-                <finish-form *ngSwitchCase="10" [provider]="provider$ | async"></finish-form>
+                <finish-form *ngSwitchCase="10" [resolver]="resolver$ | async"></finish-form>
             </div>
         </div>
     </section>
diff --git a/ui/src/app/edit-provider/container/wizard.component.scss b/ui/src/app/metadata/resolver/container/wizard.component.scss
similarity index 100%
rename from ui/src/app/edit-provider/container/wizard.component.scss
rename to ui/src/app/metadata/resolver/container/wizard.component.scss
diff --git a/ui/src/app/edit-provider/container/wizard.component.ts b/ui/src/app/metadata/resolver/container/wizard.component.ts
similarity index 82%
rename from ui/src/app/edit-provider/container/wizard.component.ts
rename to ui/src/app/metadata/resolver/container/wizard.component.ts
index d7020cd73..cdb75652b 100644
--- a/ui/src/app/edit-provider/container/wizard.component.ts
+++ b/ui/src/app/metadata/resolver/container/wizard.component.ts
@@ -1,15 +1,11 @@
 import {
     Component,
-    ViewChild,
-    AfterViewInit,
     OnInit,
-    OnDestroy,
-    EventEmitter
+    OnDestroy
 } from '@angular/core';
 import {
     ActivatedRoute,
     Router,
-    CanDeactivate,
     ActivatedRouteSnapshot,
     RouterStateSnapshot
 } from '@angular/router';
@@ -19,16 +15,16 @@ import { Store } from '@ngrx/store';
 
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import * as fromCollections from '../../domain/reducer';
-import * as draftActions from '../../domain/action/draft-collection.action';
-import { AddProviderRequest, RemoveProviderRequest } from '../../domain/action/provider-collection.action';
+import { MetadataResolver } from '../../domain/model/metadata-resolver';
+import * as fromCollections from '../reducer';
+import * as draftActions from '../action/draft.action';
+import { AddResolverRequest } from '../action/collection.action';
 import * as fromEditor from '../reducer';
 
 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';
+import { CanComponentDeactivate } from '../../../core/service/can-deactivate.guard';
 
 import { UnsavedDialogComponent } from '../component/unsaved-dialog.component';
 
@@ -42,12 +38,12 @@ export class WizardComponent implements OnInit, OnDestroy, CanComponentDeactivat
 
     private ngUnsubscribe: Subject<void> = new Subject<void>();
 
-    provider$: Observable<MetadataProvider>;
-    provider: MetadataProvider;
+    resolver$: Observable<MetadataResolver>;
+    resolver: MetadataResolver;
     providerName$: Observable<string>;
-    changes$: Observable<MetadataProvider>;
-    changes: MetadataProvider;
-    latest: MetadataProvider;
+    changes$: Observable<MetadataResolver>;
+    changes: MetadataResolver;
+    latest: MetadataResolver;
 
     wizardIndex$: Observable<number>;
     currentPage$: Observable<any>;
@@ -64,8 +60,8 @@ export class WizardComponent implements OnInit, OnDestroy, CanComponentDeactivat
         private valueEmitter: ProviderValueEmitter,
         private modalService: NgbModal
     ) {
-        this.provider$ = this.store.select(fromCollections.getSelectedDraft);
-        this.providerName$ = this.provider$.pipe(
+        this.resolver$ = this.store.select(fromCollections.getSelectedDraft);
+        this.providerName$ = this.resolver$.pipe(
             map(p => p.serviceProviderName)
         );
         this.changes$ = this.store.select(fromEditor.getEditorChanges);
@@ -80,7 +76,7 @@ export class WizardComponent implements OnInit, OnDestroy, CanComponentDeactivat
     }
 
     save(): void {
-        this.store.dispatch(new AddProviderRequest(this.latest));
+        this.store.dispatch(new AddResolverRequest(this.latest));
     }
 
     next(index: number): void {
@@ -101,10 +97,10 @@ export class WizardComponent implements OnInit, OnDestroy, CanComponentDeactivat
     }
 
     subscribe(): void {
-        this.provider$.pipe(
+        this.resolver$.pipe(
             takeUntil(this.ngUnsubscribe),
             skipWhile(() => this.saving)
-        ).subscribe(provider => this.provider = provider);
+        ).subscribe(resolver => this.resolver = resolver);
         this.changes$.pipe(
             takeUntil(this.ngUnsubscribe),
             skipWhile(() => this.saving)
@@ -112,7 +108,7 @@ export class WizardComponent implements OnInit, OnDestroy, CanComponentDeactivat
         this.changes$.pipe(
             takeUntil(this.ngUnsubscribe),
             skipWhile(() => this.saving),
-            combineLatest(this.provider$, (changes, base) => ({ ...base, ...changes }))
+            combineLatest(this.resolver$, (changes, base) => ({ ...base, ...changes }))
         ).subscribe(latest => this.latest = latest);
 
         this.valueEmitter
diff --git a/ui/src/app/edit-provider/editor-definition.const.ts b/ui/src/app/metadata/resolver/editor-definition.const.ts
similarity index 56%
rename from ui/src/app/edit-provider/editor-definition.const.ts
rename to ui/src/app/metadata/resolver/editor-definition.const.ts
index f78590f36..2ffc4afa9 100644
--- a/ui/src/app/edit-provider/editor-definition.const.ts
+++ b/ui/src/app/metadata/resolver/editor-definition.const.ts
@@ -1,13 +1,13 @@
-import { AdvancedInfoFormComponent } from '../metadata-provider/component/forms/advanced-info-form.component';
-import { OrganizationInfoFormComponent } from '../metadata-provider/component/forms/organization-info-form.component';
-import { MetadataUiFormComponent } from '../metadata-provider/component/forms/metadata-ui-form.component';
-import { KeyInfoFormComponent } from '../metadata-provider/component/forms/key-info-form.component';
-import { LogoutFormComponent } from '../metadata-provider/component/forms/logout-form.component';
-import { AssertionFormComponent } from '../metadata-provider/component/forms/assertion-form.component';
-import { DescriptorInfoFormComponent } from '../metadata-provider/component/forms/descriptor-info-form.component';
-import { RelyingPartyFormComponent } from '../metadata-provider/component/forms/relying-party-form.component';
-import { AttributeReleaseFormComponent } from '../metadata-provider/component/forms/attribute-release-form.component';
-import { FinishFormComponent } from '../metadata-provider/component/forms/finish-form.component';
+import { AdvancedInfoFormComponent } from '../domain/component/forms/advanced-info-form.component';
+import { OrganizationInfoFormComponent } from '../domain/component/forms/organization-info-form.component';
+import { MetadataUiFormComponent } from '../domain/component/forms/metadata-ui-form.component';
+import { KeyInfoFormComponent } from '../domain/component/forms/key-info-form.component';
+import { LogoutFormComponent } from '../domain/component/forms/logout-form.component';
+import { AssertionFormComponent } from '../domain/component/forms/assertion-form.component';
+import { DescriptorInfoFormComponent } from '../domain/component/forms/descriptor-info-form.component';
+import { RelyingPartyFormComponent } from '../domain/component/forms/relying-party-form.component';
+import { AttributeReleaseFormComponent } from '../domain/component/forms/attribute-release-form.component';
+import { FinishFormComponent } from '../domain/component/forms/finish-form.component';
 
 export interface EditorFlowDefinition {
     index: number;
diff --git a/ui/src/app/metadata/resolver/effect/collection.effect.spec.ts b/ui/src/app/metadata/resolver/effect/collection.effect.spec.ts
new file mode 100644
index 000000000..a04482061
--- /dev/null
+++ b/ui/src/app/metadata/resolver/effect/collection.effect.spec.ts
@@ -0,0 +1,42 @@
+import { TestBed } from '@angular/core/testing';
+import { Actions } from '@ngrx/effects';
+import { Router } from '@angular/router';
+
+import { TestActions, getActions } from '../../../../testing/effect.util';
+import { MetadataResolver } from '../../domain/model';
+import { ResolverCollectionEffects } from './collection.effects';
+import { ResolverService } from '../../domain/service/resolver.service';
+import { RouterStub } from '../../../../testing/router.stub';
+
+describe('Resolver Collection Effects', () => {
+    let effects: ResolverCollectionEffects;
+    let draftService: any;
+    let actions$: TestActions;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [
+                ResolverCollectionEffects,
+                {
+                    provide: ResolverService,
+                    useValue: {
+                        query: () => { },
+                        find: (id: string) => { },
+                        save: (e: MetadataResolver) => { },
+                        update: (e: MetadataResolver) => { },
+                        remove: (e: MetadataResolver) => { },
+                        preview: (e: MetadataResolver) => { },
+                        upload: (name: string, xml: string) => { },
+                        createFromUrl: (name: string, url: string) => { }
+                    },
+                },
+                { provide: Actions, useFactory: getActions },
+                { provide: Router, useClass: RouterStub }
+            ],
+        });
+
+        effects = TestBed.get(ResolverCollectionEffects);
+        draftService = TestBed.get(ResolverService);
+        actions$ = TestBed.get(Actions);
+    });
+});
diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts
new file mode 100644
index 000000000..cb237aace
--- /dev/null
+++ b/ui/src/app/metadata/resolver/effect/collection.effects.ts
@@ -0,0 +1,148 @@
+import { Injectable } from '@angular/core';
+import { Effect, Actions, ofType } from '@ngrx/effects';
+import { Router } from '@angular/router';
+
+import { of } from 'rxjs';
+import { map, catchError, switchMap, tap } from 'rxjs/operators';
+
+import * as providerActions from '../action/collection.action';
+import * as draftActions from '../action/draft.action';
+import { ResolverCollectionActionTypes } from '../action/collection.action';
+import { ResolverService } from '../../domain/service/resolver.service';
+import { removeNulls } from '../../../shared/util';
+
+/* istanbul ignore next */
+@Injectable()
+export class ResolverCollectionEffects {
+
+    @Effect()
+    loadResolvers$ = this.actions$.pipe(
+        ofType<providerActions.LoadResolverRequest>(ResolverCollectionActionTypes.LOAD_RESOLVER_REQUEST),
+        switchMap(() =>
+            this.descriptorService
+                .query()
+                .pipe(
+                    map(descriptors => new providerActions.LoadResolverSuccess(descriptors)),
+                    catchError(error => of(new providerActions.LoadResolverError(error)))
+                )
+        )
+    );
+
+    @Effect()
+    updateResolver$ = this.actions$.pipe(
+        ofType<providerActions.UpdateResolverRequest>(ResolverCollectionActionTypes.UPDATE_RESOLVER_REQUEST),
+        map(action => action.payload),
+        switchMap(provider => {
+            delete provider.modifiedDate;
+            delete provider.createdDate;
+            return this.descriptorService
+                .update(provider)
+                .pipe(
+                    map(p => new providerActions.UpdateResolverSuccess({
+                        id: p.id,
+                        changes: p
+                    })),
+                    catchError(err => of(new providerActions.UpdateResolverFail(provider)))
+                );
+        })
+    );
+
+    @Effect({ dispatch: false })
+    updateResolverSuccessRedirect$ = this.actions$.pipe(
+        ofType<providerActions.UpdateResolverSuccess>(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS),
+        map(action => action.payload),
+        tap(provider => this.router.navigate(['metadata']))
+    );
+
+    @Effect()
+    updateResolverSuccessReload$ = this.actions$.pipe(
+        ofType<providerActions.UpdateResolverSuccess>(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS),
+        map(action => action.payload),
+        map(provider => new providerActions.LoadResolverRequest())
+    );
+
+    @Effect()
+    selectResolver$ = this.actions$.pipe(
+        ofType<providerActions.SelectResolver>(ResolverCollectionActionTypes.SELECT),
+        map(action => action.payload),
+        switchMap(id =>
+            this.descriptorService
+                .find(id)
+                .pipe(
+                    map(p => new providerActions.SelectResolverSuccess(p))
+                )
+        )
+    );
+
+    @Effect()
+    addResolverRequest$ = this.actions$.pipe(
+        ofType<providerActions.AddResolverRequest>(ResolverCollectionActionTypes.ADD_RESOLVER),
+        map(action => action.payload),
+        map(provider => ({
+            ...provider,
+            relyingPartyOverrides: removeNulls(provider.relyingPartyOverrides)
+        })),
+        switchMap(provider =>
+            this.descriptorService
+                .save(provider)
+                .pipe(
+                    map(p => new providerActions.AddResolverSuccess(p)),
+                    catchError(() => of(new providerActions.AddResolverFail(provider)))
+                )
+        )
+    );
+
+    @Effect({ dispatch: false })
+    addResolverSuccessRedirect$ = this.actions$.pipe(
+        ofType<providerActions.AddResolverSuccess>(ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS),
+        map(action => action.payload),
+        tap(provider => this.router.navigate(['metadata']))
+    );
+    @Effect()
+    addResolverSuccessReload$ = this.actions$.pipe(
+        ofType<providerActions.AddResolverSuccess>(ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS),
+        map(action => action.payload),
+        map(provider => new providerActions.LoadResolverRequest())
+    );
+
+    @Effect()
+    addResolverSuccessRemoveDraft$ = this.actions$.pipe(
+        ofType<providerActions.AddResolverSuccess>(ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS),
+        map(action => action.payload),
+        map(provider => new draftActions.RemoveDraftRequest(provider))
+    );
+
+    @Effect()
+    uploadResolverRequest$ = this.actions$.pipe(
+        ofType<providerActions.UploadResolverRequest>(ResolverCollectionActionTypes.UPLOAD_RESOLVER_REQUEST),
+        map(action => action.payload),
+        switchMap(file =>
+            this.descriptorService
+                .upload(file.name, file.body)
+                .pipe(
+                    map(p => new providerActions.AddResolverSuccess(p)),
+                    catchError(() => of(new providerActions.AddResolverFail(file)))
+                )
+        )
+    );
+
+    @Effect()
+    createResolverFromUrlRequest$ = this.actions$.pipe(
+        ofType<providerActions.CreateResolverFromUrlRequest>(ResolverCollectionActionTypes.CREATE_RESOLVER_FROM_URL_REQUEST),
+        map(action => action.payload),
+        switchMap(file =>
+            this.descriptorService
+                .createFromUrl(file.name, file.url)
+                .pipe(
+                    map(p => new providerActions.AddResolverSuccess(p)),
+                    catchError(() => of(new providerActions.AddResolverFail(file)))
+                )
+        )
+    );
+
+    constructor(
+        private descriptorService: ResolverService,
+        private actions$: Actions,
+        private router: Router
+    ) { }
+} /* istanbul ignore next */
diff --git a/ui/src/app/metadata-provider/effect/copy.effect.ts b/ui/src/app/metadata/resolver/effect/copy.effect.ts
similarity index 54%
rename from ui/src/app/metadata-provider/effect/copy.effect.ts
rename to ui/src/app/metadata/resolver/effect/copy.effect.ts
index f3b5473d1..cc020a9dd 100644
--- a/ui/src/app/metadata-provider/effect/copy.effect.ts
+++ b/ui/src/app/metadata/resolver/effect/copy.effect.ts
@@ -5,53 +5,53 @@ import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
 import { switchMap, map, withLatestFrom } from 'rxjs/operators';
 
-import * as fromProvider from '../reducer';
-import * as fromCollection from '../../domain/reducer';
+import * as fromResolver from '../reducer';
 
 import {
     CopySourceActionUnion,
     CopySourceActionTypes,
-    CreateProviderCopyRequest,
-    CreateProviderCopySuccess,
-    CreateProviderCopyError
+    CreateResolverCopyRequest,
+    CreateResolverCopySuccess,
+    CreateResolverCopyError
 } from '../action/copy.action';
-import { Provider } from '../../domain/entity/provider';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
+import { removeNulls } from '../../../shared/util';
 
 
 @Injectable()
-export class CopyProviderEffects {
+export class CopyResolverEffects {
 
     @Effect()
     copyRequest$ = this.actions$.pipe(
-        ofType<CreateProviderCopyRequest>(CopySourceActionTypes.CREATE_PROVIDER_COPY_REQUEST),
+        ofType<CreateResolverCopyRequest>(CopySourceActionTypes.CREATE_RESOLVER_COPY_REQUEST),
         map(action => action.payload),
         withLatestFrom(
-            this.store.select(fromCollection.getProviderCollection),
-            this.store.select(fromProvider.getSectionsToCopy)
+            this.store.select(fromResolver.getAllResolvers),
+            this.store.select(fromResolver.getSectionsToCopy)
         ),
         switchMap(([attrs, providers, sections]) => {
             const { serviceProviderName, entityId } = attrs;
             const provider = providers.find(p => p.entityId === attrs.target);
-            const copied = sections.reduce((c, section) => ({ ...c, ...{[section]: provider[section] } }), {});
+            const copied = removeNulls(sections.reduce((c, section) => ({ ...c, ...{[section]: provider[section] } }), {}));
             const action = provider ?
-                new CreateProviderCopySuccess(new Provider({
+                new CreateResolverCopySuccess(new FileBackedHttpMetadataResolver({
                     serviceProviderName,
                     entityId,
                     ...copied
                 })) :
-                new CreateProviderCopyError(new Error('Not found'));
+                new CreateResolverCopyError(new Error('Not found'));
             return of(action);
         }));
 
     @Effect({ dispatch: false })
     copyOnCreation$ = this.actions$.pipe(
-        ofType<CopySourceActionUnion>(CopySourceActionTypes.CREATE_PROVIDER_COPY_SUCCESS),
-        switchMap(() => this.router.navigate(['/new/copy/confirm']))
+        ofType<CopySourceActionUnion>(CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS),
+        switchMap(() => this.router.navigate(['metadata', 'resolver', 'new', 'copy', 'confirm']))
     );
 
     constructor(
         private actions$: Actions,
-        private store: Store<fromProvider.State>,
+        private store: Store<fromResolver.State>,
         private router: Router
     ) { }
 }
diff --git a/ui/src/app/domain/effect/draft-collection.effect.spec.ts b/ui/src/app/metadata/resolver/effect/draft-collection.effect.spec.ts
similarity index 60%
rename from ui/src/app/domain/effect/draft-collection.effect.spec.ts
rename to ui/src/app/metadata/resolver/effect/draft-collection.effect.spec.ts
index cb12586de..1c951e718 100644
--- a/ui/src/app/domain/effect/draft-collection.effect.spec.ts
+++ b/ui/src/app/metadata/resolver/effect/draft-collection.effect.spec.ts
@@ -1,16 +1,14 @@
-import { TestBed, tick, fakeAsync } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { Actions } from '@ngrx/effects';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { empty, Observable, of } from 'rxjs';
 
-import { TestActions, getActions } from '../../../testing/effect.util';
+import { TestActions, getActions } from '../../../../testing/effect.util';
 import { DraftCollectionEffects, getPayload } from './draft-collection.effects';
-import { EntityDraftService } from '../service/entity-draft.service';
-import { MetadataProvider } from '../domain.type';
+import { EntityDraftService } from '../../domain/service/draft.service';
+import { MetadataResolver } from '../../domain/model';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { LoadDraftRequest, AddDraftRequest } from '../action/draft-collection.action';
-import { Provider } from '../entity/provider';
+import { RouterStub } from '../../../../testing/router.stub';
+import { AddDraftRequest } from '../action/draft.action';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
 
 describe('Draft Collection Effects', () => {
     let effects: DraftCollectionEffects;
@@ -26,9 +24,9 @@ describe('Draft Collection Effects', () => {
                     useValue: {
                         query: () => { },
                         find: (id: string) => { },
-                        save: (provider: MetadataProvider) => { },
-                        remove: (provider: MetadataProvider) => { },
-                        update: (provider: MetadataProvider) => { }
+                        save: (provider: MetadataResolver) => { },
+                        remove: (provider: MetadataResolver) => { },
+                        update: (provider: MetadataResolver) => { }
                     },
                 },
                 { provide: Actions, useFactory: getActions },
@@ -43,7 +41,7 @@ describe('Draft Collection Effects', () => {
 
     describe('getPayload', () => {
         it('should return the action payload', () => {
-            const payload = new Provider({ id: 'foo' });
+            const payload = new FileBackedHttpMetadataResolver({ id: 'foo' });
             const action = new AddDraftRequest(payload);
             expect(getPayload(action)).toEqual(payload);
         });
diff --git a/ui/src/app/domain/effect/draft-collection.effects.ts b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
similarity index 69%
rename from ui/src/app/domain/effect/draft-collection.effects.ts
rename to ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
index e113cf840..49bc7eb5e 100644
--- a/ui/src/app/domain/effect/draft-collection.effects.ts
+++ b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
@@ -1,17 +1,13 @@
 import { Injectable } from '@angular/core';
 import { Effect, Actions, ofType } from '@ngrx/effects';
-import { Action } from '@ngrx/store';
-import { Update } from '@ngrx/entity';
 import { Router } from '@angular/router';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { switchMap, map, catchError, tap } from 'rxjs/operators';
 
-import { DraftCollectionActionTypes, DraftCollectionActionsUnion } from '../action/draft-collection.action';
-import * as actions from '../action/draft-collection.action';
-
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDraftService } from '../../domain/service/entity-draft.service';
+import { DraftActionTypes } from '../action/draft.action';
+import * as actions from '../action/draft.action';
+import { EntityDraftService } from '../../domain/service/draft.service';
 
 export const getPayload = (action: any) => action.payload;
 
@@ -21,7 +17,7 @@ export class DraftCollectionEffects {
 
     @Effect()
     loadDrafts$ = this.actions$.pipe(
-        ofType(DraftCollectionActionTypes.LOAD_DRAFT_REQUEST),
+        ofType(DraftActionTypes.LOAD_DRAFT_REQUEST),
         switchMap(() =>
             this.draftService
                 .query()
@@ -34,7 +30,7 @@ export class DraftCollectionEffects {
 
     @Effect()
     addDraft$ = this.actions$.pipe(
-        ofType<actions.AddDraftRequest>(DraftCollectionActionTypes.ADD_DRAFT),
+        ofType<actions.AddDraftRequest>(DraftActionTypes.ADD_DRAFT),
         map(getPayload),
         switchMap(provider =>
             this.draftService
@@ -47,7 +43,7 @@ export class DraftCollectionEffects {
 
     @Effect()
     addDraftSuccessReload$ = this.actions$.pipe(
-        ofType<actions.AddDraftSuccess>(DraftCollectionActionTypes.ADD_DRAFT_SUCCESS),
+        ofType<actions.AddDraftSuccess>(DraftActionTypes.ADD_DRAFT_SUCCESS),
         map(getPayload),
         switchMap(provider =>
             this.draftService
@@ -60,14 +56,14 @@ export class DraftCollectionEffects {
 
     @Effect({ dispatch: false })
     addDraftSuccessRedirect$ = this.actions$.pipe(
-        ofType<actions.AddDraftSuccess>(DraftCollectionActionTypes.ADD_DRAFT_SUCCESS),
+        ofType<actions.AddDraftSuccess>(DraftActionTypes.ADD_DRAFT_SUCCESS),
         map(getPayload),
-        tap(provider => this.router.navigate(['provider', provider.entityId, 'wizard']))
+        tap(provider => this.router.navigate(['metadata', 'resolver', provider.entityId, 'wizard']))
     );
 
     @Effect()
     updateDraft$ = this.actions$.pipe(
-        ofType<actions.UpdateDraftRequest>(DraftCollectionActionTypes.UPDATE_DRAFT_REQUEST),
+        ofType<actions.UpdateDraftRequest>(DraftActionTypes.UPDATE_DRAFT_REQUEST),
         map(getPayload),
         switchMap(provider => {
             return this.draftService
@@ -83,7 +79,7 @@ export class DraftCollectionEffects {
 
     @Effect()
     selectDraft$ = this.actions$.pipe(
-        ofType<actions.SelectDraft>(DraftCollectionActionTypes.SELECT),
+        ofType<actions.SelectDraft>(DraftActionTypes.SELECT),
         map(getPayload),
         switchMap(id =>
             this.draftService
@@ -96,7 +92,7 @@ export class DraftCollectionEffects {
 
     @Effect()
     removeDraft$ = this.actions$.pipe(
-        ofType<actions.RemoveDraftRequest>(DraftCollectionActionTypes.REMOVE_DRAFT),
+        ofType<actions.RemoveDraftRequest>(DraftActionTypes.REMOVE_DRAFT),
         map(getPayload),
         switchMap(provider =>
             this.draftService
@@ -108,7 +104,7 @@ export class DraftCollectionEffects {
     );
     @Effect()
     removeDraftSuccessReload$ = this.actions$.pipe(
-        ofType<actions.RemoveDraftRequest>(DraftCollectionActionTypes.REMOVE_DRAFT),
+        ofType<actions.RemoveDraftRequest>(DraftActionTypes.REMOVE_DRAFT),
         map(getPayload),
         map(provider => new actions.LoadDraftRequest())
     );
diff --git a/ui/src/app/metadata/resolver/effect/editor.effect.ts b/ui/src/app/metadata/resolver/effect/editor.effect.ts
new file mode 100644
index 000000000..d194d05a7
--- /dev/null
+++ b/ui/src/app/metadata/resolver/effect/editor.effect.ts
@@ -0,0 +1,59 @@
+import { Injectable } from '@angular/core';
+import { Effect, Actions, ofType } from '@ngrx/effects';
+
+import { switchMap, map, withLatestFrom, tap } from 'rxjs/operators';
+
+import * as fromResolver from '../reducer';
+import * as fromRoot from '../../../app.reducer';
+
+import * as editor from '../action/editor.action';
+import * as provider from '../action/collection.action';
+
+import { ShowContentionAction } from '../../../contention/action/contention.action';
+
+import { ResolverCollectionActionTypes } from '../action/collection.action';
+import { ResolverService } from '../../domain/service/resolver.service';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { ContentionService } from '../../../contention/service/contention.service';
+
+@Injectable()
+export class EditorEffects {
+
+    @Effect()
+    cancelChanges$ = this.actions$.pipe(
+        ofType<editor.CancelChanges>(editor.CANCEL_CHANGES),
+        map(() => new provider.LoadResolverRequest()),
+        tap(() => this.router.navigate(['metadata']))
+    );
+
+    @Effect()
+    updateResolverSuccessRedirect$ = this.actions$.pipe(
+        ofType<provider.UpdateResolverSuccess>(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS),
+        map(action => action.payload),
+        map(p => new editor.ResetChanges())
+    );
+
+    @Effect()
+    openContention$ = this.actions$.pipe(
+        ofType<provider.UpdateResolverFail>(ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromResolver.getSelectedResolver)),
+        switchMap(([filter, current]) => {
+            return this.service.find(filter.id).pipe(
+                map(data => new ShowContentionAction(this.contentionService.getContention(current, filter, data, {
+                    resolve: (obj) => this.store.dispatch(new provider.UpdateResolverRequest(obj)),
+                    reject: (obj) => this.store.dispatch(new editor.CancelChanges())
+                })))
+            );
+        })
+    );
+
+    constructor(
+        private store: Store<fromRoot.State>,
+        private service: ResolverService,
+        private actions$: Actions,
+        private router: Router,
+        private contentionService: ContentionService
+    ) { }
+}
diff --git a/ui/src/app/metadata-provider/effect/search.effect.ts b/ui/src/app/metadata/resolver/effect/search.effect.ts
similarity index 71%
rename from ui/src/app/metadata-provider/effect/search.effect.ts
rename to ui/src/app/metadata/resolver/effect/search.effect.ts
index 375255b58..734e143b9 100644
--- a/ui/src/app/metadata-provider/effect/search.effect.ts
+++ b/ui/src/app/metadata/resolver/effect/search.effect.ts
@@ -1,12 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Effect, Actions, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
-import { Observable, of } from 'rxjs';
-import { map, switchMap, debounceTime, withLatestFrom } from 'rxjs/operators';
+import { of } from 'rxjs';
+import { map, switchMap, withLatestFrom } from 'rxjs/operators';
 
 import { SearchActionTypes, SearchActionUnion, SearchIdsSuccess } from '../action/search.action';
-import * as fromProvider from '../reducer';
-import * as fromCollection from '../../domain/reducer';
+import * as fromResolver from '../reducer';
 
 @Injectable()
 export class SearchIdEffects {
@@ -17,7 +16,7 @@ export class SearchIdEffects {
     searchEntityIds$ = this.actions$.pipe(
         ofType<SearchActionUnion>(SearchActionTypes.SEARCH_IDS),
         map(action => action.payload),
-        withLatestFrom(this.store.select(fromCollection.getAllEntityIds)),
+        withLatestFrom(this.store.select(fromResolver.getAllEntityIds)),
         map(([ query, ids ]) => {
             if (!query) { return []; }
             return ids.filter(e => this.matcher(e, query));
@@ -29,6 +28,6 @@ export class SearchIdEffects {
 
     constructor(
         private actions$: Actions,
-        private store: Store<fromProvider.State>
+        private store: Store<fromResolver.State>
     ) { }
 }
diff --git a/ui/src/app/edit-provider/effect/wizard.effect.ts b/ui/src/app/metadata/resolver/effect/wizard.effect.ts
similarity index 54%
rename from ui/src/app/edit-provider/effect/wizard.effect.ts
rename to ui/src/app/metadata/resolver/effect/wizard.effect.ts
index b60b95069..3296d1f25 100644
--- a/ui/src/app/edit-provider/effect/wizard.effect.ts
+++ b/ui/src/app/metadata/resolver/effect/wizard.effect.ts
@@ -4,25 +4,23 @@ import { Effect, Actions, ofType } from '@ngrx/effects';
 import { map, switchMap } from 'rxjs/operators';
 
 import * as editorActions from '../action/editor.action';
-import * as draft from '../../domain/action/draft-collection.action';
-import * as provider from '../../domain/action/provider-collection.action';
-import { ProviderCollectionActionTypes } from '../../domain/action/provider-collection.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDraftService } from '../../domain/service/entity-draft.service';
+import * as provider from '../action/collection.action';
+import { ResolverCollectionActionTypes } from '../action/collection.action';
+import { EntityDraftService } from '../../domain/service/draft.service';
 
 @Injectable()
 export class WizardEffects {
 
     @Effect({ dispatch: false })
-    updateProvider$ = this.actions$.pipe(
+    updateResolver$ = this.actions$.pipe(
         ofType<editorActions.SaveChanges>(editorActions.SAVE_CHANGES),
         map(action => action.payload),
         switchMap(provider => this.draftService.update(provider))
     );
 
     @Effect()
-    addProviderSuccessDiscard$ = this.actions$.pipe(
-        ofType<provider.AddProviderSuccess>(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS),
+    addResolverSuccessDiscard$ = this.actions$.pipe(
+        ofType<provider.AddResolverSuccess>(ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS),
         map(action => action.payload),
         map(provider => new editorActions.ResetChanges())
     );
diff --git a/ui/src/app/metadata-provider/guard/copy-isset.guard.ts b/ui/src/app/metadata/resolver/guard/copy-isset.guard.ts
similarity index 100%
rename from ui/src/app/metadata-provider/guard/copy-isset.guard.ts
rename to ui/src/app/metadata/resolver/guard/copy-isset.guard.ts
diff --git a/ui/src/app/domain/reducer/provider-collection.reducer.spec.ts b/ui/src/app/metadata/resolver/reducer/collection.reducer.spec.ts
similarity index 55%
rename from ui/src/app/domain/reducer/provider-collection.reducer.spec.ts
rename to ui/src/app/metadata/resolver/reducer/collection.reducer.spec.ts
index baddf7317..41c55764b 100644
--- a/ui/src/app/domain/reducer/provider-collection.reducer.spec.ts
+++ b/ui/src/app/metadata/resolver/reducer/collection.reducer.spec.ts
@@ -1,26 +1,26 @@
-import { reducer } from './provider-collection.reducer';
-import * as fromProvider from './provider-collection.reducer';
-import * as providerActions from '../action/provider-collection.action';
-import { MetadataProvider } from '../model/metadata-provider';
+import { reducer } from './collection.reducer';
+import * as fromCollection from './collection.reducer';
+import * as resolverActions from '../action/collection.action';
+import { MetadataResolver } from '../../domain/model';
 
-let providers: MetadataProvider[] = [
-    { id: '1', entityId: 'foo', serviceProviderName: 'bar', createdDate: 'Tue Apr 17 2018 13:33:54 GMT-0700 (MST)' } as MetadataProvider,
-    { id: '2', entityId: 'baz', serviceProviderName: 'fin', createdDate: 'Tue Apr 17 2018 13:34:07 GMT-0700 (MST)' } as MetadataProvider
+let resolvers: MetadataResolver[] = [
+    { id: '1', entityId: 'foo', serviceProviderName: 'bar', createdDate: 'Tue Apr 17 2018 13:33:54 GMT-0700 (MST)' } as MetadataResolver,
+    { id: '2', entityId: 'baz', serviceProviderName: 'fin', createdDate: 'Tue Apr 17 2018 13:34:07 GMT-0700 (MST)' } as MetadataResolver
 ],
-    snapshot: fromProvider.ProviderCollectionState = {
-        ids: [providers[0].id, providers[1].id],
+    snapshot: fromCollection.CollectionState = {
+        ids: [resolvers[0].id, resolvers[1].id],
         entities: {
-            [providers[0].id]: providers[0],
-            [providers[1].id]: providers[1]
+            [resolvers[0].id]: resolvers[0],
+            [resolvers[1].id]: resolvers[1]
         },
-        selectedProviderId: null
+        selectedResolverId: null
     };
 
-describe('Provider Reducer', () => {
-    const initialState: fromProvider.ProviderCollectionState = {
+describe('Resolver Reducer', () => {
+    const initialState: fromCollection.CollectionState = {
         ids: [],
         entities: {},
-        selectedProviderId: null,
+        selectedResolverId: null,
     };
 
     describe('undefined action', () => {
@@ -32,8 +32,8 @@ describe('Provider Reducer', () => {
     });
 
     describe('Load Providers: Success', () => {
-        it('should add the loaded providers to the collection', () => {
-            const action = new providerActions.LoadProviderSuccess(providers);
+        it('should add the loaded resolvers to the collection', () => {
+            const action = new resolverActions.LoadResolverSuccess(resolvers);
             const result = reducer(initialState, action);
 
             expect(result).toEqual(
@@ -44,16 +44,16 @@ describe('Provider Reducer', () => {
 
     describe('Update Providers: Success', () => {
         it('should update the draft of the specified id', () => {
-            let changes = { ...providers[1], serviceEnabled: true },
+            let changes = { ...resolvers[1], serviceEnabled: true },
                 expected = {
-                    ids: [providers[0].id, providers[1].id],
+                    ids: [resolvers[0].id, resolvers[1].id],
                     entities: {
-                        [providers[0].id]: providers[0],
-                        [providers[1].id]: changes
+                        [resolvers[0].id]: resolvers[0],
+                        [resolvers[1].id]: changes
                     },
-                    selectedProviderId: null
+                    selectedResolverId: null
                 };
-            const action = new providerActions.UpdateProviderSuccess({id: changes.id, changes});
+            const action = new resolverActions.UpdateResolverSuccess({id: changes.id, changes});
             const result = reducer({ ...snapshot }, action);
 
             expect(result).toEqual(
@@ -62,19 +62,19 @@ describe('Provider Reducer', () => {
         });
 
         it('should return state if the entityId is not found', () => {
-            let changes = { ...providers[1], serviceEnabled: true, id: '4' };
-            const action = new providerActions.UpdateProviderSuccess({id: changes.id, changes});
+            let changes = { ...resolvers[1], serviceEnabled: true, id: '4' };
+            const action = new resolverActions.UpdateResolverSuccess({id: changes.id, changes});
             const result = reducer({ ...snapshot }, action);
 
             expect(result).toEqual(snapshot);
         });
     });
 
-    describe('Select Provider', () => {
+    describe('Select Resolver', () => {
         it('should update the selected draft id', () => {
             let id = 'foo',
-                expected = { ...snapshot, selectedProviderId: id };
-            const action = new providerActions.SelectProvider(id);
+                expected = { ...snapshot, selectedResolverId: id };
+            const action = new resolverActions.SelectResolver(id);
             const result = reducer({ ...snapshot }, action);
 
             expect(result).toEqual(
diff --git a/ui/src/app/metadata/resolver/reducer/collection.reducer.ts b/ui/src/app/metadata/resolver/reducer/collection.reducer.ts
new file mode 100644
index 000000000..7c4064338
--- /dev/null
+++ b/ui/src/app/metadata/resolver/reducer/collection.reducer.ts
@@ -0,0 +1,54 @@
+import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
+import { MetadataResolver } from '../../domain/model';
+import { ResolverCollectionActionsUnion, ResolverCollectionActionTypes } from '../action/collection.action';
+
+export interface CollectionState extends EntityState<MetadataResolver> {
+    selectedResolverId: string | null;
+}
+
+export function sortByDate(a: MetadataResolver, b: MetadataResolver): number {
+    return a.createdDate.localeCompare(b.createdDate);
+}
+
+export const adapter: EntityAdapter<MetadataResolver> = createEntityAdapter<MetadataResolver>({
+    sortComparer: sortByDate,
+    selectId: (model: MetadataResolver) => model.id
+});
+
+export const initialState: CollectionState = adapter.getInitialState({
+    selectedResolverId: null
+});
+
+export function reducer(state = initialState, action: ResolverCollectionActionsUnion): CollectionState {
+    switch (action.type) {
+        case ResolverCollectionActionTypes.LOAD_RESOLVER_SUCCESS: {
+            return adapter.addAll(action.payload, {
+                ...state,
+                selectedResolverId: state.selectedResolverId
+            });
+        }
+
+        case ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS: {
+            return adapter.updateOne(action.payload, state);
+        }
+
+        case ResolverCollectionActionTypes.SELECT: {
+            return {
+                ...state,
+                selectedResolverId: action.payload,
+            };
+        }
+
+        default: {
+            return state;
+        }
+    }
+}
+
+export const getSelectedResolverId = (state: CollectionState) => state.selectedResolverId;
+export const {
+    selectIds: selectResolverIds,
+    selectEntities: selectResolverEntities,
+    selectAll: selectAllResolvers,
+    selectTotal: selectResolverTotal
+} = adapter.getSelectors();
diff --git a/ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts b/ui/src/app/metadata/resolver/reducer/copy.reducer.spec.ts
similarity index 53%
rename from ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts
rename to ui/src/app/metadata/resolver/reducer/copy.reducer.spec.ts
index 34b69b258..304c1762c 100644
--- a/ui/src/app/metadata-provider/reducer/copy.reducer.spec.ts
+++ b/ui/src/app/metadata/resolver/reducer/copy.reducer.spec.ts
@@ -1,13 +1,13 @@
 import { reducer } from './copy.reducer';
-import * as fromProviderCopy from './copy.reducer';
+import * as fromResolverCopy from './copy.reducer';
 import * as actions from '../action/copy.action';
-import * as fromCollection from '../../domain/action/provider-collection.action';
-import { CopySourceActionTypes, CopySourceActionUnion, CreateProviderCopyRequest } from '../action/copy.action';
-import { Provider } from '../../domain/entity/provider';
+import * as fromCollection from '../action/collection.action';
+import { CopySourceActionTypes, CreateResolverCopyRequest } from '../action/copy.action';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity/resolver/file-backed-http-metadata-resolver';
 
-const snapshot: fromProviderCopy.CopyState = { ...fromProviderCopy.initialState };
+const snapshot: fromResolverCopy.CopyState = { ...fromResolverCopy.initialState };
 
-describe('Provider -> Copy Reducer', () => {
+describe('Resolver -> Copy Reducer', () => {
     describe('undefined action', () => {
         it('should return the default state', () => {
             const result = reducer(snapshot, {} as any);
@@ -15,69 +15,69 @@ describe('Provider -> Copy Reducer', () => {
         });
     });
 
-    describe(`${CopySourceActionTypes.CREATE_PROVIDER_COPY_REQUEST} action`, () => {
+    describe(`${CopySourceActionTypes.CREATE_RESOLVER_COPY_REQUEST} action`, () => {
         it('should set properties on the state', () => {
             const obj = { ...snapshot };
-            const result = reducer(snapshot, new CreateProviderCopyRequest(obj));
+            const result = reducer(snapshot, new CreateResolverCopyRequest(obj));
 
             expect(result).toEqual(obj);
         });
     });
 
-    describe(`${CopySourceActionTypes.CREATE_PROVIDER_COPY_SUCCESS} action`, () => {
+    describe(`${CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS} action`, () => {
         it('should set properties on the state', () => {
-            const p = new Provider({});
+            const p = new FileBackedHttpMetadataResolver({});
             const obj = { ...snapshot };
-            const result = reducer(snapshot, new actions.CreateProviderCopySuccess(p));
+            const result = reducer(snapshot, new actions.CreateResolverCopySuccess(p));
 
             expect(result.provider).toBe(p);
         });
     });
 
-    describe(`${CopySourceActionTypes.CREATE_PROVIDER_COPY_ERROR} action`, () => {
+    describe(`${CopySourceActionTypes.CREATE_RESOLVER_COPY_ERROR} action`, () => {
         it('should set properties on the state', () => {
-            const p = new Provider({});
+            const p = new FileBackedHttpMetadataResolver({});
             const obj = { ...snapshot };
-            const result = reducer(snapshot, new actions.CreateProviderCopyError(new Error()));
+            const result = reducer(snapshot, new actions.CreateResolverCopyError(new Error()));
 
             expect(result.provider).toBeNull();
         });
     });
 
-    describe(`${CopySourceActionTypes.UPDATE_PROVIDER_COPY} action`, () => {
+    describe(`${CopySourceActionTypes.UPDATE_RESOLVER_COPY} action`, () => {
         it('should set properties on the state', () => {
-            const obj = { ...snapshot, provider: new Provider({}) };
-            const result = reducer(snapshot, new actions.UpdateProviderCopy({id: 'foo'}));
+            const obj = { ...snapshot, provider: new FileBackedHttpMetadataResolver({}) };
+            const result = reducer(snapshot, new actions.UpdateResolverCopy({id: 'foo'}));
 
             expect(result.provider.id).toBe('foo');
         });
     });
 
-    describe(`${ fromCollection.ProviderCollectionActionTypes.ADD_PROVIDER } action`, () => {
+    describe(`${ fromCollection.ResolverCollectionActionTypes.ADD_RESOLVER } action`, () => {
         it('should set properties on the state', () => {
-            const p = new Provider({});
+            const p = new FileBackedHttpMetadataResolver({});
             const obj = { ...snapshot, provider: p };
-            const result = reducer(snapshot, new fromCollection.AddProviderRequest(p));
+            const result = reducer(snapshot, new fromCollection.AddResolverRequest(p));
 
             expect(result.saving).toBe(true);
         });
     });
 
-    describe(`${fromCollection.ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS} action`, () => {
+    describe(`${fromCollection.ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS} action`, () => {
         it('should set properties on the state', () => {
-            const p = new Provider({});
+            const p = new FileBackedHttpMetadataResolver({});
             const obj = { ...snapshot, provider: p };
-            const result = reducer(snapshot, new fromCollection.AddProviderSuccess(p));
+            const result = reducer(snapshot, new fromCollection.AddResolverSuccess(p));
 
             expect(result.saving).toBe(false);
         });
     });
 
-    describe(`${fromCollection.ProviderCollectionActionTypes.ADD_PROVIDER_FAIL} action`, () => {
+    describe(`${fromCollection.ResolverCollectionActionTypes.ADD_RESOLVER_FAIL} action`, () => {
         it('should set properties on the state', () => {
-            const p = new Provider({});
+            const p = new FileBackedHttpMetadataResolver({});
             const obj = { ...snapshot, provider: p };
-            const result = reducer(snapshot, new fromCollection.AddProviderFail(p));
+            const result = reducer(snapshot, new fromCollection.AddResolverFail(p));
 
             expect(result.saving).toBe(false);
         });
@@ -85,22 +85,22 @@ describe('Provider -> Copy Reducer', () => {
 
     describe(`getCopy selector function`, () => {
         it('should return the entire copy object', () => {
-            expect(fromProviderCopy.getCopy(snapshot)).toBe(snapshot.provider);
+            expect(fromResolverCopy.getCopy(snapshot)).toBe(snapshot.provider);
         });
     });
     describe(`getEntityId selector function`, () => {
         it('should return the entityId property', () => {
-            expect(fromProviderCopy.getEntityId(snapshot)).toBe(snapshot.entityId);
+            expect(fromResolverCopy.getEntityId(snapshot)).toBe(snapshot.entityId);
         });
     });
     describe(`getName selector function`, () => {
         it('should return the serviceProviderName property', () => {
-            expect(fromProviderCopy.getName(snapshot)).toBe(snapshot.serviceProviderName);
+            expect(fromResolverCopy.getName(snapshot)).toBe(snapshot.serviceProviderName);
         });
     });
     describe(`getTarget selector function`, () => {
         it('should return the target property', () => {
-            expect(fromProviderCopy.getTarget(snapshot)).toBe(snapshot.target);
+            expect(fromResolverCopy.getTarget(snapshot)).toBe(snapshot.target);
         });
     });
 });
diff --git a/ui/src/app/metadata-provider/reducer/copy.reducer.ts b/ui/src/app/metadata/resolver/reducer/copy.reducer.ts
similarity index 68%
rename from ui/src/app/metadata-provider/reducer/copy.reducer.ts
rename to ui/src/app/metadata/resolver/reducer/copy.reducer.ts
index 416086eba..5b67f2e97 100644
--- a/ui/src/app/metadata-provider/reducer/copy.reducer.ts
+++ b/ui/src/app/metadata/resolver/reducer/copy.reducer.ts
@@ -1,14 +1,12 @@
-import { createSelector, createFeatureSelector } from '@ngrx/store';
 import { CopySourceActionTypes, CopySourceActionUnion } from '../action/copy.action';
-import { MetadataFilter, MetadataProvider } from '../../domain/domain.type';
-import { CopyProviderComponent } from '../container/copy-provider.component';
-import { ProviderCollectionActionsUnion, ProviderCollectionActionTypes } from '../../domain/action/provider-collection.action';
+import { MetadataResolver } from '../../domain/model';
+import { ResolverCollectionActionsUnion, ResolverCollectionActionTypes } from '../action/collection.action';
 
 export interface CopyState {
     target: string;
     serviceProviderName: string;
     entityId: string;
-    provider: MetadataProvider;
+    provider: MetadataResolver;
     saving: boolean;
     sections: string[];
 }
@@ -22,9 +20,9 @@ export const initialState: CopyState = {
     sections: []
 };
 
-export function reducer(state = initialState, action: CopySourceActionUnion | ProviderCollectionActionsUnion): CopyState {
+export function reducer(state = initialState, action: CopySourceActionUnion | ResolverCollectionActionsUnion): CopyState {
     switch (action.type) {
-        case CopySourceActionTypes.UPDATE_PROVIDER_COPY_SECTIONS: {
+        case CopySourceActionTypes.UPDATE_RESOLVER_COPY_SECTIONS: {
             return {
                 ...state,
                 sections: [
@@ -32,19 +30,19 @@ export function reducer(state = initialState, action: CopySourceActionUnion | Pr
                 ]
             };
         }
-        case CopySourceActionTypes.CREATE_PROVIDER_COPY_REQUEST: {
+        case CopySourceActionTypes.CREATE_RESOLVER_COPY_REQUEST: {
             return {
                 ...state,
                 ...action.payload
             };
         }
-        case CopySourceActionTypes.CREATE_PROVIDER_COPY_SUCCESS: {
+        case CopySourceActionTypes.CREATE_RESOLVER_COPY_SUCCESS: {
             return {
                 ...state,
                 provider: action.payload
             };
         }
-        case CopySourceActionTypes.UPDATE_PROVIDER_COPY: {
+        case CopySourceActionTypes.UPDATE_RESOLVER_COPY: {
             return {
                 ...state,
                 provider: {
@@ -53,14 +51,14 @@ export function reducer(state = initialState, action: CopySourceActionUnion | Pr
                 }
             };
         }
-        case ProviderCollectionActionTypes.ADD_PROVIDER: {
+        case ResolverCollectionActionTypes.ADD_RESOLVER: {
             return {
                 ...state,
                 saving: true
             };
         }
-        case ProviderCollectionActionTypes.ADD_PROVIDER_FAIL:
-        case ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS: {
+        case ResolverCollectionActionTypes.ADD_RESOLVER_FAIL:
+        case ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS: {
             return {
                 ...initialState
             };
diff --git a/ui/src/app/domain/reducer/draft-collection.reducer.spec.ts b/ui/src/app/metadata/resolver/reducer/draft.reducer.spec.ts
similarity index 89%
rename from ui/src/app/domain/reducer/draft-collection.reducer.spec.ts
rename to ui/src/app/metadata/resolver/reducer/draft.reducer.spec.ts
index e9f72bd73..936581814 100644
--- a/ui/src/app/domain/reducer/draft-collection.reducer.spec.ts
+++ b/ui/src/app/metadata/resolver/reducer/draft.reducer.spec.ts
@@ -1,13 +1,13 @@
-import { reducer, adapter } from './draft-collection.reducer';
-import * as fromDrafts from './draft-collection.reducer';
-import * as draftActions from '../action/draft-collection.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
+import { reducer, adapter } from './draft.reducer';
+import * as fromDrafts from './draft.reducer';
+import * as draftActions from '../action/draft.action';
+import { MetadataResolver } from '../../domain/model';
 
-let drafts: MetadataProvider[] = [
-        { entityId: 'foo', serviceProviderName: 'bar' } as MetadataProvider,
-        { entityId: 'baz', serviceProviderName: 'fin' } as MetadataProvider
+let drafts: MetadataResolver[] = [
+        { entityId: 'foo', serviceProviderName: 'bar' } as MetadataResolver,
+        { entityId: 'baz', serviceProviderName: 'fin' } as MetadataResolver
     ],
-    snapshot: fromDrafts.DraftCollectionState = {
+    snapshot: fromDrafts.DraftState = {
         ids: [drafts[0].entityId, drafts[1].entityId],
         entities: {
             [drafts[0].entityId]: drafts[0],
@@ -17,7 +17,7 @@ let drafts: MetadataProvider[] = [
     };
 
 describe('Draft Reducer', () => {
-    const initialState: fromDrafts.DraftCollectionState = {
+    const initialState: fromDrafts.DraftState = {
         ids: [],
         entities: {},
         selectedDraftId: null
diff --git a/ui/src/app/metadata/resolver/reducer/draft.reducer.ts b/ui/src/app/metadata/resolver/reducer/draft.reducer.ts
new file mode 100644
index 000000000..987883aaf
--- /dev/null
+++ b/ui/src/app/metadata/resolver/reducer/draft.reducer.ts
@@ -0,0 +1,59 @@
+import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
+
+import { MetadataResolver } from '../../domain/model';
+import { DraftActionsUnion, DraftActionTypes } from '../action/draft.action';
+
+export interface DraftState extends EntityState<MetadataResolver> {
+    selectedDraftId: string | null;
+}
+
+export function sortByName(a: MetadataResolver, b: MetadataResolver): number {
+    return a.serviceProviderName.localeCompare(b.serviceProviderName);
+}
+
+export const adapter: EntityAdapter<MetadataResolver> = createEntityAdapter<MetadataResolver>({
+    sortComparer: sortByName,
+    selectId: (model: MetadataResolver) => model.entityId
+});
+
+export const initialState: DraftState = adapter.getInitialState({
+    selectedDraftId: null,
+});
+
+export function reducer(state = initialState, action: DraftActionsUnion): DraftState {
+    switch (action.type) {
+        case DraftActionTypes.LOAD_DRAFT_SUCCESS: {
+            return adapter.addMany(action.payload, {
+                ...state,
+                selectedDraftId: state.selectedDraftId,
+            });
+        }
+
+        case DraftActionTypes.UPDATE_DRAFT_SUCCESS: {
+            return adapter.updateOne(action.payload, state);
+        }
+
+        case DraftActionTypes.REMOVE_DRAFT_SUCCESS: {
+            return adapter.removeOne(action.payload.entityId, state);
+        }
+
+        case DraftActionTypes.SELECT: {
+            return {
+                ...state,
+                selectedDraftId: action.payload,
+            };
+        }
+
+        default: {
+            return state;
+        }
+    }
+}
+
+export const getSelectedDraftId = (state: DraftState) => state.selectedDraftId;
+export const {
+    selectIds: selectDraftIds,
+    selectEntities: selectDraftEntities,
+    selectAll: selectAllDrafts,
+    selectTotal: selectDraftTotal
+} = adapter.getSelectors();
diff --git a/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts b/ui/src/app/metadata/resolver/reducer/editor.reducer.spec.ts
similarity index 86%
rename from ui/src/app/edit-provider/reducer/editor.reducer.spec.ts
rename to ui/src/app/metadata/resolver/reducer/editor.reducer.spec.ts
index 81934837b..78e272848 100644
--- a/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts
+++ b/ui/src/app/metadata/resolver/reducer/editor.reducer.spec.ts
@@ -1,20 +1,20 @@
 import { reducer } from './editor.reducer';
 import * as fromEditor from './editor.reducer';
 import * as actions from '../action/editor.action';
-import * as collectionActions from '../../domain/action/provider-collection.action';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
+import * as collectionActions from '../action/collection.action';
+import { MetadataResolver } from '../../domain/model';
 
 describe('Editor Reducer', () => {
     const initialState: fromEditor.EditorState = {
         saving: false,
         formStatus: {},
-        changes: {} as MetadataProvider
+        changes: {} as MetadataResolver
     };
 
     const changes = {
         entityId: 'foo',
         serviceProviderName: 'bar'
-    } as MetadataProvider;
+    } as MetadataResolver;
 
     describe('undefined action', () => {
         it('should return the default state', () => {
@@ -23,9 +23,9 @@ describe('Editor Reducer', () => {
         });
     });
 
-    describe('Editor Add Provider', () => {
+    describe('Editor Add Resolver', () => {
         it('should update the status when a provider is saved', () => {
-            const action = new collectionActions.AddProviderRequest(changes);
+            const action = new collectionActions.AddResolverRequest(changes);
             const result = reducer(initialState, action);
             expect(result).toEqual(
                 Object.assign({}, initialState, {
@@ -35,7 +35,7 @@ describe('Editor Reducer', () => {
         });
 
         it('should update the status on success', () => {
-            const action = new collectionActions.AddProviderSuccess(changes);
+            const action = new collectionActions.AddResolverSuccess(changes);
             const result = reducer({...initialState, changes: {...changes, organization: {name: 'foo'}}}, action);
             expect(result).toEqual(
                 Object.assign({}, initialState, {
@@ -46,7 +46,7 @@ describe('Editor Reducer', () => {
         });
 
         it('should update the status on success', () => {
-            const action = new collectionActions.AddProviderFail(changes);
+            const action = new collectionActions.AddResolverFail(changes);
             const result = reducer(initialState, action);
             expect(result).toEqual(
                 Object.assign({}, initialState, {
@@ -121,7 +121,7 @@ describe('Editor Reducer', () => {
         it('should aggregate the status', () => {
             expect(fromEditor.isEditorValid({
                 saving: false,
-                changes: {} as MetadataProvider,
+                changes: {} as MetadataResolver,
                 formStatus: {
                     organization: 'INVALID',
                     foo: 'VALID'
@@ -132,13 +132,13 @@ describe('Editor Reducer', () => {
         it('should calculate a saved status based on changes', () => {
             expect(fromEditor.isEditorSaved({
                 saving: false,
-                changes: {} as MetadataProvider,
+                changes: {} as MetadataResolver,
                 formStatus: {}
             })).toBe(true);
 
             expect(fromEditor.isEditorSaved({
                 saving: false,
-                changes: {organization: {}, entityId: 'bar'} as MetadataProvider,
+                changes: {organization: {}, entityId: 'bar'} as MetadataResolver,
                 formStatus: {}
             })).toBe(false);
         });
@@ -146,21 +146,21 @@ describe('Editor Reducer', () => {
         it('should return current changes', () => {
             expect(fromEditor.getChanges({
                 saving: false,
-                changes: {} as MetadataProvider,
+                changes: {} as MetadataResolver,
                 formStatus: {}
-            })).toEqual({} as MetadataProvider);
+            })).toEqual({} as MetadataResolver);
         });
 
         it('should return `saving` status', () => {
             expect(fromEditor.isEditorSaving({
                 saving: false,
-                changes: {} as MetadataProvider,
+                changes: {} as MetadataResolver,
                 formStatus: {}
             })).toBe(false);
 
             expect(fromEditor.isEditorSaving({
                 saving: true,
-                changes: {} as MetadataProvider,
+                changes: {} as MetadataResolver,
                 formStatus: {}
             })).toBe(true);
         });
diff --git a/ui/src/app/edit-provider/reducer/editor.reducer.ts b/ui/src/app/metadata/resolver/reducer/editor.reducer.ts
similarity index 73%
rename from ui/src/app/edit-provider/reducer/editor.reducer.ts
rename to ui/src/app/metadata/resolver/reducer/editor.reducer.ts
index 1513c1403..290ce15fd 100644
--- a/ui/src/app/edit-provider/reducer/editor.reducer.ts
+++ b/ui/src/app/metadata/resolver/reducer/editor.reducer.ts
@@ -1,37 +1,34 @@
-import { createSelector, createFeatureSelector } from '@ngrx/store';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../domain/model';
 import * as editor from '../action/editor.action';
-import * as provider from '../../domain/action/provider-collection.action';
-import { ProviderCollectionActionTypes, ProviderCollectionActionsUnion } from '../../domain/action/provider-collection.action';
-import * as fromRoot from '../../core/reducer';
+import { ResolverCollectionActionTypes, ResolverCollectionActionsUnion } from '../action/collection.action';
 
 export interface EditorState {
     saving: boolean;
     formStatus: { [key: string]: string };
-    changes: MetadataProvider;
+    changes: MetadataResolver;
 }
 
 export const initialState: EditorState = {
     saving: false,
     formStatus: {},
-    changes: {} as MetadataProvider
+    changes: {} as MetadataResolver
 };
 
-export function reducer(state = initialState, action: editor.Actions | ProviderCollectionActionsUnion): EditorState {
+export function reducer(state = initialState, action: editor.Actions | ResolverCollectionActionsUnion): EditorState {
     switch (action.type) {
-        case ProviderCollectionActionTypes.ADD_PROVIDER: {
+        case ResolverCollectionActionTypes.ADD_RESOLVER: {
             return {
                 ...state,
                 saving: true,
             };
         }
-        case ProviderCollectionActionTypes.ADD_PROVIDER_FAIL: {
+        case ResolverCollectionActionTypes.ADD_RESOLVER_FAIL: {
             return {
                 ...state,
                 saving: false
             };
         }
-        case ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS: {
+        case ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS: {
             return {
                 ...state,
                 changes: { ...initialState.changes },
diff --git a/ui/src/app/metadata/resolver/reducer/index.ts b/ui/src/app/metadata/resolver/reducer/index.ts
new file mode 100644
index 000000000..ca47726ba
--- /dev/null
+++ b/ui/src/app/metadata/resolver/reducer/index.ts
@@ -0,0 +1,105 @@
+import { createSelector, createFeatureSelector } from '@ngrx/store';
+import * as fromRoot from '../../../app.reducer';
+import * as fromEditor from './editor.reducer';
+import * as fromSearch from './search.reducer';
+import * as fromCopy from './copy.reducer';
+import * as fromDraft from './draft.reducer';
+import * as fromCollection from './collection.reducer';
+
+import { combineAllFn, getEntityIdsFn, getInCollectionFn, doesExistFn } from '../../domain/domain.util';
+
+export interface ResolverState {
+    editor: fromEditor.EditorState;
+    copy: fromCopy.CopyState;
+    search: fromSearch.SearchState;
+    draft: fromDraft.DraftState;
+    collection: fromCollection.CollectionState;
+}
+
+export const reducers = {
+    copy: fromCopy.reducer,
+    search: fromSearch.reducer,
+    editor: fromEditor.reducer,
+    collection: fromCollection.reducer,
+    draft: fromDraft.reducer
+};
+
+export interface State extends fromRoot.State {
+    'resolver': ResolverState;
+}
+
+export const getResolverState = createFeatureSelector<ResolverState>('resolver');
+
+export const getCollectionStateFn = (state: ResolverState) => state.collection;
+export const getDraftStateFn = (state: ResolverState) => state.draft;
+export const getEditorStateFn = (state: ResolverState) => state.editor;
+export const getCopyStateFn = (state: ResolverState) => state.copy;
+export const getSearchStateFn = (state: ResolverState) => state.search;
+
+export const getCollectionState = createSelector(getResolverState, getCollectionStateFn);
+export const getDraftState = createSelector(getResolverState, getDraftStateFn);
+export const getEditorState = createSelector(getResolverState, getEditorStateFn);
+export const getCopyState = createSelector(getResolverState, getCopyStateFn);
+export const getSearchState = createSelector(getResolverState, getSearchStateFn);
+
+/*
+Editor State
+*/
+
+export const getEditorIsValid = createSelector(getEditorState, fromEditor.isEditorValid);
+export const getEditorIsSaved = createSelector(getEditorState, fromEditor.isEditorSaved);
+export const getEditorChanges = createSelector(getEditorState, fromEditor.getChanges);
+export const getEditorIsSaving = createSelector(getEditorState, fromEditor.isEditorSaving);
+export const getFormStatus = createSelector(getEditorState, fromEditor.getFormStatus);
+export const getInvalidEditorForms = createSelector(getEditorState, fromEditor.getInvalidForms);
+
+/*
+Copy State
+*/
+
+export const getCopy = createSelector(getCopyState, fromCopy.getCopy);
+export const getSaving = createSelector(getCopyState, fromCopy.getSaving);
+export const getAttributes = createSelector(getCopyState, fromCopy.getCopyAttributes);
+export const getSectionsToCopy = createSelector(getCopyState, fromCopy.getCopySections);
+
+/*
+Search State
+*/
+
+export const getSearchResults = createSelector(getSearchState, fromSearch.getMatches);
+export const getSearchQuery = createSelector(getSearchState, fromSearch.getQuery);
+export const getSearchLoading = createSelector(getSearchState, fromSearch.getSearching);
+
+/*
+Collection State
+*/
+
+export const getResolverEntities = createSelector(getCollectionState, fromCollection.selectResolverEntities);
+export const getSelectedResolverId = createSelector(getCollectionState, fromCollection.getSelectedResolverId);
+export const getResolverIds = createSelector(getCollectionState, fromCollection.selectResolverIds);
+
+export const getResolverCollection = createSelector(getCollectionState, getResolverIds, fromCollection.selectAllResolvers);
+export const getSelectedResolver = createSelector(getResolverEntities, getSelectedResolverId, getInCollectionFn);
+
+
+/*
+Draft State
+*/
+
+export const getDraftEntities = createSelector(getDraftState, fromDraft.selectDraftEntities);
+export const getDraftIds = createSelector(getDraftState, fromDraft.selectDraftIds);
+export const getDraftCollection = createSelector(getDraftState, getDraftIds, fromDraft.selectAllDrafts);
+export const getSelectedDraftId = createSelector(getDraftState, fromDraft.getSelectedDraftId);
+
+export const getSelectedDraft = createSelector(getDraftEntities, getSelectedDraftId, getInCollectionFn);
+export const isSelectedResolverInCollection = createSelector(getResolverIds, getSelectedResolverId, doesExistFn);
+export const isSelectedDraftInCollection = createSelector(getDraftIds, getSelectedDraftId, doesExistFn);
+
+/*
+Combine Drafts and Resolvers
+*/
+
+export const getAllResolvers = createSelector(getDraftCollection, getResolverCollection, combineAllFn);
+export const getAllResolverIds = createSelector(getDraftIds, getResolverIds, combineAllFn);
+
+export const getAllEntityIds = createSelector(getAllResolvers, getEntityIdsFn);
diff --git a/ui/src/app/metadata-provider/reducer/search.reducer.spec.ts b/ui/src/app/metadata/resolver/reducer/search.reducer.spec.ts
similarity index 92%
rename from ui/src/app/metadata-provider/reducer/search.reducer.spec.ts
rename to ui/src/app/metadata/resolver/reducer/search.reducer.spec.ts
index a1155b2b5..eefce726d 100644
--- a/ui/src/app/metadata-provider/reducer/search.reducer.spec.ts
+++ b/ui/src/app/metadata/resolver/reducer/search.reducer.spec.ts
@@ -1,6 +1,6 @@
 import { reducer } from './search.reducer';
 import * as fromProviderSearch from './search.reducer';
-import { SearchActionTypes, SearchActionUnion, SearchIds, SearchIdsSuccess, SearchIdsError } from '../action/search.action';
+import { SearchActionTypes, SearchIds, SearchIdsSuccess, SearchIdsError } from '../action/search.action';
 
 const snapshot: fromProviderSearch.SearchState = {
     matches: [],
@@ -8,7 +8,7 @@ const snapshot: fromProviderSearch.SearchState = {
     searching: false
 };
 
-describe('Provider -> Search Reducer', () => {
+describe('Resolver -> Search Reducer', () => {
     describe('undefined action', () => {
         it('should return the default state', () => {
             const result = reducer(snapshot, {} as any);
diff --git a/ui/src/app/metadata-provider/reducer/search.reducer.ts b/ui/src/app/metadata/resolver/reducer/search.reducer.ts
similarity index 86%
rename from ui/src/app/metadata-provider/reducer/search.reducer.ts
rename to ui/src/app/metadata/resolver/reducer/search.reducer.ts
index 734057433..e047ea99b 100644
--- a/ui/src/app/metadata-provider/reducer/search.reducer.ts
+++ b/ui/src/app/metadata/resolver/reducer/search.reducer.ts
@@ -1,5 +1,4 @@
-import { SearchActionTypes, SearchActionUnion, SearchIds, SearchIdsSuccess, SearchIdsError } from '../action/search.action';
-import { MetadataProvider } from '../../domain/domain.type';
+import { SearchActionTypes, SearchActionUnion } from '../action/search.action';
 
 export interface SearchState {
     query: string;
diff --git a/ui/src/app/metadata/resolver/resolver.module.ts b/ui/src/app/metadata/resolver/resolver.module.ts
new file mode 100644
index 000000000..fcdd94c49
--- /dev/null
+++ b/ui/src/app/metadata/resolver/resolver.module.ts
@@ -0,0 +1,93 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { StoreModule } from '@ngrx/store';
+import { EffectsModule } from '@ngrx/effects';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { NewResolverComponent } from './container/new-resolver.component';
+
+import { ProviderEditorFormModule } from '../domain/component';
+import { UploadResolverComponent } from './container/upload-resolver.component';
+import { BlankResolverComponent } from './container/blank-resolver.component';
+import { CopyResolverComponent } from './container/copy-resolver.component';
+import { ResolverComponent } from './container/resolver.component';
+import { SharedModule } from '../../shared/shared.module';
+import { SearchIdEffects } from './effect/search.effect';
+import * as fromResolver from './reducer';
+import { ConfirmCopyComponent } from './container/confirm-copy.component';
+import { CopyIsSetGuard } from './guard/copy-isset.guard';
+import { CopyResolverEffects } from './effect/copy.effect';
+import { DomainModule } from '../domain/domain.module';
+import { DraftComponent } from './container/draft.component';
+import { EditorComponent } from './container/editor.component';
+import { WizardComponent } from './container/wizard.component';
+import { WizardNavComponent } from './component/wizard-nav.component';
+import { ResolverCollectionEffects } from './effect/collection.effects';
+import { DraftCollectionEffects } from './effect/draft-collection.effects';
+import { WizardEffects } from './effect/wizard.effect';
+import { EditorEffects } from './effect/editor.effect';
+import { UnsavedDialogComponent } from './component/unsaved-dialog.component';
+
+@NgModule({
+    declarations: [
+        NewResolverComponent,
+        UploadResolverComponent,
+        BlankResolverComponent,
+        CopyResolverComponent,
+        ConfirmCopyComponent,
+        ResolverComponent,
+        DraftComponent,
+        EditorComponent,
+        WizardComponent,
+        WizardNavComponent,
+        UnsavedDialogComponent
+    ],
+    entryComponents: [
+        UnsavedDialogComponent
+    ],
+    imports: [
+        DomainModule,
+        SharedModule,
+        HttpClientModule,
+        CommonModule,
+        RouterModule,
+        ReactiveFormsModule,
+        FormsModule,
+        ProviderEditorFormModule,
+        NgbDropdownModule
+    ],
+    exports: [
+        ProviderEditorFormModule,
+        WizardNavComponent
+    ],
+    providers: []
+})
+export class ResolverModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: RootResolverModule,
+            providers: [
+                CopyIsSetGuard
+            ]
+        };
+    }
+}
+
+@NgModule({
+    imports: [
+        ResolverModule,
+        StoreModule.forFeature('resolver', fromResolver.reducers),
+        EffectsModule.forFeature([
+            SearchIdEffects,
+            CopyResolverEffects,
+            ResolverCollectionEffects,
+            DraftCollectionEffects,
+            WizardEffects,
+            EditorEffects
+        ])
+    ],
+})
+export class RootResolverModule { }
diff --git a/ui/src/app/notification/reducer/index.ts b/ui/src/app/notification/reducer/index.ts
index 4298e3315..f8458bb12 100644
--- a/ui/src/app/notification/reducer/index.ts
+++ b/ui/src/app/notification/reducer/index.ts
@@ -1,7 +1,6 @@
 import { createSelector, createFeatureSelector } from '@ngrx/store';
 import * as fromNotifications from './notification.reducer';
 import * as fromRoot from '../../core/reducer';
-import { Notification } from '../model/notification';
 
 export interface State extends fromRoot.State {
     notifications: NotificationState;
diff --git a/ui/src/app/routing.module.ts b/ui/src/app/routing.module.ts
deleted file mode 100644
index 9be145029..000000000
--- a/ui/src/app/routing.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-const routes: Routes = [
-    { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
-    {
-        path: 'dashboard',
-        loadChildren: './dashboard/dashboard.module#DashboardModule',
-        canActivate: []
-    },
-    {
-        path: 'provider',
-        loadChildren: './edit-provider/editor.module#EditorModule',
-        canActivate: []
-    },
-    {
-        path: 'filter',
-        loadChildren: './metadata-filter/filter.module#FilterModule',
-        canActivate: []
-    }
-];
-
-@NgModule({
-    imports: [RouterModule.forRoot(routes)],
-    exports: [RouterModule]
-})
-export class AppRoutingModule { }
diff --git a/ui/src/app/domain/component/i18n-text.component.html b/ui/src/app/shared/component/i18n-text.component.html
similarity index 100%
rename from ui/src/app/domain/component/i18n-text.component.html
rename to ui/src/app/shared/component/i18n-text.component.html
diff --git a/ui/src/app/domain/component/i18n-text.component.ts b/ui/src/app/shared/component/i18n-text.component.ts
similarity index 100%
rename from ui/src/app/domain/component/i18n-text.component.ts
rename to ui/src/app/shared/component/i18n-text.component.ts
diff --git a/ui/src/app/edit-provider/component/valid-form-icon.component.html b/ui/src/app/shared/component/valid-form-icon.component.html
similarity index 100%
rename from ui/src/app/edit-provider/component/valid-form-icon.component.html
rename to ui/src/app/shared/component/valid-form-icon.component.html
diff --git a/ui/src/app/edit-provider/component/valid-form-icon.component.ts b/ui/src/app/shared/component/valid-form-icon.component.ts
similarity index 74%
rename from ui/src/app/edit-provider/component/valid-form-icon.component.ts
rename to ui/src/app/shared/component/valid-form-icon.component.ts
index 389e5b0a3..4528f273b 100644
--- a/ui/src/app/edit-provider/component/valid-form-icon.component.ts
+++ b/ui/src/app/shared/component/valid-form-icon.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
 
 @Component({
     selector: 'valid-form-icon',
diff --git a/ui/src/app/metadata-provider/directive/info-label.directive.spec.ts b/ui/src/app/shared/directive/info-label.directive.spec.ts
similarity index 100%
rename from ui/src/app/metadata-provider/directive/info-label.directive.spec.ts
rename to ui/src/app/shared/directive/info-label.directive.spec.ts
diff --git a/ui/src/app/metadata-provider/directive/info-label.directive.ts b/ui/src/app/shared/directive/info-label.directive.ts
similarity index 100%
rename from ui/src/app/metadata-provider/directive/info-label.directive.ts
rename to ui/src/app/shared/directive/info-label.directive.ts
diff --git a/ui/src/app/metadata-provider/directive/input-defaults.directive.spec.ts b/ui/src/app/shared/directive/input-defaults.directive.spec.ts
similarity index 100%
rename from ui/src/app/metadata-provider/directive/input-defaults.directive.spec.ts
rename to ui/src/app/shared/directive/input-defaults.directive.spec.ts
diff --git a/ui/src/app/metadata-provider/directive/input-defaults.directive.ts b/ui/src/app/shared/directive/input-defaults.directive.ts
similarity index 100%
rename from ui/src/app/metadata-provider/directive/input-defaults.directive.ts
rename to ui/src/app/shared/directive/input-defaults.directive.ts
diff --git a/ui/src/app/shared/pipe/highlight.pipe.spec.ts b/ui/src/app/shared/pipe/highlight.pipe.spec.ts
new file mode 100644
index 000000000..40a5cffce
--- /dev/null
+++ b/ui/src/app/shared/pipe/highlight.pipe.spec.ts
@@ -0,0 +1,28 @@
+import { HighlightPipe } from './highlight.pipe';
+import { DomSanitizer } from '@angular/platform-browser';
+
+describe('Pipe: Highlight', () => {
+    let pipe: HighlightPipe;
+
+    beforeEach(() => {
+        pipe = new HighlightPipe(<DomSanitizer>{
+            bypassSecurityTrustHtml: jasmine.createSpy('bypassSecurityTrustHtml'),
+            sanitize: jasmine.createSpy('sanitize'),
+            bypassSecurityTrustStyle: jasmine.createSpy('bypassSecurityTrustStyle'),
+            bypassSecurityTrustScript: jasmine.createSpy('bypassSecurityTrustScript'),
+            bypassSecurityTrustUrl: jasmine.createSpy('bypassSecurityTrustUrl'),
+            bypassSecurityTrustResourceUrl: jasmine.createSpy('bypassSecurityTrustResourceUrl')
+        });
+    });
+
+    it('should return the attribute value', () => {
+        const str = 'foobar';
+        const query = 'foo';
+        expect(pipe.transform(str, query)).toBeUndefined();
+    });
+    it('should return - if the attribute is null', () => {
+        expect(pipe.transform(null, null)).toBeNull();
+        expect(pipe.transform('foo', null)).toEqual('foo');
+        expect(pipe.transform(null, 'foo')).toBeNull();
+    });
+});
diff --git a/ui/src/app/shared/pipe/pretty-xml.pipe.spec.ts b/ui/src/app/shared/pipe/pretty-xml.pipe.spec.ts
new file mode 100644
index 000000000..9aa1d875a
--- /dev/null
+++ b/ui/src/app/shared/pipe/pretty-xml.pipe.spec.ts
@@ -0,0 +1,20 @@
+import { PrettyXml } from './pretty-xml.pipe';
+import * as XmlFormatter from 'xml-formatter';
+
+describe('Pipe: Pretty Xml', () => {
+    let pipe: PrettyXml;
+
+    beforeEach(() => {
+        pipe = new PrettyXml();
+    });
+
+    it('should return the formatted xml', () => {
+        const str = '<foobar><foo></foo><bar></bar></foobar>';
+        expect(pipe.transform(str)).toEqual(XmlFormatter(str));
+    });
+
+    it('should return the provided string if not truthy', () => {
+        const str = '';
+        expect(pipe.transform(str)).toEqual('');
+    });
+});
diff --git a/ui/src/app/metadata-provider/pipe/pretty-xml.pipe.ts b/ui/src/app/shared/pipe/pretty-xml.pipe.ts
similarity index 100%
rename from ui/src/app/metadata-provider/pipe/pretty-xml.pipe.ts
rename to ui/src/app/shared/pipe/pretty-xml.pipe.ts
diff --git a/ui/src/app/shared/preview/preview-dialog.component.ts b/ui/src/app/shared/preview/preview-dialog.component.ts
deleted file mode 100644
index 43d66937c..000000000
--- a/ui/src/app/shared/preview/preview-dialog.component.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { Observable } from 'rxjs';
-import { MetadataProvider } from '../../domain/model/metadata-provider';
-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';
-import { MetadataEntity } from '../../domain/domain.type';
-
-@Component({
-    selector: 'preview-dialog',
-    templateUrl: './preview-dialog.component.html'
-})
-export class PreviewDialogComponent {
-    @Input() entity: MetadataEntity;
-    @Input() xml: string;
-
-    sub: Subscription;
-
-    constructor(
-        public activeModal: NgbActiveModal,
-        private entityService: EntityDescriptorService
-    ) {}
-
-    preview(xml): void {
-        const blob = new Blob([xml], { type: 'text/xml;charset=utf-8' });
-        FileSaver.saveAs(blob, `${ this.entity.name }.xml`);
-    }
-} /* istanbul ignore next */
diff --git a/ui/src/app/shared/preview/preview-dialog.module.ts b/ui/src/app/shared/preview/preview-dialog.module.ts
deleted file mode 100644
index 3fac36808..000000000
--- a/ui/src/app/shared/preview/preview-dialog.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap/modal/modal.module';
-import { PreviewDialogComponent } from './preview-dialog.component';
-
-@NgModule({
-    declarations: [
-        PreviewDialogComponent
-    ],
-    entryComponents: [
-        PreviewDialogComponent
-    ],
-    imports: [
-        NgbModalModule,
-        CommonModule
-    ],
-    providers: []
-})
-export class PreviewDialogModule { }
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index d6a0436aa..88abddf1b 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -4,6 +4,11 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HighlightPipe } from './pipe/highlight.pipe';
 import { AutoCompleteComponent } from './autocomplete/autocomplete.component';
 import { ValidationClassDirective } from './validation/validation-class.directive';
+import { InputDefaultsDirective } from './directive/input-defaults.directive';
+import { I18nTextComponent } from './component/i18n-text.component';
+import { ValidFormIconComponent } from './component/valid-form-icon.component';
+import { InfoLabelDirective } from './directive/info-label.directive';
+import { PrettyXml } from './pipe/pretty-xml.pipe';
 
 @NgModule({
     imports: [
@@ -14,14 +19,22 @@ import { ValidationClassDirective } from './validation/validation-class.directiv
     declarations: [
         HighlightPipe,
         AutoCompleteComponent,
-        ValidationClassDirective
+        ValidationClassDirective,
+        InputDefaultsDirective,
+        I18nTextComponent,
+        ValidFormIconComponent,
+        InfoLabelDirective,
+        PrettyXml
     ],
     exports: [
         HighlightPipe,
         AutoCompleteComponent,
         CommonModule,
         ReactiveFormsModule,
-        FormsModule
+        FormsModule,
+        InputDefaultsDirective,
+        I18nTextComponent,
+        ValidFormIconComponent
     ]
 })
 export class SharedModule { }
diff --git a/ui/src/testing/provider.stub.ts b/ui/src/testing/provider.stub.ts
index 724efd971..344ba5ef0 100644
--- a/ui/src/testing/provider.stub.ts
+++ b/ui/src/testing/provider.stub.ts
@@ -5,10 +5,9 @@ import {
     Certificate,
     SecurityInfo,
     LogoutEndpoint
-} from '../app/domain/model/metadata-provider';
+} from '../app/metadata/domain/model';
 
 export const draft = {
-    entityId: 'foo',
     serviceProviderName: 'bar'
 } as MetadataProvider;
 
diff --git a/ui/src/testing/resolver.stub.ts b/ui/src/testing/resolver.stub.ts
new file mode 100644
index 000000000..7520e2606
--- /dev/null
+++ b/ui/src/testing/resolver.stub.ts
@@ -0,0 +1,49 @@
+import {
+    MetadataProvider,
+    Contact,
+    SsoService,
+    Certificate,
+    SecurityInfo,
+    LogoutEndpoint,
+    MetadataResolver
+} from '../app/metadata/domain/model';
+
+export const draft = {
+    entityId: 'foo',
+    serviceProviderName: 'bar'
+} as MetadataResolver;
+
+export const resolver = {
+    ...draft,
+    id: '1'
+} as MetadataResolver;
+
+export const contact = {
+    type: 'support',
+    name: 'hithere yo',
+    emailAddress: 'somewhere@something.com'
+} as Contact;
+
+export const endpoint = {
+    binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
+    locationUrl: 'http://unicon.net/location',
+    makeDefault: false
+} as SsoService;
+
+export const certificate = {
+    name: 'foo',
+    type: 'signing',
+    value: 'xyz'
+} as Certificate;
+
+export const secInfo = {
+    x509CertificateAvailable: false,
+    authenticationRequestsSigned: true,
+    wantAssertionsSigned: true,
+    x509Certificates: []
+} as SecurityInfo;
+
+export const logoutEndpoint = {
+    url: 'foo',
+    bindingType: 'bar'
+} as LogoutEndpoint;