diff --git a/.gitmodules b/.gitmodules
index e02fa22..f696841 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,49 +1,49 @@
 [submodule "src/hispec/util/lakeshore"]
-	path = src/hispec/util/lakeshore
+	path = src/hispec/driver/lakeshore
 	url = https://github.com/COO-Utilities/lakeshore
 	branch = main
 [submodule "src/hispec/util/inficon"]
-	path = src/hispec/util/inficon
+	path = src/hispec/driver/inficon
 	url = https://github.com/COO-Utilities/inficon
 	branch = main
 [submodule "src/hispec/util/gammavac"]
-	path = src/hispec/util/gammavac
+	path = src/hispec/driver/gammavac
 	url = https://github.com/COO-Utilities/gammavac
 	branch = main
 [submodule "src/hispec/util/standa"]
-	path = src/hispec/util/standa
+	path = src/hispec/driver/standa
 	url = https://github.com/COO-Utilities/standa
 	branch = main
 [submodule "src/hispec/util/thorlabs"]
-	path = src/hispec/util/thorlabs
+	path = src/hispec/driver/thorlabs
 	url = https://github.com/COO-Utilities/thorlabs
 	branch = main
 [submodule "src/hispec/util/sunpower"]
-	path = src/hispec/util/sunpower
+	path = src/hispec/driver/sunpower
 	url = https://github.com/COO-Utilities/sunpower
 	branch = main
 [submodule "src/hispec/util/onewire"]
-	path = src/hispec/util/onewire
+	path = src/hispec/driver/onewire
 	url = https://github.com/COO-Utilities/onewire
 	branch = main
 [submodule "src/hispec/util/xeryon"]
-	path = src/hispec/util/xeryon
+	path = src/hispec/driver/xeryon
 	url = https://github.com/COO-Utilities/xeryon
 	branch = main
 [submodule "src/hispec/util/pi"]
-	path = src/hispec/util/pi
+	path = src/hispec/driver/pi
 	url = https://github.com/COO-Utilities/pi
 	branch = main
 [submodule "src/hispec/util/srs"]
-	path = src/hispec/util/srs
+	path = src/hispec/driver/srs
 	url = https://github.com/COO-Utilities/srs
 	branch = main
 [submodule "src/hispec/util/ozoptics"]
-	path = src/hispec/util/ozoptics
+	path = src/hispec/driver/ozoptics
 	url = https://github.com/COO-Utilities/ozoptics
 	branch = main
 [submodule "src/hispec/util/newport"]
-	path = src/hispec/util/newport
+	path = src/hispec/driver/newport
 	url = https://github.com/COO-Utilities/newport
 	branch = main
 [submodule "etc/PIPython"]
diff --git a/src/hispec/util/gammavac b/src/hispec/driver/gammavac
similarity index 100%
rename from src/hispec/util/gammavac
rename to src/hispec/driver/gammavac
diff --git a/src/hispec/util/inficon b/src/hispec/driver/inficon
similarity index 100%
rename from src/hispec/util/inficon
rename to src/hispec/driver/inficon
diff --git a/src/hispec/util/lakeshore b/src/hispec/driver/lakeshore
similarity index 100%
rename from src/hispec/util/lakeshore
rename to src/hispec/driver/lakeshore
diff --git a/src/hispec/util/newport b/src/hispec/driver/newport
similarity index 100%
rename from src/hispec/util/newport
rename to src/hispec/driver/newport
diff --git a/src/hispec/util/onewire b/src/hispec/driver/onewire
similarity index 100%
rename from src/hispec/util/onewire
rename to src/hispec/driver/onewire
diff --git a/src/hispec/util/ozoptics b/src/hispec/driver/ozoptics
similarity index 100%
rename from src/hispec/util/ozoptics
rename to src/hispec/driver/ozoptics
diff --git a/src/hispec/util/pi b/src/hispec/driver/pi
similarity index 100%
rename from src/hispec/util/pi
rename to src/hispec/driver/pi
diff --git a/src/hispec/util/srs b/src/hispec/driver/srs
similarity index 100%
rename from src/hispec/util/srs
rename to src/hispec/driver/srs
diff --git a/src/hispec/util/standa b/src/hispec/driver/standa
similarity index 100%
rename from src/hispec/util/standa
rename to src/hispec/driver/standa
diff --git a/src/hispec/util/sunpower b/src/hispec/driver/sunpower
similarity index 100%
rename from src/hispec/util/sunpower
rename to src/hispec/driver/sunpower
diff --git a/src/hispec/util/thorlabs b/src/hispec/driver/thorlabs
similarity index 100%
rename from src/hispec/util/thorlabs
rename to src/hispec/driver/thorlabs
diff --git a/src/hispec/util/xeryon b/src/hispec/driver/xeryon
similarity index 100%
rename from src/hispec/util/xeryon
rename to src/hispec/driver/xeryon
diff --git a/src/hispec/util/__init__.py b/src/hispec/util/__init__.py
new file mode 100644
index 0000000..e69de29