diff --git a/.github/ci_automation_tests/ci_automation_test_app.cpp b/.github/ci_automation_tests/ci_automation_test_app.cpp
index 1fbef5f3..d7f1379e 100644
--- a/.github/ci_automation_tests/ci_automation_test_app.cpp
+++ b/.github/ci_automation_tests/ci_automation_test_app.cpp
@@ -1,8 +1,8 @@
 #include "hello_imgui/hello_imgui.h"
 
-#include "imgui_te_engine.h"
-#include "imgui_te_context.h"
-#include "imgui_te_ui.h"
+#include "imgui_test_engine/imgui_te_engine.h"
+#include "imgui_test_engine/imgui_te_context.h"
+#include "imgui_test_engine/imgui_te_ui.h"
 
 #include <cstdio>
 
diff --git a/src/hello_imgui/internal/backend_impls/abstract_runner.cpp b/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
index 0b26d317..ec4e3897 100644
--- a/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
+++ b/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
@@ -14,7 +14,7 @@
 #include "hello_imgui_test_engine_integration/test_engine_integration.h"
 
 #ifdef IMGUI_TEST_ENGINE_WITH_PYTHON_GIL
-#include "imgui_te_python_gil.h"
+#include "imgui_test_engine/imgui_te_python_gil.h"
 #define SCOPED_RELEASE_GIL_ON_MAIN_THREAD ImGuiTestEnginePythonGIL::ReleaseGilOnMainThread_Scoped _gilRelease
 #else
 #define SCOPED_RELEASE_GIL_ON_MAIN_THREAD
diff --git a/src/hello_imgui_demos/hello_imgui_demo_test_engine/hello_imgui_demo_test_engine.main.cpp b/src/hello_imgui_demos/hello_imgui_demo_test_engine/hello_imgui_demo_test_engine.main.cpp
index 41eeddd7..df500c10 100644
--- a/src/hello_imgui_demos/hello_imgui_demo_test_engine/hello_imgui_demo_test_engine.main.cpp
+++ b/src/hello_imgui_demos/hello_imgui_demo_test_engine/hello_imgui_demo_test_engine.main.cpp
@@ -2,9 +2,9 @@
 
 #include "hello_imgui/hello_imgui.h"
 
-#include "imgui_te_engine.h"
-#include "imgui_te_context.h"
-#include "imgui_te_ui.h"
+#include "imgui_test_engine/imgui_te_engine.h"
+#include "imgui_test_engine/imgui_te_context.h"
+#include "imgui_test_engine/imgui_te_ui.h"
 #include "hello_imgui_test_engine_integration/test_engine_integration.h"
 
 
diff --git a/src/hello_imgui_test_engine_integration/hello_imgui_test_engine_cmake.cmake b/src/hello_imgui_test_engine_integration/hello_imgui_test_engine_cmake.cmake
index fccaac9c..6d51aadb 100644
--- a/src/hello_imgui_test_engine_integration/hello_imgui_test_engine_cmake.cmake
+++ b/src/hello_imgui_test_engine_integration/hello_imgui_test_engine_cmake.cmake
@@ -34,7 +34,7 @@ function(_add_imgui_test_engine_lib)
     set(te_source_folder ${HELLOIMGUI_IMGUI_TEST_ENGINE_SOURCE_DIR}/imgui_test_engine)
     file(GLOB_RECURSE sources ${te_source_folder}/*.h ${te_source_folder}/*.cpp)
     add_library(imgui_test_engine ${sources})
-    target_include_directories(imgui_test_engine PUBLIC $<BUILD_INTERFACE:${te_source_folder}>)
+    target_include_directories(imgui_test_engine PUBLIC $<BUILD_INTERFACE:${te_source_folder}/..>)
 
     # Link imgui_test_engine with imgui
     target_link_libraries(imgui_test_engine PUBLIC imgui)
@@ -51,7 +51,7 @@ function(_add_imgui_test_engine_lib)
     # install test_engine headers
     if(PROJECT_IS_TOP_LEVEL)
         file(GLOB te_headers ${te_source_folder}/*.h)
-        install(FILES ${te_headers} DESTINATION include)
+        install(FILES ${te_headers} DESTINATION include/imgui_test_engine)
         install(DIRECTORY ${te_source_folder}/thirdparty DESTINATION include)
     endif()
     him_add_installable_dependency(imgui_test_engine)
diff --git a/src/hello_imgui_test_engine_integration/test_engine_integration.cpp b/src/hello_imgui_test_engine_integration/test_engine_integration.cpp
index 8dab6420..9f5bb59e 100644
--- a/src/hello_imgui_test_engine_integration/test_engine_integration.cpp
+++ b/src/hello_imgui_test_engine_integration/test_engine_integration.cpp
@@ -1,4 +1,4 @@
-#include "imgui_te_engine.h"
+#include "imgui_test_engine/imgui_te_engine.h"
 #include "hello_imgui/runner_params.h"
 #include "hello_imgui/internal/functional_utils.h"
 #include "hello_imgui/internal/backend_impls/opengl_setup_helper/opengl_screenshot.h"