diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8191621..9f46007 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     set(LINKER_OPTIMIZED_OPTIONS ${LINKER_OPTIMIZED_OPTIONS} -fdevirtualize-at-ltrans)
 endif ()
 
-add_library(${PROJECT_NAME} SHARED window.cpp window.hpp basic_data.hpp)
-target_precompile_headers(${PROJECT_NAME} PUBLIC window.hpp basic_data.hpp)
+add_library(${PROJECT_NAME} SHARED src/window.cpp include/window.hpp include/basic_data.hpp)
+target_precompile_headers(${PROJECT_NAME} PUBLIC include/window.hpp include/basic_data.hpp)
 target_include_directories(${PROJECT_NAME}
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         INTERFACE $<INSTALL_INTERFACE:include/windowGlfwGlLib>
@@ -77,7 +77,7 @@ install(TARGETS ${PROJECT_NAME}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        INCLUDES DESTINATION include
+        INCLUDES DESTINATION include/windowGlfwGlLib
         PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/windowGlfwGlLibTargets"
 )
 
@@ -92,7 +92,7 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
         INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/windowGlfwGlLibTargets
 )
 
-install(FILES window.hpp basic_data.hpp DESTINATION include)
+install(FILES include/window.hpp include/basic_data.hpp DESTINATION include/windowGlfwGlLib)
 
 install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/windowGlfwGlLibTargetsConfig.cmake"
diff --git a/basic_data.hpp b/include/basic_data.hpp
similarity index 100%
rename from basic_data.hpp
rename to include/basic_data.hpp
diff --git a/window.hpp b/include/window.hpp
similarity index 100%
rename from window.hpp
rename to include/window.hpp
diff --git a/window.cpp b/src/window.cpp
similarity index 100%
rename from window.cpp
rename to src/window.cpp