diff --git a/include/BoundaryCondition.hpp b/include/tug/BoundaryCondition.hpp
similarity index 100%
rename from include/BoundaryCondition.hpp
rename to include/tug/BoundaryCondition.hpp
diff --git a/include/Diffusion.hpp b/include/tug/Diffusion.hpp
similarity index 100%
rename from include/Diffusion.hpp
rename to include/tug/Diffusion.hpp
diff --git a/include/Solver.hpp b/include/tug/Solver.hpp
similarity index 100%
rename from include/Solver.hpp
rename to include/tug/Solver.hpp
diff --git a/src/BTCS.cpp b/src/BTCS.cpp
index 525ba4b..c3e6c77 100644
--- a/src/BTCS.cpp
+++ b/src/BTCS.cpp
@@ -1,7 +1,8 @@
-#include <Diffusion.hpp>
-#include <Solver.hpp>
 #include <array>
 #include <iostream>
+#include <tug/BoundaryCondition.hpp>
+#include <tug/Diffusion.hpp>
+#include <tug/Solver.hpp>
 
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
@@ -10,7 +11,6 @@
 #include <chrono>
 #include <vector>
 
-#include "BoundaryCondition.hpp"
 #include "TugUtils.hpp"
 
 #ifdef _OPENMP
diff --git a/src/BoundaryCondition.cpp b/src/BoundaryCondition.cpp
index 51065e1..70a5b69 100644
--- a/src/BoundaryCondition.cpp
+++ b/src/BoundaryCondition.cpp
@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <bits/stdint-uintn.h>
+#include <tug/BoundaryCondition.hpp>
 #include <vector>
 
-#include "BoundaryCondition.hpp"
 #include "TugUtils.hpp"
 
 constexpr uint8_t DIM_1D = 2;
diff --git a/src/Solver.cpp b/src/Solver.cpp
index a3514bf..9941fe8 100644
--- a/src/Solver.cpp
+++ b/src/Solver.cpp
@@ -1,5 +1,5 @@
 #include <bits/stdint-uintn.h>
-#include <Solver.hpp>
+#include <tug/Solver.hpp>
 
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
diff --git a/test/testBoundaryCondition.cpp b/test/testBoundaryCondition.cpp
index 50ebc4a..7b71312 100644
--- a/test/testBoundaryCondition.cpp
+++ b/test/testBoundaryCondition.cpp
@@ -1,5 +1,5 @@
-#include <BoundaryCondition.hpp>
 #include <doctest/doctest.h>
+#include <tug/BoundaryCondition.hpp>
 
 using namespace tug::bc;
 
diff --git a/test/testDiffusion.cpp b/test/testDiffusion.cpp
index 74b78f9..c544fa3 100644
--- a/test/testDiffusion.cpp
+++ b/test/testDiffusion.cpp
@@ -1,8 +1,8 @@
-#include "Diffusion.hpp"
-#include "Solver.hpp"
-#include <BoundaryCondition.hpp>
 #include <bits/stdint-uintn.h>
 #include <doctest/doctest.h>
+#include <tug/BoundaryCondition.hpp>
+#include <tug/Diffusion.hpp>
+#include <tug/Solver.hpp>
 #include <vector>
 
 using namespace tug::bc;