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/model/metadata-base.ts b/ui/src/app/domain/model/metadata-base.ts
deleted file mode 100644
index fc5ea1ca7..000000000
--- a/ui/src/app/domain/model/metadata-base.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface MetadataBase {
-    id?: string;
-    createdDate?: string;
-    modifiedDate?: string;
-    version: string;
-
-    name: string;
-    enabled: boolean;
-    kind: string;
-
-    serialize(): any;
-}
diff --git a/ui/src/app/metadata/domain/domain.type.ts b/ui/src/app/metadata/domain/domain.type.ts
index 71a8194ed..6391a9be0 100644
--- a/ui/src/app/metadata/domain/domain.type.ts
+++ b/ui/src/app/metadata/domain/domain.type.ts
@@ -4,13 +4,36 @@ import {
     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'
 }
 
-export type Metadata =
-    | MetadataProvider
-    | MetadataResolver
-    | MetadataFilter;
+export * from './model';
+export * from './entity';
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 82%
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..d2bbe89ab 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;
@@ -42,7 +42,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/model/provider.entity.ts b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
similarity index 87%
rename from ui/src/app/metadata/domain/model/provider.entity.ts
rename to ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
index 6cffb27a6..d5841ab0b 100644
--- a/ui/src/app/metadata/domain/model/provider.entity.ts
+++ b/ui/src/app/metadata/domain/entity/provider/file-backed-http-metadata-provider.ts
@@ -10,10 +10,10 @@ import {
     SsoService,
     IdpSsoDescriptor,
     RelyingPartyOverrides
-} from '../model';
-import { MetadataTypes } from '../domain.type';
+} from '../../model';
+import { MetadataTypes } from '../../domain.type';
 
-export class Provider implements MetadataProvider, MetadataEntity {
+export class FileBackedHttpMetadataProvider implements MetadataProvider, MetadataEntity {
     id = '';
     createdDate?: string;
     modifiedDate?: string;
@@ -61,7 +61,7 @@ export class Provider implements MetadataProvider, MetadataEntity {
     }
 
     get kind(): string {
-        return DomainEntityKinds.provider;
+        return MetadataTypes.PROVIDER;
     }
 
     serialize(): any {
diff --git a/ui/src/app/metadata/domain/model/provider.entity.spec.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.spec.ts
similarity index 94%
rename from ui/src/app/metadata/domain/model/provider.entity.spec.ts
rename to ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.spec.ts
index 0ad9cee8b..669033c19 100644
--- a/ui/src/app/metadata/domain/model/provider.entity.spec.ts
+++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.spec.ts
@@ -1,4 +1,4 @@
-import { Resolver } from './resolver.entity';
+import { FileBackedHttpMetadataResolver } from './file-backed-http-metadata-resolver';
 
 describe('Resolver construct', () => {
 
@@ -83,7 +83,7 @@ describe('Resolver construct', () => {
             'mail'
         ]
     };
-    const entity = new Resolver(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/model/resolver.entity.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts
similarity index 84%
rename from ui/src/app/metadata/domain/model/resolver.entity.ts
rename to ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts
index 0b45a0344..8759ef3eb 100644
--- a/ui/src/app/metadata/domain/model/resolver.entity.ts
+++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts
@@ -9,11 +9,11 @@ import {
     SsoService,
     IdpSsoDescriptor,
     RelyingPartyOverrides
-} from '../model';
-import { MetadataTypes } from '../domain.type';
-import { MetadataEntity } from '../model/metadata-entity';
+} from '../../model';
+import { MetadataTypes } from '../../domain.type';
+import { MetadataEntity } from '../../model/metadata-entity';
 
-export class Resolver implements MetadataProvider, MetadataEntity {
+export class FileBackedHttpMetadataResolver implements MetadataProvider, MetadataEntity {
     id = '';
     createdDate?: string;
     modifiedDate?: string;
@@ -60,7 +60,7 @@ export class Resolver implements MetadataProvider, MetadataEntity {
         return this.serviceEnabled;
     }
 
-    get type(): string {
+    get kind(): string {
         return MetadataTypes.RESOLVER;
     }
 
diff --git a/ui/src/app/metadata/domain/model/filter.entity.ts b/ui/src/app/metadata/domain/model/filter.entity.ts
deleted file mode 100644
index 867ee3b3b..000000000
--- a/ui/src/app/metadata/domain/model/filter.entity.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { MetadataFilter, RelyingPartyOverrides } from '../model';
-import { MetadataTypes } from '../domain.type';
-import { FilterTarget } from '../model';
-import { MetadataEntity } from '../model';
-
-export class Filter implements MetadataFilter, MetadataEntity {
-    id = '';
-    createdDate?: string;
-    modifiedDate?: string;
-    version: string;
-
-    filterName = '';
-    filterEnabled = false;
-
-    relyingPartyOverrides = {
-        nameIdFormats: [] as string[],
-        authenticationMethods: [] as string[]
-    } as RelyingPartyOverrides;
-
-    attributeRelease = [] as string[];
-
-    filterTarget: FilterTarget = {
-        type: 'ENTITY',
-        value: ['']
-    };
-
-    constructor(obj?: Partial<MetadataFilter>) {
-        Object.assign(this, { ...obj });
-    }
-
-    get name(): string {
-        return this.filterName;
-    }
-
-    get enabled(): boolean {
-        return this.filterEnabled;
-    }
-
-    get type(): string {
-        return MetadataTypes.FILTER;
-    }
-
-    get entityId(): string {
-        return this.filterTarget.value[0];
-    }
-
-    set entityId(val: string) {
-        this.filterTarget.value[0] = val;
-    }
-
-    serialize(): any {
-        return {
-            attributeRelease: this.attributeRelease,
-            relyingPartyOverrides: this.relyingPartyOverrides,
-            filterTarget: { ...this.filterTarget },
-            filterEnabled: this.filterEnabled,
-            filterName: this.filterName
-        };
-    }
-}
diff --git a/ui/src/app/metadata/domain/model/metadata-entity.ts b/ui/src/app/metadata/domain/model/metadata-entity.ts
index 6f7b9f306..68dab399f 100644
--- a/ui/src/app/metadata/domain/model/metadata-entity.ts
+++ b/ui/src/app/metadata/domain/model/metadata-entity.ts
@@ -1,7 +1,7 @@
 export interface MetadataEntity {
     name: string;
     enabled: boolean;
-    type: string;
+    kind: string;
 
     serialize(): any;
 }