diff --git a/common/lib/calc/calc/__init__.py b/common/lib/calc/calc/__init__.py
new file mode 100644
index 0000000000..5956cb38b5
--- /dev/null
+++ b/common/lib/calc/calc/__init__.py
@@ -0,0 +1 @@
+from calc import *
diff --git a/common/lib/calc/calc.py b/common/lib/calc/calc/calc.py
similarity index 100%
rename from common/lib/calc/calc.py
rename to common/lib/calc/calc/calc.py
diff --git a/common/lib/calc/calcfunctions.py b/common/lib/calc/calc/calcfunctions.py
similarity index 100%
rename from common/lib/calc/calcfunctions.py
rename to common/lib/calc/calc/calcfunctions.py
diff --git a/common/lib/calc/preview.py b/common/lib/calc/calc/preview.py
similarity index 100%
rename from common/lib/calc/preview.py
rename to common/lib/calc/calc/preview.py
diff --git a/common/lib/calc/tests/test_calc.py b/common/lib/calc/calc/tests/test_calc.py
similarity index 100%
rename from common/lib/calc/tests/test_calc.py
rename to common/lib/calc/calc/tests/test_calc.py
diff --git a/common/lib/calc/tests/test_preview.py b/common/lib/calc/calc/tests/test_preview.py
similarity index 100%
rename from common/lib/calc/tests/test_preview.py
rename to common/lib/calc/calc/tests/test_preview.py
diff --git a/common/lib/calc/setup.py b/common/lib/calc/setup.py
index cb638914f9..30f6427c04 100644
--- a/common/lib/calc/setup.py
+++ b/common/lib/calc/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 setup(
     name="calc",
     version="0.1.1",
-    py_modules=["calc"],
+    packages=["calc"],
     install_requires=[
         "pyparsing==1.5.6",
         "numpy",