diff --git a/Packages/ohif-metadata/client/OHIFInstanceMetadata.js b/Packages/ohif-core/client/classes/metadata/OHIFInstanceMetadata.js
similarity index 100%
rename from Packages/ohif-metadata/client/OHIFInstanceMetadata.js
rename to Packages/ohif-core/client/classes/metadata/OHIFInstanceMetadata.js
diff --git a/Packages/ohif-metadata/client/OHIFSeriesMetadata.js b/Packages/ohif-core/client/classes/metadata/OHIFSeriesMetadata.js
similarity index 100%
rename from Packages/ohif-metadata/client/OHIFSeriesMetadata.js
rename to Packages/ohif-core/client/classes/metadata/OHIFSeriesMetadata.js
diff --git a/Packages/ohif-metadata/client/OHIFStudyMetadata.js b/Packages/ohif-core/client/classes/metadata/OHIFStudyMetadata.js
similarity index 100%
rename from Packages/ohif-metadata/client/OHIFStudyMetadata.js
rename to Packages/ohif-core/client/classes/metadata/OHIFStudyMetadata.js
diff --git a/Packages/ohif-core/client/classes/metadata/index.js b/Packages/ohif-core/client/classes/metadata/index.js
new file mode 100644
index 000000000..b366f6dc0
--- /dev/null
+++ b/Packages/ohif-core/client/classes/metadata/index.js
@@ -0,0 +1,11 @@
+import { OHIFStudyMetadata } from './OHIFStudyMetadata';
+import { OHIFSeriesMetadata } from './OHIFSeriesMetadata';
+import { OHIFInstanceMetadata } from './OHIFInstanceMetadata';
+
+const metadata = {
+    OHIFStudyMetadata,
+    OHIFSeriesMetadata,
+    OHIFInstanceMetadata
+}
+
+export default metadata;
diff --git a/Packages/ohif-core/client/metadata.js b/Packages/ohif-core/client/metadata.js
new file mode 100644
index 000000000..6ecd79323
--- /dev/null
+++ b/Packages/ohif-core/client/metadata.js
@@ -0,0 +1,11 @@
+import { OHIF } from 'meteor/ohif:core';
+import { metadata } from '/client/classes/metadata/';
+
+/**
+ * Append Metadata namespace to OHIF namespace...
+ */
+
+OHIF.metadata = metadata;
+
+export { metadata };
+
diff --git a/Packages/ohif-metadata/client/index.js b/Packages/ohif-metadata/client/index.js
deleted file mode 100644
index 1ccd601e1..000000000
--- a/Packages/ohif-metadata/client/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Metadata } from '../namespace';
-
-// OHIFStudyMetadata, OHIFSeriesMetadata, OHIFInstanceMetadata
-import { OHIFStudyMetadata } from './OHIFStudyMetadata';
-import { OHIFSeriesMetadata } from './OHIFSeriesMetadata';
-import { OHIFInstanceMetadata } from './OHIFInstanceMetadata';
-
-Metadata.StudyMetadata = OHIFStudyMetadata;
-Metadata.SeriesMetadata = OHIFSeriesMetadata;
-Metadata.InstanceMetadata = OHIFInstanceMetadata;
\ No newline at end of file
diff --git a/Packages/ohif-metadata/main.js b/Packages/ohif-metadata/main.js
deleted file mode 100644
index 4456cc3a4..000000000
--- a/Packages/ohif-metadata/main.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Import namespace...
- */
-
-import { OHIF, Metadata } from  './namespace.js';
-
-/**
- * Import scripts that will populate the Metadata namespace as a side effect only import. This is effectively the public API...
- */
-
-import './client/'; // which is actually: import './client/index.js';
-
-/**
- * Export relevant objects...
- *
- * With the following export it becomes possible to import "OHIF" from "ohif:core" and "Metadata"
- * from "ohif:metadata" using a single import (a shorthand), like this:
- *
- * import { OHIF } from 'meteor/ohif:metadata';
- *
- * Which is equivalent to:
- *
- * import { OHIF } from 'meteor/ohif:core';
- * import 'meteor/ohif:metadata';
- *
- * The second (extended) format should be used when other OHIF packages are also to be used within
- * the current module. This makes it explicit that the following imports will populate their
- * respective namespaces within the to "OHIF" namespace. Example:
- *
- * import { OHIF } from 'meteor/ohif:core';
- * import 'meteor/ohif:metadata';
- * import 'meteor/ohif:hanging-protocols';
- * [ ... ]
- * OHIF.metadata.setActiveViewport(...);
- * OHIF.hangingprotocols.doSomething(...);
- *
- */
-
-export { OHIF, Metadata };
diff --git a/Packages/ohif-metadata/namespace.js b/Packages/ohif-metadata/namespace.js
deleted file mode 100644
index a17212475..000000000
--- a/Packages/ohif-metadata/namespace.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Import main dependency...
- */
-
-import { OHIF } from 'meteor/ohif:core';
-
-/**
- * Create Metadata namespace...
- */
-
-const Metadata = {};
-
-/**
- * Append Metadata namespace to OHIF namespace...
- */
-
-OHIF.metadata = Metadata;
-
-/**
- * Export relevant objects...
- */
-
-export { OHIF, Metadata };