diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89e9d21..06873ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,22 +1,22 @@
 configure_file(qhttpengine_global.h.in "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine_global.h")
 
-file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/include/qhttpengine/*")
+file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/qhttpengine/*")
 set(HEADERS "${HEADERS}" "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine_global.h")
 
 set(SRC
-    filesystemhandler.cpp
-    basicauthmiddleware.cpp
-    handler.cpp
-    parser.cpp
-    range.cpp
-    server.cpp
-    socket.cpp
-    qiodevicecopier.cpp
-    localauthmiddleware.cpp
-    localfile.cpp
-    qobjecthandler.cpp
-    proxyhandler.cpp
-    proxysocket.cpp
+    src/filesystemhandler.cpp
+    src/basicauthmiddleware.cpp
+    src/handler.cpp
+    src/parser.cpp
+    src/range.cpp
+    src/server.cpp
+    src/socket.cpp
+    src/qiodevicecopier.cpp
+    src/localauthmiddleware.cpp
+    src/localfile.cpp
+    src/qobjecthandler.cpp
+    src/proxyhandler.cpp
+    src/proxysocket.cpp
 )
 
 if(WIN32)
@@ -41,7 +41,7 @@ set_target_properties(QHttpEngine PROPERTIES
 )
 
 target_include_directories(QHttpEngine PUBLIC
-    "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
     "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
 )
diff --git a/include/qhttpengine/basicauthmiddleware.h b/src/include/qhttpengine/basicauthmiddleware.h
similarity index 100%
rename from include/qhttpengine/basicauthmiddleware.h
rename to src/include/qhttpengine/basicauthmiddleware.h
diff --git a/include/qhttpengine/filesystemhandler.h b/src/include/qhttpengine/filesystemhandler.h
similarity index 100%
rename from include/qhttpengine/filesystemhandler.h
rename to src/include/qhttpengine/filesystemhandler.h
diff --git a/include/qhttpengine/handler.h b/src/include/qhttpengine/handler.h
similarity index 100%
rename from include/qhttpengine/handler.h
rename to src/include/qhttpengine/handler.h
diff --git a/include/qhttpengine/ibytearray.h b/src/include/qhttpengine/ibytearray.h
similarity index 100%
rename from include/qhttpengine/ibytearray.h
rename to src/include/qhttpengine/ibytearray.h
diff --git a/include/qhttpengine/localauthmiddleware.h b/src/include/qhttpengine/localauthmiddleware.h
similarity index 100%
rename from include/qhttpengine/localauthmiddleware.h
rename to src/include/qhttpengine/localauthmiddleware.h
diff --git a/include/qhttpengine/localfile.h b/src/include/qhttpengine/localfile.h
similarity index 100%
rename from include/qhttpengine/localfile.h
rename to src/include/qhttpengine/localfile.h
diff --git a/include/qhttpengine/middleware.h b/src/include/qhttpengine/middleware.h
similarity index 100%
rename from include/qhttpengine/middleware.h
rename to src/include/qhttpengine/middleware.h
diff --git a/include/qhttpengine/parser.h b/src/include/qhttpengine/parser.h
similarity index 100%
rename from include/qhttpengine/parser.h
rename to src/include/qhttpengine/parser.h
diff --git a/include/qhttpengine/proxyhandler.h b/src/include/qhttpengine/proxyhandler.h
similarity index 100%
rename from include/qhttpengine/proxyhandler.h
rename to src/include/qhttpengine/proxyhandler.h
diff --git a/include/qhttpengine/qiodevicecopier.h b/src/include/qhttpengine/qiodevicecopier.h
similarity index 100%
rename from include/qhttpengine/qiodevicecopier.h
rename to src/include/qhttpengine/qiodevicecopier.h
diff --git a/include/qhttpengine/qobjecthandler.h b/src/include/qhttpengine/qobjecthandler.h
similarity index 100%
rename from include/qhttpengine/qobjecthandler.h
rename to src/include/qhttpengine/qobjecthandler.h
diff --git a/include/qhttpengine/range.h b/src/include/qhttpengine/range.h
similarity index 100%
rename from include/qhttpengine/range.h
rename to src/include/qhttpengine/range.h
diff --git a/include/qhttpengine/server.h b/src/include/qhttpengine/server.h
similarity index 100%
rename from include/qhttpengine/server.h
rename to src/include/qhttpengine/server.h
diff --git a/include/qhttpengine/socket.h b/src/include/qhttpengine/socket.h
similarity index 100%
rename from include/qhttpengine/socket.h
rename to src/include/qhttpengine/socket.h
diff --git a/src/basicauthmiddleware.cpp b/src/src/basicauthmiddleware.cpp
similarity index 100%
rename from src/basicauthmiddleware.cpp
rename to src/src/basicauthmiddleware.cpp
diff --git a/src/basicauthmiddleware_p.h b/src/src/basicauthmiddleware_p.h
similarity index 100%
rename from src/basicauthmiddleware_p.h
rename to src/src/basicauthmiddleware_p.h
diff --git a/src/filesystemhandler.cpp b/src/src/filesystemhandler.cpp
similarity index 100%
rename from src/filesystemhandler.cpp
rename to src/src/filesystemhandler.cpp
diff --git a/src/filesystemhandler_p.h b/src/src/filesystemhandler_p.h
similarity index 100%
rename from src/filesystemhandler_p.h
rename to src/src/filesystemhandler_p.h
diff --git a/src/handler.cpp b/src/src/handler.cpp
similarity index 100%
rename from src/handler.cpp
rename to src/src/handler.cpp
diff --git a/src/handler_p.h b/src/src/handler_p.h
similarity index 100%
rename from src/handler_p.h
rename to src/src/handler_p.h
diff --git a/src/localauthmiddleware.cpp b/src/src/localauthmiddleware.cpp
similarity index 100%
rename from src/localauthmiddleware.cpp
rename to src/src/localauthmiddleware.cpp
diff --git a/src/localauthmiddleware_p.h b/src/src/localauthmiddleware_p.h
similarity index 100%
rename from src/localauthmiddleware_p.h
rename to src/src/localauthmiddleware_p.h
diff --git a/src/localfile.cpp b/src/src/localfile.cpp
similarity index 100%
rename from src/localfile.cpp
rename to src/src/localfile.cpp
diff --git a/src/localfile_p.h b/src/src/localfile_p.h
similarity index 100%
rename from src/localfile_p.h
rename to src/src/localfile_p.h
diff --git a/src/parser.cpp b/src/src/parser.cpp
similarity index 100%
rename from src/parser.cpp
rename to src/src/parser.cpp
diff --git a/src/proxyhandler.cpp b/src/src/proxyhandler.cpp
similarity index 100%
rename from src/proxyhandler.cpp
rename to src/src/proxyhandler.cpp
diff --git a/src/proxyhandler_p.h b/src/src/proxyhandler_p.h
similarity index 100%
rename from src/proxyhandler_p.h
rename to src/src/proxyhandler_p.h
diff --git a/src/proxysocket.cpp b/src/src/proxysocket.cpp
similarity index 100%
rename from src/proxysocket.cpp
rename to src/src/proxysocket.cpp
diff --git a/src/proxysocket.h b/src/src/proxysocket.h
similarity index 100%
rename from src/proxysocket.h
rename to src/src/proxysocket.h
diff --git a/src/qiodevicecopier.cpp b/src/src/qiodevicecopier.cpp
similarity index 100%
rename from src/qiodevicecopier.cpp
rename to src/src/qiodevicecopier.cpp
diff --git a/src/qiodevicecopier_p.h b/src/src/qiodevicecopier_p.h
similarity index 100%
rename from src/qiodevicecopier_p.h
rename to src/src/qiodevicecopier_p.h
diff --git a/src/qobjecthandler.cpp b/src/src/qobjecthandler.cpp
similarity index 100%
rename from src/qobjecthandler.cpp
rename to src/src/qobjecthandler.cpp
diff --git a/src/qobjecthandler_p.h b/src/src/qobjecthandler_p.h
similarity index 100%
rename from src/qobjecthandler_p.h
rename to src/src/qobjecthandler_p.h
diff --git a/src/range.cpp b/src/src/range.cpp
similarity index 100%
rename from src/range.cpp
rename to src/src/range.cpp
diff --git a/src/range_p.h b/src/src/range_p.h
similarity index 100%
rename from src/range_p.h
rename to src/src/range_p.h
diff --git a/src/server.cpp b/src/src/server.cpp
similarity index 100%
rename from src/server.cpp
rename to src/src/server.cpp
diff --git a/src/server_p.h b/src/src/server_p.h
similarity index 100%
rename from src/server_p.h
rename to src/src/server_p.h
diff --git a/src/socket.cpp b/src/src/socket.cpp
similarity index 100%
rename from src/socket.cpp
rename to src/src/socket.cpp
diff --git a/src/socket_p.h b/src/src/socket_p.h
similarity index 100%
rename from src/socket_p.h
rename to src/src/socket_p.h