diff --git a/examples/Advection.cpp b/examples/Advection.cpp
index 414a8af..7876243 100644
--- a/examples/Advection.cpp
+++ b/examples/Advection.cpp
@@ -1,7 +1,6 @@
 #include <Eigen/Eigen>
 #include <iostream>
-#include <tug/Advection.hpp>
-#include <tug/Core/Matrix.hpp>
+#include <tug/tug.hpp>
 
 using namespace Eigen;
 using namespace tug;
diff --git a/examples/BTCS_2D_proto_example.cpp b/examples/BTCS_2D_proto_example.cpp
index c09d93d..f793e5c 100644
--- a/examples/BTCS_2D_proto_example.cpp
+++ b/examples/BTCS_2D_proto_example.cpp
@@ -1,5 +1,5 @@
 #include <Eigen/Eigen>
-#include <tug/Diffusion.hpp>
+#include <tug/tug.hpp>
 
 using namespace Eigen;
 using namespace tug;
diff --git a/examples/FTCS_2D_proto_closed_mdl.cpp b/examples/FTCS_2D_proto_closed_mdl.cpp
index 69b31c3..eab6dc9 100644
--- a/examples/FTCS_2D_proto_closed_mdl.cpp
+++ b/examples/FTCS_2D_proto_closed_mdl.cpp
@@ -9,7 +9,7 @@
 #include <Eigen/Eigen>
 #include <cstdlib>
 #include <iostream>
-#include <tug/Diffusion.hpp>
+#include <tug/tug.hpp>
 
 using namespace Eigen;
 using namespace tug;
diff --git a/examples/FTCS_2D_proto_example_mdl.cpp b/examples/FTCS_2D_proto_example_mdl.cpp
index 41ddb91..f7059a1 100644
--- a/examples/FTCS_2D_proto_example_mdl.cpp
+++ b/examples/FTCS_2D_proto_example_mdl.cpp
@@ -7,7 +7,7 @@
  */
 
 #include <Eigen/Eigen>
-#include <tug/Diffusion.hpp>
+#include <tug/tug.hpp>
 
 using namespace Eigen;
 using namespace tug;
diff --git a/include/tug/Advection.hpp b/include/tug/Advection/Advection.hpp
similarity index 99%
rename from include/tug/Advection.hpp
rename to include/tug/Advection/Advection.hpp
index 4d530bf..855e1b5 100644
--- a/include/tug/Advection.hpp
+++ b/include/tug/Advection/Advection.hpp
@@ -23,9 +23,9 @@
 #include <tug/Core/Numeric/BTCS.hpp>
 #include <tug/Core/Numeric/FTCS.hpp>
 #include <tug/Core/TugUtils.hpp>
-#include <tug/Diffusion.hpp>
+#include <tug/Diffusion/Diffusion.hpp>
 
-#include <tug/Core/Velocities.hpp>
+#include <tug/Advection/Velocities.hpp>
 
 using namespace Eigen;
 namespace tug {
diff --git a/include/tug/Core/Velocities.hpp b/include/tug/Advection/Velocities.hpp
similarity index 99%
rename from include/tug/Core/Velocities.hpp
rename to include/tug/Advection/Velocities.hpp
index 51cc3a8..dbfef09 100644
--- a/include/tug/Core/Velocities.hpp
+++ b/include/tug/Advection/Velocities.hpp
@@ -25,7 +25,7 @@
 #include <tug/Core/Numeric/BTCS.hpp>
 #include <tug/Core/Numeric/FTCS.hpp>
 #include <tug/Core/TugUtils.hpp>
-#include <tug/Diffusion.hpp>
+#include <tug/Diffusion/Diffusion.hpp>
 
 using namespace Eigen;
 namespace tug {
diff --git a/include/tug/Diffusion.hpp b/include/tug/Diffusion/Diffusion.hpp
similarity index 100%
rename from include/tug/Diffusion.hpp
rename to include/tug/Diffusion/Diffusion.hpp
diff --git a/include/tug/Matrix.hpp b/include/tug/Matrix.hpp
deleted file mode 100644
index e69de29..0000000
diff --git a/include/tug/tug.hpp b/include/tug/tug.hpp
new file mode 100644
index 0000000..a766c3a
--- /dev/null
+++ b/include/tug/tug.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <tug/Advection/Advection.hpp>
+#include <tug/Boundary.hpp>
+#include <tug/Core/Matrix.hpp>
+#include <tug/Diffusion/Diffusion.hpp>
+#include <tug/Grid.hpp>
\ No newline at end of file
diff --git a/test/testDiffusion.cpp b/test/testDiffusion.cpp
index 15fa18b..c49a166 100644
--- a/test/testDiffusion.cpp
+++ b/test/testDiffusion.cpp
@@ -3,7 +3,8 @@
 #include "gtest/gtest.h"
 #include <gtest/gtest.h>
 #include <stdexcept>
-#include <tug/Diffusion.hpp>
+
+#include <tug/tug.hpp>
 
 #include <Eigen/src/Core/Matrix.h>
 #include <string>