diff --git a/src/python/main.py b/bin/main.py
old mode 100644
new mode 100755
similarity index 78%
rename from src/python/main.py
rename to bin/main.py
index 1b0ac28599665f2c8bf67eb8365e025aa0e17a96..e943de4f607dcba9e406b923cb808ead554e37b9
--- a/src/python/main.py
+++ b/bin/main.py
@@ -1,18 +1,20 @@
+#! /usr/bin/env python
+
 
 from os import path
 # ensure geomag is on the path before importing
 script_dir = path.dirname(path.abspath(__file__))
 if __file__ != 'main.py':
     import sys
-    sys.path.append(script_dir)
+    sys.path.append(path.normpath(path.join(script_dir, '..')))
 
-import geomag.io.iaga2002 as iaga2002
+import geomagio.iaga2002 as iaga2002
 from obspy.core.utcdatetime import UTCDateTime
 
 
 def main():
     """Example loading IAGA2002 test data from a directory."""
-    iaga_dir = path.normpath(path.join(script_dir, '../../etc/iaga2002'))
+    iaga_dir = path.normpath(path.join(script_dir, '../etc/iaga2002'))
     factory = iaga2002.IAGA2002Factory('file://' + iaga_dir +
             '/%(OBS)s/%(interval)s%(type)s/%(obs)s%(ymd)s%(t)s%(i)s.%(i)s',
             observatory='BOU', channels=('H', 'D', 'Z', 'F'),
diff --git a/src/python/geomag/Algorithm.py b/geomagio/Algorithm.py
similarity index 100%
rename from src/python/geomag/Algorithm.py
rename to geomagio/Algorithm.py
diff --git a/src/python/geomag/ChannelConverter.py b/geomagio/ChannelConverter.py
similarity index 100%
rename from src/python/geomag/ChannelConverter.py
rename to geomagio/ChannelConverter.py
diff --git a/src/python/geomag/ChannelConverterTest.py b/geomagio/ChannelConverterTest.py
similarity index 100%
rename from src/python/geomag/ChannelConverterTest.py
rename to geomagio/ChannelConverterTest.py
diff --git a/src/python/geomag/StreamConverter.py b/geomagio/StreamConverter.py
similarity index 100%
rename from src/python/geomag/StreamConverter.py
rename to geomagio/StreamConverter.py
diff --git a/src/python/geomag/io/TimeseriesFactory.py b/geomagio/TimeseriesFactory.py
similarity index 100%
rename from src/python/geomag/io/TimeseriesFactory.py
rename to geomagio/TimeseriesFactory.py
diff --git a/src/python/geomag/io/TimeseriesFactoryException.py b/geomagio/TimeseriesFactoryException.py
similarity index 100%
rename from src/python/geomag/io/TimeseriesFactoryException.py
rename to geomagio/TimeseriesFactoryException.py
diff --git a/src/python/geomag/WaveserverFactory.py b/geomagio/WaveserverFactory.py
similarity index 100%
rename from src/python/geomag/WaveserverFactory.py
rename to geomagio/WaveserverFactory.py
diff --git a/src/python/geomag/io/__init__.py b/geomagio/__init__.py
similarity index 53%
rename from src/python/geomag/io/__init__.py
rename to geomagio/__init__.py
index 3ed3e9fdcac198668e1b95ec331826e896b89e15..1f6c5db88288c9f7c41e730b50c53918189da1b7 100644
--- a/src/python/geomag/io/__init__.py
+++ b/geomagio/__init__.py
@@ -1,12 +1,16 @@
 """
-Geomag Timeseries IO Module
+Geomag Algorithm Module
 """
-
+from Algorithm import Algorithm
+import ChannelConverter
+import StreamConverter
 from TimeseriesFactory import TimeseriesFactory
 from TimeseriesFactoryException import TimeseriesFactoryException
 
-
 __all__ = [
+    'Algorithm',
+    'ChannelConverter',
+    'StreamConverter',
     'TimeseriesFactory',
     'TimeseriesFactoryException'
 ]
diff --git a/src/python/geomag/io/iaga2002/IAGA2002Factory.py b/geomagio/iaga2002/IAGA2002Factory.py
similarity index 99%
rename from src/python/geomag/io/iaga2002/IAGA2002Factory.py
rename to geomagio/iaga2002/IAGA2002Factory.py
index e1466d9423e2096ccb70c9cfa28a9ad838a9c2f2..849643794d84e89412aa87e791dd77470f9243f6 100644
--- a/src/python/geomag/io/iaga2002/IAGA2002Factory.py
+++ b/geomagio/iaga2002/IAGA2002Factory.py
@@ -3,7 +3,7 @@
 import urllib2
 import obspy.core
 import os
-from geomag.io import TimeseriesFactory, TimeseriesFactoryException
+from geomagio import TimeseriesFactory, TimeseriesFactoryException
 from IAGA2002Parser import IAGA2002Parser
 from IAGA2002Writer import IAGA2002Writer
 
diff --git a/src/python/geomag/io/iaga2002/IAGA2002Factory_test.py b/geomagio/iaga2002/IAGA2002Factory_test.py
similarity index 100%
rename from src/python/geomag/io/iaga2002/IAGA2002Factory_test.py
rename to geomagio/iaga2002/IAGA2002Factory_test.py
diff --git a/src/python/geomag/io/iaga2002/IAGA2002Parser.py b/geomagio/iaga2002/IAGA2002Parser.py
similarity index 100%
rename from src/python/geomag/io/iaga2002/IAGA2002Parser.py
rename to geomagio/iaga2002/IAGA2002Parser.py
diff --git a/src/python/geomag/io/iaga2002/IAGA2002Parser_test.py b/geomagio/iaga2002/IAGA2002Parser_test.py
similarity index 100%
rename from src/python/geomag/io/iaga2002/IAGA2002Parser_test.py
rename to geomagio/iaga2002/IAGA2002Parser_test.py
diff --git a/src/python/geomag/io/iaga2002/IAGA2002Writer.py b/geomagio/iaga2002/IAGA2002Writer.py
similarity index 99%
rename from src/python/geomag/io/iaga2002/IAGA2002Writer.py
rename to geomagio/iaga2002/IAGA2002Writer.py
index 40a8247f15d1b8a4824aeca20f30589970180f97..a36d6108b04b6536fa9dbe793935420c42e18853 100644
--- a/src/python/geomag/io/iaga2002/IAGA2002Writer.py
+++ b/geomagio/iaga2002/IAGA2002Writer.py
@@ -1,6 +1,6 @@
 
 from cStringIO import StringIO
-from geomag.io import TimeseriesFactoryException
+from geomagio import TimeseriesFactoryException
 import numpy
 import IAGA2002Parser
 import textwrap
diff --git a/src/python/geomag/io/iaga2002/MagWebFactory.py b/geomagio/iaga2002/MagWebFactory.py
similarity index 100%
rename from src/python/geomag/io/iaga2002/MagWebFactory.py
rename to geomagio/iaga2002/MagWebFactory.py
diff --git a/src/python/geomag/io/iaga2002/MagWebFactory_test.py b/geomagio/iaga2002/MagWebFactory_test.py
similarity index 100%
rename from src/python/geomag/io/iaga2002/MagWebFactory_test.py
rename to geomagio/iaga2002/MagWebFactory_test.py
diff --git a/src/python/geomag/io/iaga2002/__init__.py b/geomagio/iaga2002/__init__.py
similarity index 100%
rename from src/python/geomag/io/iaga2002/__init__.py
rename to geomagio/iaga2002/__init__.py
diff --git a/src/python/geomag/__init__.py b/src/python/geomag/__init__.py
deleted file mode 100644
index e9ae2e6b96a55513e8bfa7d508826039790082b6..0000000000000000000000000000000000000000
--- a/src/python/geomag/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-Geomag Algorithm Module
-"""