diff --git a/Makefile b/Makefile
index bb4d46645..9296a0ca7 100755
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,7 @@ build_all:
 	$(MSBUILD_BIN) build/kompute.sln
 
 build_docs:
-	$(MSBUILD_BIN) build/docs/gendoxygen.vcxproj
-	$(MSBUILD_BIN) build/docs/gensphinx.vcxproj
+	$(MSBUILD_BIN) build/docs/gendocsall.vcxproj
 
 build_kompute:
 	$(MSBUILD_BIN) build/src/kompute.vcxproj
diff --git a/single_include/AggregateHeaders.cpp b/single_include/AggregateHeaders.cpp
index a510dc6a2..5a86ac9cd 100644
--- a/single_include/AggregateHeaders.cpp
+++ b/single_include/AggregateHeaders.cpp
@@ -2,8 +2,8 @@
 #include "kompute/shaders/shaderopmult.hpp"
 #include "kompute/Manager.hpp"
 #include "kompute/Sequence.hpp"
-#include "kompute/OpBase.hpp"
-#include "kompute/OpMult.hpp"
-#include "kompute/OpCreateTensor.hpp"
+#include "kompute/operations/OpBase.hpp"
+#include "kompute/operations/OpMult.hpp"
+#include "kompute/operations/OpCreateTensor.hpp"
 #include "kompute/Algorithm.hpp"
 #include "kompute/Tensor.hpp"
diff --git a/src/OpCreateTensor.cpp b/src/OpCreateTensor.cpp
index a20a63976..b82962255 100644
--- a/src/OpCreateTensor.cpp
+++ b/src/OpCreateTensor.cpp
@@ -1,7 +1,7 @@
 
 #include "kompute/Tensor.hpp"
 
-#include "kompute/OpCreateTensor.hpp"
+#include "kompute/operations/OpCreateTensor.hpp"
 
 namespace kp {
 
diff --git a/src/include/kompute/Sequence.hpp b/src/include/kompute/Sequence.hpp
index d358d258c..7ee105c68 100644
--- a/src/include/kompute/Sequence.hpp
+++ b/src/include/kompute/Sequence.hpp
@@ -2,7 +2,7 @@
 
 #include "kompute/Core.hpp"
 
-#include "kompute/OpBase.hpp"
+#include "kompute/operations/OpBase.hpp"
 
 namespace kp {
 
diff --git a/src/include/kompute/OpBase.hpp b/src/include/kompute/operations/OpBase.hpp
similarity index 100%
rename from src/include/kompute/OpBase.hpp
rename to src/include/kompute/operations/OpBase.hpp
diff --git a/src/include/kompute/OpCreateTensor.hpp b/src/include/kompute/operations/OpCreateTensor.hpp
similarity index 97%
rename from src/include/kompute/OpCreateTensor.hpp
rename to src/include/kompute/operations/OpCreateTensor.hpp
index 386bb0223..a9f8f1f08 100644
--- a/src/include/kompute/OpCreateTensor.hpp
+++ b/src/include/kompute/operations/OpCreateTensor.hpp
@@ -4,7 +4,7 @@
 
 #include "kompute/Tensor.hpp"
 
-#include "kompute/OpBase.hpp"
+#include "kompute/operations/OpBase.hpp"
 
 namespace kp {
 
diff --git a/src/include/kompute/OpMult.hpp b/src/include/kompute/operations/OpMult.hpp
similarity index 99%
rename from src/include/kompute/OpMult.hpp
rename to src/include/kompute/operations/OpMult.hpp
index b4e40d972..4b120c931 100644
--- a/src/include/kompute/OpMult.hpp
+++ b/src/include/kompute/operations/OpMult.hpp
@@ -9,7 +9,7 @@
 #include "kompute/Algorithm.hpp"
 #include "kompute/Tensor.hpp"
 
-#include "kompute/OpBase.hpp"
+#include "kompute/operations/OpBase.hpp"
 
 namespace kp {