diff --git a/include/wrenpp/callback_manager.hpp b/include/wrenpp/callback_manager.hpp
index a3e5408..74db076 100644
--- a/include/wrenpp/callback_manager.hpp
+++ b/include/wrenpp/callback_manager.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "wren_types.hpp"
-#include "strings_in_vector.hpp"
+#include "detail/wren_types.hpp"
+#include "detail/strings_in_vector.hpp"
 #include <unordered_map>
 #include <vector>
 #include <string_view>
diff --git a/include/wrenpp/class_manager.hpp b/include/wrenpp/class_manager.hpp
index e364b0a..d2a3f59 100644
--- a/include/wrenpp/class_manager.hpp
+++ b/include/wrenpp/class_manager.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "wren_types.hpp"
-#include "strings_in_vector.hpp"
+#include "detail/wren_types.hpp"
+#include "detail/strings_in_vector.hpp"
 #include <unordered_map>
 #include <string>
 #include <type_traits>
diff --git a/include/wrenpp/def_configuration.hpp b/include/wrenpp/def_configuration.hpp
index 8bdd38c..8f3a1f2 100644
--- a/include/wrenpp/def_configuration.hpp
+++ b/include/wrenpp/def_configuration.hpp
@@ -18,8 +18,8 @@
 #pragma once
 
 #include "configuration.hpp"
-#include "wren_types.hpp"
-#include "error_type.hpp"
+#include "detail/wren_types.hpp"
+#include "detail/error_type.hpp"
 
 namespace wren {
 	class DefConfiguration : public Configuration {
diff --git a/include/wrenpp/StringCRC32.hpp b/include/wrenpp/detail/StringCRC32.hpp
similarity index 100%
rename from include/wrenpp/StringCRC32.hpp
rename to include/wrenpp/detail/StringCRC32.hpp
diff --git a/include/wrenpp/error_type.hpp b/include/wrenpp/detail/error_type.hpp
similarity index 100%
rename from include/wrenpp/error_type.hpp
rename to include/wrenpp/detail/error_type.hpp
diff --git a/include/wrenpp/guess_class_name.hpp b/include/wrenpp/detail/guess_class_name.hpp
similarity index 100%
rename from include/wrenpp/guess_class_name.hpp
rename to include/wrenpp/detail/guess_class_name.hpp
diff --git a/include/wrenpp/has_method.hpp b/include/wrenpp/detail/has_method.hpp
similarity index 100%
rename from include/wrenpp/has_method.hpp
rename to include/wrenpp/detail/has_method.hpp
diff --git a/include/wrenpp/string_bt.hpp b/include/wrenpp/detail/string_bt.hpp
similarity index 100%
rename from include/wrenpp/string_bt.hpp
rename to include/wrenpp/detail/string_bt.hpp
diff --git a/include/wrenpp/strings_in_vector.hpp b/include/wrenpp/detail/strings_in_vector.hpp
similarity index 100%
rename from include/wrenpp/strings_in_vector.hpp
rename to include/wrenpp/detail/strings_in_vector.hpp
diff --git a/include/wrenpp/wren_types.hpp b/include/wrenpp/detail/wren_types.hpp
similarity index 100%
rename from include/wrenpp/wren_types.hpp
rename to include/wrenpp/detail/wren_types.hpp
diff --git a/include/wrenpp/vm.hpp b/include/wrenpp/vm.hpp
index 0cfef0b..db27206 100644
--- a/include/wrenpp/vm.hpp
+++ b/include/wrenpp/vm.hpp
@@ -17,11 +17,11 @@
 
 #pragma once
 
-#include "has_method.hpp"
-#include "error_type.hpp"
+#include "detail/has_method.hpp"
+#include "detail/error_type.hpp"
+#include "detail/StringCRC32.hpp"
+#include "detail/wren_types.hpp"
 #include "handle.hpp"
-#include "StringCRC32.hpp"
-#include "wren_types.hpp"
 #include <memory>
 #include <tuple>
 #include <utility>
diff --git a/include/wrenpp/vm_fun.hpp b/include/wrenpp/vm_fun.hpp
index c6371d3..fe0cd3b 100644
--- a/include/wrenpp/vm_fun.hpp
+++ b/include/wrenpp/vm_fun.hpp
@@ -18,11 +18,11 @@
 #pragma once
 
 #include "vm.hpp"
-#include "string_bt.hpp"
+#include "detail/string_bt.hpp"
 #if defined(WRENPP_WITH_NAME_GUESSING)
-#	include "guess_class_name.hpp"
+#	include "detail/guess_class_name.hpp"
 #endif
-#include "wren_types.hpp"
+#include "detail/wren_types.hpp"
 #include "detail/construct_foreign_class.hpp"
 #include "detail/seters_getters.hpp"
 #include <string>
diff --git a/src/dynafunc_maker.hpp b/src/dynafunc_maker.hpp
index ffd1123..e2a852a 100644
--- a/src/dynafunc_maker.hpp
+++ b/src/dynafunc_maker.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "wrenpp/wren_types.hpp"
+#include "wrenpp/detail/wren_types.hpp"
 #include <vector>
 #include <cstddef>