diff --git a/include/combo.hpp b/include/geo/combo.hpp
similarity index 100%
rename from include/combo.hpp
rename to include/geo/combo.hpp
diff --git a/include/geometry.hpp b/include/geo/geometry.hpp
similarity index 100%
rename from include/geometry.hpp
rename to include/geo/geometry.hpp
diff --git a/include/mirror.hpp b/include/geo/mirror.hpp
similarity index 99%
rename from include/mirror.hpp
rename to include/geo/mirror.hpp
index 7f563f7..1e7c1bb 100644
--- a/include/mirror.hpp
+++ b/include/geo/mirror.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <geometry.hpp>
+#include <geo/geometry.hpp>
 
 template<class V>
 float dot(int n, const V &a, const V &b) {
diff --git a/include/solver.hpp b/include/geo/solver.hpp
similarity index 99%
rename from include/solver.hpp
rename to include/geo/solver.hpp
index 9074aaf..7c6c897 100644
--- a/include/solver.hpp
+++ b/include/geo/solver.hpp
@@ -6,7 +6,7 @@
 #include <numeric>
 #include <iostream>
 
-#include <geometry.hpp>
+#include <geo/geometry.hpp>
 
 #include "combo.hpp"
 
diff --git a/src/geometrytest.cpp b/src/geometrytest.cpp
index f48b872..acb611f 100644
--- a/src/geometrytest.cpp
+++ b/src/geometrytest.cpp
@@ -1,7 +1,7 @@
-#include <geometry.hpp>
 #include <tc/groups.hpp>
-#include <solver.hpp>
-#include <mirror.hpp>
+#include <geo/geometry.hpp>
+#include <geo/solver.hpp>
+#include <geo/mirror.hpp>
 
 #include <ml/meshlib.hpp>
 #include <ml/meshlib_json.hpp>