diff --git a/geomagio/JSON/__init__.py b/geomagio/JSON/__init__.py
deleted file mode 100644
index 900950d367ef0ff7cbcf28970a3917b7d02cdadc..0000000000000000000000000000000000000000
--- a/geomagio/JSON/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""IO Module for JSONFactory Format
-"""
-from __future__ import absolute_import
-
-from .JSONFactory import JSONFactory
-from .JSONWriter import JSONWriter
-
-
-__all__ = ['JSONWriter']
diff --git a/geomagio/JSON/JSONFactory.py b/geomagio/imfjson/IMFJSONFactory.py
similarity index 85%
rename from geomagio/JSON/JSONFactory.py
rename to geomagio/imfjson/IMFJSONFactory.py
index 539cba2c0c9f3655a550ea47a4ed4bbd4cb85b7c..21ec634e447189c1cbd2024ee1cd9c53d1afb0c5 100644
--- a/geomagio/JSON/JSONFactory.py
+++ b/geomagio/imfjson/IMFJSONFactory.py
@@ -1,13 +1,11 @@
 """Factory for json files."""
 from __future__ import absolute_import
 
-import obspy.core
-from .. import ChannelConverter
 from ..TimeseriesFactory import TimeseriesFactory
-from .JSONWriter import JSONWriter
+from .IMFJSONWriter import IMFJSONWriter
 
 
-class JSONFactory(TimeseriesFactory):
+class IMFJSONFactory(TimeseriesFactory):
     """TimeseriesFactory for IAGA 2002 formatted files.
 
     Parameters
@@ -37,4 +35,4 @@ class JSONFactory(TimeseriesFactory):
         channels : array_like
             list of channels to store
         """
-        JSONWriter().write(fh, timeseries, channels)
+        IMFJSONWriter().write(fh, timeseries, channels)
diff --git a/geomagio/JSON/JSONWriter.py b/geomagio/imfjson/IMFJSONWriter.py
similarity index 98%
rename from geomagio/JSON/JSONWriter.py
rename to geomagio/imfjson/IMFJSONWriter.py
index bad681dba62931cbec5d1e8826b4860f58126f66..2ea3896ccb0dc3a45951ac5e8a5b423dd0fff981 100644
--- a/geomagio/JSON/JSONWriter.py
+++ b/geomagio/imfjson/IMFJSONWriter.py
@@ -1,18 +1,15 @@
 from __future__ import absolute_import
-from builtins import range
 
 from io import BytesIO
 from collections import OrderedDict
 from datetime import datetime
 import json
 import numpy as np
-import textwrap
 from .. import ChannelConverter, TimeseriesUtility
 from ..edge import EdgeFactory
 from ..TimeseriesFactoryException import TimeseriesFactoryException
-from ..Util import create_empty_trace
 
-class JSONWriter(object):
+class IMFJSONWriter(object):
     """JSON writer.
     """
 
diff --git a/geomagio/imfjson/__init__.py b/geomagio/imfjson/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..2354d7b141d6192b90d43426c22490a69f72dd68
--- /dev/null
+++ b/geomagio/imfjson/__init__.py
@@ -0,0 +1,12 @@
+"""IO Module for IMFSONFactory Format
+"""
+from __future__ import absolute_import
+
+from .IMFJSONFactory import IMFJSONFactory
+from .IMFJSONWriter import IMFJSONWriter
+
+
+__all__ = [
+    'IMFJSONWriter',
+    'IMFJSONFactory'
+]
diff --git a/setup.py b/setup.py
index c2fc80c0ad973923338273c525c30a1999e33db7..fac703c5b8036c3d88b8eeba84b0e42de527c581 100644
--- a/setup.py
+++ b/setup.py
@@ -11,9 +11,9 @@ setup(
         'geomagio.binlog',
         'geomagio.edge',
         'geomagio.iaga2002',
+        'geomagio.imfjson',
         'geomagio.imfv122',
         'geomagio.imfv283',
-        'geomagio.JSON',
         'geomagio.pcdcp',
         'geomagio.temperature',
         'geomagio.vbf'