diff --git a/docs/algorithms/DeltaF_usage.md b/docs/algorithms/DeltaF_usage.md
index ff93d774601967b7c784293904ca7a715d5dfb44..beb0b2d023fea4777daa0dd9f54a11fe1e2a6769 100644
--- a/docs/algorithms/DeltaF_usage.md
+++ b/docs/algorithms/DeltaF_usage.md
@@ -6,7 +6,7 @@ and a scalar total-field measurement made by independent sensors.  Read more
 about the [DeltaF Algorithm](./DeltaF.md).
 
 
-`geomag.py --deltaf {geo, obs, obsd}`
+`geomag.py --algorithm deltaf [--deltaf-from {geo, obs, obsd}]`
 
 
 ### Reference Frames
@@ -21,7 +21,7 @@ about the [DeltaF Algorithm](./DeltaF.md).
 To compute DeltaF from  HEZF data for Tucson observatory:
 ```
 geomag.py \
-    --deltaf obs \
+    --algorithm deltaf \
     --observatory TUC \
     --type variation \
     --interval minute \
diff --git a/docs/algorithms/XYZ_usage.md b/docs/algorithms/XYZ_usage.md
index b01fdd8be4834f4ed1884bb1840e3faa61b2613d..d154887f83005f19203821eb40d9c7504fc37992 100644
--- a/docs/algorithms/XYZ_usage.md
+++ b/docs/algorithms/XYZ_usage.md
@@ -5,7 +5,7 @@ The XYZ Algorithm rotates between `geographic`, `observatory`, and `magnetic`,
 channel orientations.  Read more about the [XYZ Algorithm](./XYZ.md).
 
 
-`geomag.py --xyz {geo, mag, obs, obsd} {geo, mag, obs, obsd}`
+`geomag.py --algorithm xyz [--xyz-from {geo,mag,obs,obsd}] [--xyz-to {geo,mag,obs,obsd}]`
 
 ### Reference Frames
 
@@ -30,7 +30,7 @@ There are 3 reference frames in this library.
 To convert HEZF data in pcdcp files to XYZF for Tucson observatory for all of
 March 2013 output to iaga2002 files:
 
-      geomag.py --xyz obs geo --observatory TUC \
+      geomag.py --algorithm xyz --observatory TUC \
       --starttime 2013-03-01T00:00:00Z --endtime 2013-03-31T23:59:00Z \
       --input-pcdcp-url file://data-pcdcp/./%(OBS)s%(year)s%(julian)s.%(i)s \
       --output-iaga-url file://data-iaga/./$(obs)s%(Y)s%(j)s.%(i)s \
diff --git a/docs/api.md b/docs/api.md
index 15c8df354c0b47fbcd11445a1c0b5e87fd246910..61ef90e0570f4a0b4ee1d6c40ff292ee792f3c71 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -44,11 +44,11 @@ Exception base class is `geomagio.TimeseriesFactoryException`.
 
 ## Algorithms
 
-Base class is `geomagio.Algorithm`
-Exception base class is `geomagio.AlgorithmException`
+Base class is `geomagio.algorithm.Algorithm`
+Exception base class is `geomagio.algorithm.AlgorithmException`
 
-- Delta F `geomagio.DeltaFAlgorithm`
-- XYZ `geomagio.XYZAlgorithm`
+- Delta F `geomagio.algorithm.DeltaFAlgorithm`
+- XYZ `geomagio.algorithm.XYZAlgorithm`
 
 
 ## Example
@@ -60,7 +60,7 @@ The following example:
 - Plots the data using matplotlib
 
 ```python
-from geomagio import XYZAlgorithm
+from geomagio.algorithm import XYZAlgorithm
 from geomagio.edge import EdgeFactory
 from obspy.core import UTCDateTime
 
diff --git a/docs/usage.md b/docs/usage.md
index bc28f80a448391409d1e1fc8e20c6e32147c23a4..a0bc321e649eef05c34694469449a2133f452330 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -68,10 +68,12 @@ There are flags to specify certain algorithms should be run against the data.
 
 #### XYZ ####
 
-`--xyz {geo, mag, obs, obsd} {geo, mag, obs, obsd}`
+`--algorithm xyz`
+`--xyz-from {geo, mag, obs, obsd}` (default is `obs`)
+`--xyz-to {geo, mag, obs, obsd}` (default is `geo`)
 
 #### [XYZ Usage](./algorithms/XYZ_usage.md) ####
-Rotate data from HEZ or HDZ to XYZ and back.
+Rotate data from HEZ (obs) or HDZ (mag) to XYZ (geo) and back.
 
 Extensive explanation of all input and output methods:
 [IO Methods](./io.md)
diff --git a/setup.py b/setup.py
index 0257b0d1df189943db32736561b7b92692d60446..84ef2911c87c6b82a32c55c9aaa286b5052151c1 100644
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,7 @@ setup(
     url='https://github.com/usgs/geomag-algorithms',
     packages=[
         'geomagio',
+        'geomagio.algorithm',
         'geomagio.iaga2002',
         'geomagio.imfv283',
         'geomagio.edge',