diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index 1c898c637bb4ecd32078f90460e09ad5272e7c73..54885511baaecc570148e521dd90649055b75e10 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -8,6 +8,7 @@ to take advantage of it's newer realtime abilities.
 
 Edge is the USGS earthquake hazard centers replacement for earthworm.
 """
+
 from __future__ import absolute_import
 import sys
 from typing import List, Optional
@@ -19,7 +20,7 @@ from obspy.core import Stats, Stream, Trace, UTCDateTime
 
 from .. import ChannelConverter, TimeseriesUtility
 from ..geomag_types import DataInterval, DataType
-from ..Metadata import get_instrument
+from ..metadata.instrument.InstrumentCalibrations import get_instrument
 from ..TimeseriesFactory import TimeseriesFactory
 from ..TimeseriesFactoryException import TimeseriesFactoryException
 from ..ObservatoryMetadata import ObservatoryMetadata
diff --git a/geomagio/Metadata.py b/geomagio/metadata/instrument/InstrumentCalibrations.py
similarity index 100%
rename from geomagio/Metadata.py
rename to geomagio/metadata/instrument/InstrumentCalibrations.py
diff --git a/geomagio/metadata/instrument/__init__.py b/geomagio/metadata/instrument/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..c470473d1dcbd0aab8e8985c965267b10585d82f
--- /dev/null
+++ b/geomagio/metadata/instrument/__init__.py
@@ -0,0 +1,6 @@
+from .InstrumentCalibrations import InstrumentCalibrations
+
+
+__all__ = [
+    "InstrumentCalibrations",
+]
diff --git a/test/Metadata_test.py b/test/Metadata_test.py
index 01e5e417144c6b3ac4c1a9557dcea7b07934a8ae..d56571ac943f7709bad03db2ec16603dd2bd5f5d 100644
--- a/test/Metadata_test.py
+++ b/test/Metadata_test.py
@@ -1,5 +1,5 @@
 from obspy import UTCDateTime
-from geomagio.Metadata import get_instrument
+from geomagio.metadata.instrument.InstrumentCalibrations import get_instrument
 from numpy.testing import assert_equal
 
 
diff --git a/test/edge_test/MiniSeedFactory_test.py b/test/edge_test/MiniSeedFactory_test.py
index 6b0dbbd91436911d003646887bcd581cc4925df0..2e9d09526c3a8c9c3112020ad74b93fe8db6b525 100644
--- a/test/edge_test/MiniSeedFactory_test.py
+++ b/test/edge_test/MiniSeedFactory_test.py
@@ -1,4 +1,5 @@
 """Tests for MiniSeedFactory.py"""
+
 import io
 from typing import List
 
@@ -9,7 +10,7 @@ import pytest
 
 from geomagio import TimeseriesUtility
 from geomagio.edge import MiniSeedFactory, MiniSeedInputClient
-from geomagio.Metadata import get_instrument
+from geomagio.metadata.instrument.InstrumentCalibrations import get_instrument
 from .mseed_test_clients import MockMiniSeedClient, MisalignedMiniSeedClient