diff --git a/bin/curvecalc b/bin/curvecalc
--- a/bin/curvecalc
+++ b/bin/curvecalc
@@ -34,9 +34,9 @@ log = logging.getLogger()
 import run_local
 from light9 import Submaster, dmxclient, networking, showconfig, prof, Patch
 from light9.TLUtility import make_attributes_from_args
-from light9.zoomcontrol import Zoomcontrol
-from light9.curve import Curveset
-from light9.curveview import Curvesetview
+from light9.curvecalc.zoomcontrol import Zoomcontrol
+from light9.curvecalc.curve import Curveset
+from light9.curvecalc.curveview import Curvesetview
 from light9.wavelength import wavelength
 from light9.uihelpers import toplevelat
 from light9.namespaces import L9
diff --git a/light9/curvecalc/__init__.py b/light9/curvecalc/__init__.py
new file mode 100644
diff --git a/light9/cursors.py b/light9/curvecalc/cursors.py
rename from light9/cursors.py
rename to light9/curvecalc/cursors.py
diff --git a/light9/curve.py b/light9/curvecalc/curve.py
rename from light9/curve.py
rename to light9/curvecalc/curve.py
diff --git a/light9/curveview.py b/light9/curvecalc/curveview.py
rename from light9/curveview.py
rename to light9/curvecalc/curveview.py
--- a/light9/curveview.py
+++ b/light9/curvecalc/curveview.py
@@ -2,9 +2,9 @@ from __future__ import division
 import math, time, logging
 import Tix as tk
 import louie as dispatcher
-from light9.zoomcontrol import RegionZoom
-from light9 import cursors
-from light9.curve import introPad, postPad
+from light9.curvecalc.zoomcontrol import RegionZoom
+from light9.curvecalc import cursors
+from light9.curvecalc.curve import introPad, postPad
 from light9.dmxchanedit import gradient
 
 log = logging.getLogger()
diff --git a/light9/zoomcontrol.py b/light9/curvecalc/zoomcontrol.py
rename from light9/zoomcontrol.py
rename to light9/curvecalc/zoomcontrol.py
--- a/light9/zoomcontrol.py
+++ b/light9/curvecalc/zoomcontrol.py
@@ -1,10 +1,7 @@
 from __future__ import division
 import Tkinter as tk
-try:
-    from dispatch import dispatcher
-except ImportError:
-    import louie as dispatcher
-from light9 import cursors 
+import louie as dispatcher
+from light9.curvecalc import cursors 
 
 class Zoomcontrol(object,tk.Canvas):