moved source directories into `/src` (#264)

* moved source directories into `/src`
* updated bundle.lua for new `src` path
* moved some docs, icon
* removed old test trees

264 files changed, 10 insertions, 20 deletions

diff --git a/README.md b/README.md
index ec813e359..e4e9c2b19 100644
--- a/README.md
+++ b/README.md
@@ -230,7 +230,7 @@ xmake build
 
 # Contributing Code
 
-See [CODING.md](CODING.md)
+See [CODING.md](docs/CODING.md)
 
 # Debugging
 
diff --git a/API.md b/docs/API.md
index 33ca713c8..33ca713c8 100644
--- a/API.md
+++ b/docs/API.md
diff --git a/CODING.md b/docs/CODING.md
index c4be7906c..c4be7906c 100644
--- a/CODING.md
+++ b/docs/CODING.md
diff --git a/RESTAPI.md b/docs/RESTAPI.md
index 6b072d188..6b072d188 100644
--- a/RESTAPI.md
+++ b/docs/RESTAPI.md
diff --git a/scripts/bundle.lua b/scripts/bundle.lua
index 6b9a0a81f..0d6ce04ad 100644
--- a/scripts/bundle.lua
+++ b/scripts/bundle.lua
@@ -157,7 +157,7 @@ end
 --------------------------------------------------------------------------------
 local function _append_content_zip(bin_path)
     local zip_path = "build/frontend.zip"
-    local content_dir = "zenserver/frontend/html/"
+    local content_dir = "src/zenserver/frontend/html/"
     _zip(true, zip_path, content_dir)
 
     zip_file = io.open(zip_path, "rb")
diff --git a/UnrealEngine.ico b/src/UnrealEngine.ico
index 1cfa301a2..1cfa301a2 100644
--- a/UnrealEngine.ico
+++ b/src/UnrealEngine.ico
diff --git a/zen/chunk/chunk.cpp b/src/zen/chunk/chunk.cpp
index d3591f8ca..d3591f8ca 100644
--- a/zen/chunk/chunk.cpp
+++ b/src/zen/chunk/chunk.cpp
diff --git a/zen/chunk/chunk.h b/src/zen/chunk/chunk.h
index e796f4147..e796f4147 100644
--- a/zen/chunk/chunk.h
+++ b/src/zen/chunk/chunk.h
diff --git a/zen/cmds/cache.cpp b/src/zen/cmds/cache.cpp
index 495662d2f..495662d2f 100644
--- a/zen/cmds/cache.cpp
+++ b/src/zen/cmds/cache.cpp
diff --git a/zen/cmds/cache.h b/src/zen/cmds/cache.h
index 1f368bdec..1f368bdec 100644
--- a/zen/cmds/cache.h
+++ b/src/zen/cmds/cache.h
diff --git a/zen/cmds/copy.cpp b/src/zen/cmds/copy.cpp
index 6f6c078d4..6f6c078d4 100644
--- a/zen/cmds/copy.cpp
+++ b/src/zen/cmds/copy.cpp
diff --git a/zen/cmds/copy.h b/src/zen/cmds/copy.h
index 5527ae9b8..5527ae9b8 100644
--- a/zen/cmds/copy.h
+++ b/src/zen/cmds/copy.h
diff --git a/zen/cmds/dedup.cpp b/src/zen/cmds/dedup.cpp
index b48fb8c2d..b48fb8c2d 100644
--- a/zen/cmds/dedup.cpp
+++ b/src/zen/cmds/dedup.cpp
diff --git a/zen/cmds/dedup.h b/src/zen/cmds/dedup.h
index 6318704f5..6318704f5 100644
--- a/zen/cmds/dedup.h
+++ b/src/zen/cmds/dedup.h
diff --git a/zen/cmds/hash.cpp b/src/zen/cmds/hash.cpp
index 7987d7738..7987d7738 100644
--- a/zen/cmds/hash.cpp
+++ b/src/zen/cmds/hash.cpp
diff --git a/zen/cmds/hash.h b/src/zen/cmds/hash.h
index e5ee071e9..e5ee071e9 100644
--- a/zen/cmds/hash.h
+++ b/src/zen/cmds/hash.h
diff --git a/zen/cmds/print.cpp b/src/zen/cmds/print.cpp
index 67191605c..67191605c 100644
--- a/zen/cmds/print.cpp
+++ b/src/zen/cmds/print.cpp
diff --git a/zen/cmds/print.h b/src/zen/cmds/print.h
index 09d91830a..09d91830a 100644
--- a/zen/cmds/print.h
+++ b/src/zen/cmds/print.h
diff --git a/zen/cmds/projectstore.cpp b/src/zen/cmds/projectstore.cpp
index fe0dd713e..fe0dd713e 100644
--- a/zen/cmds/projectstore.cpp
+++ b/src/zen/cmds/projectstore.cpp
diff --git a/zen/cmds/projectstore.h b/src/zen/cmds/projectstore.h
index 10927a546..10927a546 100644
--- a/zen/cmds/projectstore.h
+++ b/src/zen/cmds/projectstore.h
diff --git a/zen/cmds/rpcreplay.cpp b/src/zen/cmds/rpcreplay.cpp
index 9bc4b2c7b..9bc4b2c7b 100644
--- a/zen/cmds/rpcreplay.cpp
+++ b/src/zen/cmds/rpcreplay.cpp
diff --git a/zen/cmds/rpcreplay.h b/src/zen/cmds/rpcreplay.h
index 742e5ec5b..742e5ec5b 100644
--- a/zen/cmds/rpcreplay.h
+++ b/src/zen/cmds/rpcreplay.h
diff --git a/zen/cmds/scrub.cpp b/src/zen/cmds/scrub.cpp
index 27ff5e0ac..27ff5e0ac 100644
--- a/zen/cmds/scrub.cpp
+++ b/src/zen/cmds/scrub.cpp
diff --git a/zen/cmds/scrub.h b/src/zen/cmds/scrub.h
index ee8b4fdbb..ee8b4fdbb 100644
--- a/zen/cmds/scrub.h
+++ b/src/zen/cmds/scrub.h
diff --git a/zen/cmds/status.cpp b/src/zen/cmds/status.cpp
index 23c27f9f9..23c27f9f9 100644
--- a/zen/cmds/status.cpp
+++ b/src/zen/cmds/status.cpp
diff --git a/zen/cmds/status.h b/src/zen/cmds/status.h
index 98f72e651..98f72e651 100644
--- a/zen/cmds/status.h
+++ b/src/zen/cmds/status.h
diff --git a/zen/cmds/top.cpp b/src/zen/cmds/top.cpp
index 4fe8c9cdf..4fe8c9cdf 100644
--- a/zen/cmds/top.cpp
+++ b/src/zen/cmds/top.cpp
diff --git a/zen/cmds/top.h b/src/zen/cmds/top.h
index 83410587b..83410587b 100644
--- a/zen/cmds/top.h
+++ b/src/zen/cmds/top.h
diff --git a/zen/cmds/up.cpp b/src/zen/cmds/up.cpp
index 69bcbe829..69bcbe829 100644
--- a/zen/cmds/up.cpp
+++ b/src/zen/cmds/up.cpp
diff --git a/zen/cmds/up.h b/src/zen/cmds/up.h
index 5af05541a..5af05541a 100644
--- a/zen/cmds/up.h
+++ b/src/zen/cmds/up.h
diff --git a/zen/cmds/version.cpp b/src/zen/cmds/version.cpp
index ba83b527d..ba83b527d 100644
--- a/zen/cmds/version.cpp
+++ b/src/zen/cmds/version.cpp
diff --git a/zen/cmds/version.h b/src/zen/cmds/version.h
index 0e37e91a0..0e37e91a0 100644
--- a/zen/cmds/version.h
+++ b/src/zen/cmds/version.h
diff --git a/zen/internalfile.cpp b/src/zen/internalfile.cpp
index 2ade86e29..2ade86e29 100644
--- a/zen/internalfile.cpp
+++ b/src/zen/internalfile.cpp
diff --git a/zen/internalfile.h b/src/zen/internalfile.h
index 8acb600ff..8acb600ff 100644
--- a/zen/internalfile.h
+++ b/src/zen/internalfile.h
diff --git a/zen/xmake.lua b/src/zen/xmake.lua
index b83999efc..b83999efc 100644
--- a/zen/xmake.lua
+++ b/src/zen/xmake.lua
diff --git a/zen/zen.cpp b/src/zen/zen.cpp
index 9754f4434..9754f4434 100644
--- a/zen/zen.cpp
+++ b/src/zen/zen.cpp
diff --git a/zen/zen.h b/src/zen/zen.h
index b55e7a16c..b55e7a16c 100644
--- a/zen/zen.h
+++ b/src/zen/zen.h
diff --git a/zen/zen.rc b/src/zen/zen.rc
index 14a9afb70..14a9afb70 100644
--- a/zen/zen.rc
+++ b/src/zen/zen.rc
diff --git a/zencore-test/targetver.h b/src/zencore-test/targetver.h
index d432d6993..d432d6993 100644
--- a/zencore-test/targetver.h
+++ b/src/zencore-test/targetver.h
diff --git a/zencore-test/xmake.lua b/src/zencore-test/xmake.lua
index 74c7e74a7..74c7e74a7 100644
--- a/zencore-test/xmake.lua
+++ b/src/zencore-test/xmake.lua
diff --git a/zencore-test/zencore-test.cpp b/src/zencore-test/zencore-test.cpp
index 53413fb25..53413fb25 100644
--- a/zencore-test/zencore-test.cpp
+++ b/src/zencore-test/zencore-test.cpp
diff --git a/zencore/.gitignore b/src/zencore/.gitignore
index 77d39c17e..77d39c17e 100644
--- a/zencore/.gitignore
+++ b/src/zencore/.gitignore
diff --git a/zencore/base64.cpp b/src/zencore/base64.cpp
index b97dfebbf..b97dfebbf 100644
--- a/zencore/base64.cpp
+++ b/src/zencore/base64.cpp
diff --git a/zencore/blake3.cpp b/src/zencore/blake3.cpp
index 89826ae5d..89826ae5d 100644
--- a/zencore/blake3.cpp
+++ b/src/zencore/blake3.cpp
diff --git a/zencore/compactbinary.cpp b/src/zencore/compactbinary.cpp
index 0db9f02ea..0db9f02ea 100644
--- a/zencore/compactbinary.cpp
+++ b/src/zencore/compactbinary.cpp
diff --git a/zencore/compactbinarybuilder.cpp b/src/zencore/compactbinarybuilder.cpp
index d4ccd434d..d4ccd434d 100644
--- a/zencore/compactbinarybuilder.cpp
+++ b/src/zencore/compactbinarybuilder.cpp
diff --git a/zencore/compactbinarypackage.cpp b/src/zencore/compactbinarypackage.cpp
index a4fa38a1d..a4fa38a1d 100644
--- a/zencore/compactbinarypackage.cpp
+++ b/src/zencore/compactbinarypackage.cpp
diff --git a/zencore/compactbinaryvalidation.cpp b/src/zencore/compactbinaryvalidation.cpp
index 02148d96a..02148d96a 100644
--- a/zencore/compactbinaryvalidation.cpp
+++ b/src/zencore/compactbinaryvalidation.cpp
diff --git a/zencore/compositebuffer.cpp b/src/zencore/compositebuffer.cpp
index 735020451..735020451 100644
--- a/zencore/compositebuffer.cpp
+++ b/src/zencore/compositebuffer.cpp
diff --git a/zencore/compress.cpp b/src/zencore/compress.cpp
index e89f02d68..632e0e8f3 100644
--- a/zencore/compress.cpp
+++ b/src/zencore/compress.cpp
@@ -9,7 +9,7 @@
 #include <zencore/iohash.h>
 #include <zencore/testing.h>
 
-#include "../thirdparty/Oodle/include/oodle2.h"
+#include "../../thirdparty/Oodle/include/oodle2.h"
 #if ZEN_PLATFORM_WINDOWS
 #	pragma comment(lib, "oo2core_win64.lib")
 #endif
diff --git a/zencore/crc32.cpp b/src/zencore/crc32.cpp
index d4a3cac57..d4a3cac57 100644
--- a/zencore/crc32.cpp
+++ b/src/zencore/crc32.cpp
diff --git a/zencore/crypto.cpp b/src/zencore/crypto.cpp
index 448fd36fa..448fd36fa 100644
--- a/zencore/crypto.cpp
+++ b/src/zencore/crypto.cpp
diff --git a/zencore/except.cpp b/src/zencore/except.cpp
index 2749d1984..2749d1984 100644
--- a/zencore/except.cpp
+++ b/src/zencore/except.cpp
diff --git a/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index a17773024..a17773024 100644
--- a/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
diff --git a/zencore/include/zencore/atomic.h b/src/zencore/include/zencore/atomic.h
index bf549e21d..bf549e21d 100644
--- a/zencore/include/zencore/atomic.h
+++ b/src/zencore/include/zencore/atomic.h
diff --git a/zencore/include/zencore/base64.h b/src/zencore/include/zencore/base64.h
index 4d78b085f..4d78b085f 100644
--- a/zencore/include/zencore/base64.h
+++ b/src/zencore/include/zencore/base64.h
diff --git a/zencore/include/zencore/blake3.h b/src/zencore/include/zencore/blake3.h
index b31b710a7..b31b710a7 100644
--- a/zencore/include/zencore/blake3.h
+++ b/src/zencore/include/zencore/blake3.h
diff --git a/zencore/include/zencore/blockingqueue.h b/src/zencore/include/zencore/blockingqueue.h
index f92df5a54..f92df5a54 100644
--- a/zencore/include/zencore/blockingqueue.h
+++ b/src/zencore/include/zencore/blockingqueue.h
diff --git a/zencore/include/zencore/compactbinary.h b/src/zencore/include/zencore/compactbinary.h
index b546f97aa..b546f97aa 100644
--- a/zencore/include/zencore/compactbinary.h
+++ b/src/zencore/include/zencore/compactbinary.h
diff --git a/zencore/include/zencore/compactbinarybuilder.h b/src/zencore/include/zencore/compactbinarybuilder.h
index 4be8c2ba5..4be8c2ba5 100644
--- a/zencore/include/zencore/compactbinarybuilder.h
+++ b/src/zencore/include/zencore/compactbinarybuilder.h
diff --git a/zencore/include/zencore/compactbinarypackage.h b/src/zencore/include/zencore/compactbinarypackage.h
index 16f723edc..16f723edc 100644
--- a/zencore/include/zencore/compactbinarypackage.h
+++ b/src/zencore/include/zencore/compactbinarypackage.h
diff --git a/zencore/include/zencore/compactbinaryvalidation.h b/src/zencore/include/zencore/compactbinaryvalidation.h
index b1fab9572..b1fab9572 100644
--- a/zencore/include/zencore/compactbinaryvalidation.h
+++ b/src/zencore/include/zencore/compactbinaryvalidation.h
diff --git a/zencore/include/zencore/compactbinaryvalue.h b/src/zencore/include/zencore/compactbinaryvalue.h
index 0124a8983..0124a8983 100644
--- a/zencore/include/zencore/compactbinaryvalue.h
+++ b/src/zencore/include/zencore/compactbinaryvalue.h
diff --git a/zencore/include/zencore/compositebuffer.h b/src/zencore/include/zencore/compositebuffer.h
index 4e4b4d002..4e4b4d002 100644
--- a/zencore/include/zencore/compositebuffer.h
+++ b/src/zencore/include/zencore/compositebuffer.h
diff --git a/zencore/include/zencore/compress.h b/src/zencore/include/zencore/compress.h
index 99ce20d8a..99ce20d8a 100644
--- a/zencore/include/zencore/compress.h
+++ b/src/zencore/include/zencore/compress.h
diff --git a/zencore/include/zencore/config.h.in b/src/zencore/include/zencore/config.h.in
index 3372eca2a..3372eca2a 100644
--- a/zencore/include/zencore/config.h.in
+++ b/src/zencore/include/zencore/config.h.in
diff --git a/zencore/include/zencore/crc32.h b/src/zencore/include/zencore/crc32.h
index 336bda77e..336bda77e 100644
--- a/zencore/include/zencore/crc32.h
+++ b/src/zencore/include/zencore/crc32.h
diff --git a/zencore/include/zencore/crypto.h b/src/zencore/include/zencore/crypto.h
index 83d416b0f..83d416b0f 100644
--- a/zencore/include/zencore/crypto.h
+++ b/src/zencore/include/zencore/crypto.h
diff --git a/zencore/include/zencore/endian.h b/src/zencore/include/zencore/endian.h
index 7a9e6b44c..7a9e6b44c 100644
--- a/zencore/include/zencore/endian.h
+++ b/src/zencore/include/zencore/endian.h
diff --git a/zencore/include/zencore/enumflags.h b/src/zencore/include/zencore/enumflags.h
index ebe747bf0..ebe747bf0 100644
--- a/zencore/include/zencore/enumflags.h
+++ b/src/zencore/include/zencore/enumflags.h
diff --git a/zencore/include/zencore/except.h b/src/zencore/include/zencore/except.h
index c61db5ba9..c61db5ba9 100644
--- a/zencore/include/zencore/except.h
+++ b/src/zencore/include/zencore/except.h
diff --git a/zencore/include/zencore/filesystem.h b/src/zencore/include/zencore/filesystem.h
index fa5f94170..fa5f94170 100644
--- a/zencore/include/zencore/filesystem.h
+++ b/src/zencore/include/zencore/filesystem.h
diff --git a/zencore/include/zencore/fmtutils.h b/src/zencore/include/zencore/fmtutils.h
index 70867fe72..70867fe72 100644
--- a/zencore/include/zencore/fmtutils.h
+++ b/src/zencore/include/zencore/fmtutils.h
diff --git a/zencore/include/zencore/intmath.h b/src/zencore/include/zencore/intmath.h
index f24caed6e..f24caed6e 100644
--- a/zencore/include/zencore/intmath.h
+++ b/src/zencore/include/zencore/intmath.h
diff --git a/zencore/include/zencore/iobuffer.h b/src/zencore/include/zencore/iobuffer.h
index a39dbf6d6..a39dbf6d6 100644
--- a/zencore/include/zencore/iobuffer.h
+++ b/src/zencore/include/zencore/iobuffer.h
diff --git a/zencore/include/zencore/iohash.h b/src/zencore/include/zencore/iohash.h
index fd0f4b2a7..fd0f4b2a7 100644
--- a/zencore/include/zencore/iohash.h
+++ b/src/zencore/include/zencore/iohash.h
diff --git a/zencore/include/zencore/logging.h b/src/zencore/include/zencore/logging.h
index 5cbe034cf..5cbe034cf 100644
--- a/zencore/include/zencore/logging.h
+++ b/src/zencore/include/zencore/logging.h
diff --git a/zencore/include/zencore/md5.h b/src/zencore/include/zencore/md5.h
index d934dd86b..d934dd86b 100644
--- a/zencore/include/zencore/md5.h
+++ b/src/zencore/include/zencore/md5.h
diff --git a/zencore/include/zencore/memory.h b/src/zencore/include/zencore/memory.h
index 560fa9ffc..560fa9ffc 100644
--- a/zencore/include/zencore/memory.h
+++ b/src/zencore/include/zencore/memory.h
diff --git a/zencore/include/zencore/meta.h b/src/zencore/include/zencore/meta.h
index 82eb5cc30..82eb5cc30 100644
--- a/zencore/include/zencore/meta.h
+++ b/src/zencore/include/zencore/meta.h
diff --git a/zencore/include/zencore/mpscqueue.h b/src/zencore/include/zencore/mpscqueue.h
index 19e410d85..19e410d85 100644
--- a/zencore/include/zencore/mpscqueue.h
+++ b/src/zencore/include/zencore/mpscqueue.h
diff --git a/zencore/include/zencore/refcount.h b/src/zencore/include/zencore/refcount.h
index f0bb6b85e..f0bb6b85e 100644
--- a/zencore/include/zencore/refcount.h
+++ b/src/zencore/include/zencore/refcount.h
diff --git a/zencore/include/zencore/scopeguard.h b/src/zencore/include/zencore/scopeguard.h
index d04c8ed9c..d04c8ed9c 100644
--- a/zencore/include/zencore/scopeguard.h
+++ b/src/zencore/include/zencore/scopeguard.h
diff --git a/zencore/include/zencore/session.h b/src/zencore/include/zencore/session.h
index dd90197bf..dd90197bf 100644
--- a/zencore/include/zencore/session.h
+++ b/src/zencore/include/zencore/session.h
diff --git a/zencore/include/zencore/sha1.h b/src/zencore/include/zencore/sha1.h
index fc26f442b..fc26f442b 100644
--- a/zencore/include/zencore/sha1.h
+++ b/src/zencore/include/zencore/sha1.h
diff --git a/zencore/include/zencore/sharedbuffer.h b/src/zencore/include/zencore/sharedbuffer.h
index 97c5a9d21..97c5a9d21 100644
--- a/zencore/include/zencore/sharedbuffer.h
+++ b/src/zencore/include/zencore/sharedbuffer.h
diff --git a/zencore/include/zencore/stats.h b/src/zencore/include/zencore/stats.h
index 1a0817b99..1a0817b99 100644
--- a/zencore/include/zencore/stats.h
+++ b/src/zencore/include/zencore/stats.h
diff --git a/zencore/include/zencore/stream.h b/src/zencore/include/zencore/stream.h
index 9e4996249..9e4996249 100644
--- a/zencore/include/zencore/stream.h
+++ b/src/zencore/include/zencore/stream.h
diff --git a/zencore/include/zencore/string.h b/src/zencore/include/zencore/string.h
index ab111ff81..ab111ff81 100644
--- a/zencore/include/zencore/string.h
+++ b/src/zencore/include/zencore/string.h
diff --git a/zencore/include/zencore/testing.h b/src/zencore/include/zencore/testing.h
index a00ee3166..a00ee3166 100644
--- a/zencore/include/zencore/testing.h
+++ b/src/zencore/include/zencore/testing.h
diff --git a/zencore/include/zencore/testutils.h b/src/zencore/include/zencore/testutils.h
index 04648c6de..04648c6de 100644
--- a/zencore/include/zencore/testutils.h
+++ b/src/zencore/include/zencore/testutils.h
diff --git a/zencore/include/zencore/thread.h b/src/zencore/include/zencore/thread.h
index a9c96d422..a9c96d422 100644
--- a/zencore/include/zencore/thread.h
+++ b/src/zencore/include/zencore/thread.h
diff --git a/zencore/include/zencore/timer.h b/src/zencore/include/zencore/timer.h
index e4ddc3505..e4ddc3505 100644
--- a/zencore/include/zencore/timer.h
+++ b/src/zencore/include/zencore/timer.h
diff --git a/zencore/include/zencore/trace.h b/src/zencore/include/zencore/trace.h
index 0af490f23..0af490f23 100644
--- a/zencore/include/zencore/trace.h
+++ b/src/zencore/include/zencore/trace.h
diff --git a/zencore/include/zencore/uid.h b/src/zencore/include/zencore/uid.h
index 9659f5893..9659f5893 100644
--- a/zencore/include/zencore/uid.h
+++ b/src/zencore/include/zencore/uid.h
diff --git a/zencore/include/zencore/varint.h b/src/zencore/include/zencore/varint.h
index e57e1d497..e57e1d497 100644
--- a/zencore/include/zencore/varint.h
+++ b/src/zencore/include/zencore/varint.h
diff --git a/zencore/include/zencore/windows.h b/src/zencore/include/zencore/windows.h
index 91828f0ec..91828f0ec 100644
--- a/zencore/include/zencore/windows.h
+++ b/src/zencore/include/zencore/windows.h
diff --git a/zencore/include/zencore/workthreadpool.h b/src/zencore/include/zencore/workthreadpool.h
index 0ddc65298..0ddc65298 100644
--- a/zencore/include/zencore/workthreadpool.h
+++ b/src/zencore/include/zencore/workthreadpool.h
diff --git a/zencore/include/zencore/xxhash.h b/src/zencore/include/zencore/xxhash.h
index 04872f4c3..04872f4c3 100644
--- a/zencore/include/zencore/xxhash.h
+++ b/src/zencore/include/zencore/xxhash.h
diff --git a/zencore/include/zencore/zencore.h b/src/zencore/include/zencore/zencore.h
index 5bcd77239..5bcd77239 100644
--- a/zencore/include/zencore/zencore.h
+++ b/src/zencore/include/zencore/zencore.h
diff --git a/zencore/intmath.cpp b/src/zencore/intmath.cpp
index 5a686dc8e..5a686dc8e 100644
--- a/zencore/intmath.cpp
+++ b/src/zencore/intmath.cpp
diff --git a/zencore/iobuffer.cpp b/src/zencore/iobuffer.cpp
index 1d7d47695..1d7d47695 100644
--- a/zencore/iobuffer.cpp
+++ b/src/zencore/iobuffer.cpp
diff --git a/zencore/iohash.cpp b/src/zencore/iohash.cpp
index 77076c133..77076c133 100644
--- a/zencore/iohash.cpp
+++ b/src/zencore/iohash.cpp
diff --git a/zencore/logging.cpp b/src/zencore/logging.cpp
index a6423e2dc..a6423e2dc 100644
--- a/zencore/logging.cpp
+++ b/src/zencore/logging.cpp
diff --git a/zencore/md5.cpp b/src/zencore/md5.cpp
index 4ec145697..4ec145697 100644
--- a/zencore/md5.cpp
+++ b/src/zencore/md5.cpp
diff --git a/zencore/memory.cpp b/src/zencore/memory.cpp
index 1f148cede..1f148cede 100644
--- a/zencore/memory.cpp
+++ b/src/zencore/memory.cpp
diff --git a/zencore/mpscqueue.cpp b/src/zencore/mpscqueue.cpp
index 29c76c3ca..29c76c3ca 100644
--- a/zencore/mpscqueue.cpp
+++ b/src/zencore/mpscqueue.cpp
diff --git a/zencore/refcount.cpp b/src/zencore/refcount.cpp
index c6c47b04d..c6c47b04d 100644
--- a/zencore/refcount.cpp
+++ b/src/zencore/refcount.cpp
diff --git a/zencore/session.cpp b/src/zencore/session.cpp
index ce4bfae1b..ce4bfae1b 100644
--- a/zencore/session.cpp
+++ b/src/zencore/session.cpp
diff --git a/zencore/sha1.cpp b/src/zencore/sha1.cpp
index 3ee74d7d8..3ee74d7d8 100644
--- a/zencore/sha1.cpp
+++ b/src/zencore/sha1.cpp
diff --git a/zencore/sharedbuffer.cpp b/src/zencore/sharedbuffer.cpp
index 200e06972..200e06972 100644
--- a/zencore/sharedbuffer.cpp
+++ b/src/zencore/sharedbuffer.cpp
diff --git a/zencore/stats.cpp b/src/zencore/stats.cpp
index 372bc42f8..372bc42f8 100644
--- a/zencore/stats.cpp
+++ b/src/zencore/stats.cpp
diff --git a/zencore/stream.cpp b/src/zencore/stream.cpp
index 3402e51be..3402e51be 100644
--- a/zencore/stream.cpp
+++ b/src/zencore/stream.cpp
diff --git a/zencore/string.cpp b/src/zencore/string.cpp
index ad6ee78fc..ad6ee78fc 100644
--- a/zencore/string.cpp
+++ b/src/zencore/string.cpp
diff --git a/zencore/testing.cpp b/src/zencore/testing.cpp
index 1599e9d1f..1599e9d1f 100644
--- a/zencore/testing.cpp
+++ b/src/zencore/testing.cpp
diff --git a/zencore/testutils.cpp b/src/zencore/testutils.cpp
index dbc3ab5af..dbc3ab5af 100644
--- a/zencore/testutils.cpp
+++ b/src/zencore/testutils.cpp
diff --git a/zencore/thread.cpp b/src/zencore/thread.cpp
index 1597a7dd9..1597a7dd9 100644
--- a/zencore/thread.cpp
+++ b/src/zencore/thread.cpp
diff --git a/zencore/timer.cpp b/src/zencore/timer.cpp
index 1655e912d..1655e912d 100644
--- a/zencore/timer.cpp
+++ b/src/zencore/timer.cpp
diff --git a/zencore/trace.cpp b/src/zencore/trace.cpp
index 788dcec07..788dcec07 100644
--- a/zencore/trace.cpp
+++ b/src/zencore/trace.cpp
diff --git a/zencore/uid.cpp b/src/zencore/uid.cpp
index 86cdfae3a..86cdfae3a 100644
--- a/zencore/uid.cpp
+++ b/src/zencore/uid.cpp
diff --git a/zencore/workthreadpool.cpp b/src/zencore/workthreadpool.cpp
index b4328cdbd..b4328cdbd 100644
--- a/zencore/workthreadpool.cpp
+++ b/src/zencore/workthreadpool.cpp
diff --git a/zencore/xmake.lua b/src/zencore/xmake.lua
index e1e649c1d..e1e649c1d 100644
--- a/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
diff --git a/zencore/xxhash.cpp b/src/zencore/xxhash.cpp
index 450131d19..450131d19 100644
--- a/zencore/xxhash.cpp
+++ b/src/zencore/xxhash.cpp
diff --git a/zencore/zencore.cpp b/src/zencore/zencore.cpp
index 2a7c5755e..2a7c5755e 100644
--- a/zencore/zencore.cpp
+++ b/src/zencore/zencore.cpp
diff --git a/zenhttp/httpasio.cpp b/src/zenhttp/httpasio.cpp
index 79b2c0a3d..79b2c0a3d 100644
--- a/zenhttp/httpasio.cpp
+++ b/src/zenhttp/httpasio.cpp
diff --git a/zenhttp/httpasio.h b/src/zenhttp/httpasio.h
index 716145955..716145955 100644
--- a/zenhttp/httpasio.h
+++ b/src/zenhttp/httpasio.h
diff --git a/zenhttp/httpclient.cpp b/src/zenhttp/httpclient.cpp
index e6813d407..e6813d407 100644
--- a/zenhttp/httpclient.cpp
+++ b/src/zenhttp/httpclient.cpp
diff --git a/zenhttp/httpnull.cpp b/src/zenhttp/httpnull.cpp
index a6e1d3567..a6e1d3567 100644
--- a/zenhttp/httpnull.cpp
+++ b/src/zenhttp/httpnull.cpp
diff --git a/zenhttp/httpnull.h b/src/zenhttp/httpnull.h
index 74f021f6b..74f021f6b 100644
--- a/zenhttp/httpnull.h
+++ b/src/zenhttp/httpnull.h
diff --git a/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index 671cbd319..671cbd319 100644
--- a/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
diff --git a/zenhttp/httpshared.cpp b/src/zenhttp/httpshared.cpp
index 7aade56d2..7aade56d2 100644
--- a/zenhttp/httpshared.cpp
+++ b/src/zenhttp/httpshared.cpp
diff --git a/zenhttp/httpsys.cpp b/src/zenhttp/httpsys.cpp
index c733d618d..c733d618d 100644
--- a/zenhttp/httpsys.cpp
+++ b/src/zenhttp/httpsys.cpp
diff --git a/zenhttp/httpsys.h b/src/zenhttp/httpsys.h
index d6bd34890..d6bd34890 100644
--- a/zenhttp/httpsys.h
+++ b/src/zenhttp/httpsys.h
diff --git a/zenhttp/include/zenhttp/httpclient.h b/src/zenhttp/include/zenhttp/httpclient.h
index 8316a9b9f..8316a9b9f 100644
--- a/zenhttp/include/zenhttp/httpclient.h
+++ b/src/zenhttp/include/zenhttp/httpclient.h
diff --git a/zenhttp/include/zenhttp/httpcommon.h b/src/zenhttp/include/zenhttp/httpcommon.h
index 19fda8db4..19fda8db4 100644
--- a/zenhttp/include/zenhttp/httpcommon.h
+++ b/src/zenhttp/include/zenhttp/httpcommon.h
diff --git a/zenhttp/include/zenhttp/httpserver.h b/src/zenhttp/include/zenhttp/httpserver.h
index 3b9fa50b4..3b9fa50b4 100644
--- a/zenhttp/include/zenhttp/httpserver.h
+++ b/src/zenhttp/include/zenhttp/httpserver.h
diff --git a/zenhttp/include/zenhttp/httpshared.h b/src/zenhttp/include/zenhttp/httpshared.h
index d335572c5..d335572c5 100644
--- a/zenhttp/include/zenhttp/httpshared.h
+++ b/src/zenhttp/include/zenhttp/httpshared.h
diff --git a/zenhttp/include/zenhttp/websocket.h b/src/zenhttp/include/zenhttp/websocket.h
index adca7e988..adca7e988 100644
--- a/zenhttp/include/zenhttp/websocket.h
+++ b/src/zenhttp/include/zenhttp/websocket.h
diff --git a/zenhttp/include/zenhttp/zenhttp.h b/src/zenhttp/include/zenhttp/zenhttp.h
index 59c64b31f..59c64b31f 100644
--- a/zenhttp/include/zenhttp/zenhttp.h
+++ b/src/zenhttp/include/zenhttp/zenhttp.h
diff --git a/zenhttp/iothreadpool.cpp b/src/zenhttp/iothreadpool.cpp
index 6087e69ec..6087e69ec 100644
--- a/zenhttp/iothreadpool.cpp
+++ b/src/zenhttp/iothreadpool.cpp
diff --git a/zenhttp/iothreadpool.h b/src/zenhttp/iothreadpool.h
index 8333964c3..8333964c3 100644
--- a/zenhttp/iothreadpool.h
+++ b/src/zenhttp/iothreadpool.h
diff --git a/zenhttp/websocketasio.cpp b/src/zenhttp/websocketasio.cpp
index bbe7e1ad8..bbe7e1ad8 100644
--- a/zenhttp/websocketasio.cpp
+++ b/src/zenhttp/websocketasio.cpp
diff --git a/zenhttp/xmake.lua b/src/zenhttp/xmake.lua
index b0dbdbc79..b0dbdbc79 100644
--- a/zenhttp/xmake.lua
+++ b/src/zenhttp/xmake.lua
diff --git a/zenhttp/zenhttp.cpp b/src/zenhttp/zenhttp.cpp
index 4bd6a5697..4bd6a5697 100644
--- a/zenhttp/zenhttp.cpp
+++ b/src/zenhttp/zenhttp.cpp
diff --git a/zenserver-test/cachepolicy-tests.cpp b/src/zenserver-test/cachepolicy-tests.cpp
index 79d78e522..79d78e522 100644
--- a/zenserver-test/cachepolicy-tests.cpp
+++ b/src/zenserver-test/cachepolicy-tests.cpp
diff --git a/zenserver-test/projectclient.cpp b/src/zenserver-test/projectclient.cpp
index 597838e0d..597838e0d 100644
--- a/zenserver-test/projectclient.cpp
+++ b/src/zenserver-test/projectclient.cpp
diff --git a/zenserver-test/projectclient.h b/src/zenserver-test/projectclient.h
index 1865dd67d..1865dd67d 100644
--- a/zenserver-test/projectclient.h
+++ b/src/zenserver-test/projectclient.h
diff --git a/zenserver-test/xmake.lua b/src/zenserver-test/xmake.lua
index f0b34f6ca..f0b34f6ca 100644
--- a/zenserver-test/xmake.lua
+++ b/src/zenserver-test/xmake.lua
diff --git a/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 3195181d1..3195181d1 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
diff --git a/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index 7aa1b48d1..7aa1b48d1 100644
--- a/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
diff --git a/zenserver/admin/admin.h b/src/zenserver/admin/admin.h
index 9463ffbb3..9463ffbb3 100644
--- a/zenserver/admin/admin.h
+++ b/src/zenserver/admin/admin.h
diff --git a/zenserver/auth/authmgr.cpp b/src/zenserver/auth/authmgr.cpp
index 4cd6b3362..4cd6b3362 100644
--- a/zenserver/auth/authmgr.cpp
+++ b/src/zenserver/auth/authmgr.cpp
diff --git a/zenserver/auth/authmgr.h b/src/zenserver/auth/authmgr.h
index 054588ab9..054588ab9 100644
--- a/zenserver/auth/authmgr.h
+++ b/src/zenserver/auth/authmgr.h
diff --git a/zenserver/auth/authservice.cpp b/src/zenserver/auth/authservice.cpp
index 1cc679540..1cc679540 100644
--- a/zenserver/auth/authservice.cpp
+++ b/src/zenserver/auth/authservice.cpp
diff --git a/zenserver/auth/authservice.h b/src/zenserver/auth/authservice.h
index 64b86e21f..64b86e21f 100644
--- a/zenserver/auth/authservice.h
+++ b/src/zenserver/auth/authservice.h
diff --git a/zenserver/auth/oidc.cpp b/src/zenserver/auth/oidc.cpp
index d2265c22f..d2265c22f 100644
--- a/zenserver/auth/oidc.cpp
+++ b/src/zenserver/auth/oidc.cpp
diff --git a/zenserver/auth/oidc.h b/src/zenserver/auth/oidc.h
index f43ae3cd7..f43ae3cd7 100644
--- a/zenserver/auth/oidc.h
+++ b/src/zenserver/auth/oidc.h
diff --git a/zenserver/cache/cachetracking.cpp b/src/zenserver/cache/cachetracking.cpp
index 9119e3122..9119e3122 100644
--- a/zenserver/cache/cachetracking.cpp
+++ b/src/zenserver/cache/cachetracking.cpp
diff --git a/zenserver/cache/cachetracking.h b/src/zenserver/cache/cachetracking.h
index fdfe1a4c7..fdfe1a4c7 100644
--- a/zenserver/cache/cachetracking.h
+++ b/src/zenserver/cache/cachetracking.h
diff --git a/zenserver/cache/structuredcache.cpp b/src/zenserver/cache/structuredcache.cpp
index 90e905bf6..90e905bf6 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/src/zenserver/cache/structuredcache.cpp
diff --git a/zenserver/cache/structuredcache.h b/src/zenserver/cache/structuredcache.h
index 4e7b98ac9..4e7b98ac9 100644
--- a/zenserver/cache/structuredcache.h
+++ b/src/zenserver/cache/structuredcache.h
diff --git a/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp
index 26e970073..26e970073 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenserver/cache/structuredcachestore.cpp
diff --git a/zenserver/cache/structuredcachestore.h b/src/zenserver/cache/structuredcachestore.h
index 3fb4f035d..3fb4f035d 100644
--- a/zenserver/cache/structuredcachestore.h
+++ b/src/zenserver/cache/structuredcachestore.h
diff --git a/zenserver/cidstore.cpp b/src/zenserver/cidstore.cpp
index bce4f1dfb..bce4f1dfb 100644
--- a/zenserver/cidstore.cpp
+++ b/src/zenserver/cidstore.cpp
diff --git a/zenserver/cidstore.h b/src/zenserver/cidstore.h
index 8e7832b35..8e7832b35 100644
--- a/zenserver/cidstore.h
+++ b/src/zenserver/cidstore.h
diff --git a/zenserver/compute/function.cpp b/src/zenserver/compute/function.cpp
index 493e2666e..493e2666e 100644
--- a/zenserver/compute/function.cpp
+++ b/src/zenserver/compute/function.cpp
diff --git a/zenserver/compute/function.h b/src/zenserver/compute/function.h
index 650cee757..650cee757 100644
--- a/zenserver/compute/function.h
+++ b/src/zenserver/compute/function.h
diff --git a/zenserver/config.cpp b/src/zenserver/config.cpp
index cff93d67b..cff93d67b 100644
--- a/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
diff --git a/zenserver/config.h b/src/zenserver/config.h
index 8a5c6de4e..8a5c6de4e 100644
--- a/zenserver/config.h
+++ b/src/zenserver/config.h
diff --git a/zenserver/diag/diagsvcs.cpp b/src/zenserver/diag/diagsvcs.cpp
index 29ad5c3dd..29ad5c3dd 100644
--- a/zenserver/diag/diagsvcs.cpp
+++ b/src/zenserver/diag/diagsvcs.cpp
diff --git a/zenserver/diag/diagsvcs.h b/src/zenserver/diag/diagsvcs.h
index bd03f8023..bd03f8023 100644
--- a/zenserver/diag/diagsvcs.h
+++ b/src/zenserver/diag/diagsvcs.h
diff --git a/zenserver/diag/formatters.h b/src/zenserver/diag/formatters.h
index 759df58d3..759df58d3 100644
--- a/zenserver/diag/formatters.h
+++ b/src/zenserver/diag/formatters.h
diff --git a/zenserver/diag/logging.cpp b/src/zenserver/diag/logging.cpp
index 24c7572f4..24c7572f4 100644
--- a/zenserver/diag/logging.cpp
+++ b/src/zenserver/diag/logging.cpp
diff --git a/zenserver/diag/logging.h b/src/zenserver/diag/logging.h
index 8df49f842..8df49f842 100644
--- a/zenserver/diag/logging.h
+++ b/src/zenserver/diag/logging.h
diff --git a/zenserver/frontend/frontend.cpp b/src/zenserver/frontend/frontend.cpp
index 149d97924..149d97924 100644
--- a/zenserver/frontend/frontend.cpp
+++ b/src/zenserver/frontend/frontend.cpp
diff --git a/zenserver/frontend/frontend.h b/src/zenserver/frontend/frontend.h
index 6eac20620..6eac20620 100644
--- a/zenserver/frontend/frontend.h
+++ b/src/zenserver/frontend/frontend.h
diff --git a/zenserver/frontend/html/index.html b/src/zenserver/frontend/html/index.html
index 252ee621e..252ee621e 100644
--- a/zenserver/frontend/html/index.html
+++ b/src/zenserver/frontend/html/index.html
diff --git a/zenserver/frontend/zipfs.cpp b/src/zenserver/frontend/zipfs.cpp
index f9c2bc8ff..f9c2bc8ff 100644
--- a/zenserver/frontend/zipfs.cpp
+++ b/src/zenserver/frontend/zipfs.cpp
diff --git a/zenserver/frontend/zipfs.h b/src/zenserver/frontend/zipfs.h
index e1fa4457c..e1fa4457c 100644
--- a/zenserver/frontend/zipfs.h
+++ b/src/zenserver/frontend/zipfs.h
diff --git a/zenserver/monitoring/httpstats.cpp b/src/zenserver/monitoring/httpstats.cpp
index 4d985f8c2..4d985f8c2 100644
--- a/zenserver/monitoring/httpstats.cpp
+++ b/src/zenserver/monitoring/httpstats.cpp
diff --git a/zenserver/monitoring/httpstats.h b/src/zenserver/monitoring/httpstats.h
index 732815a9a..732815a9a 100644
--- a/zenserver/monitoring/httpstats.h
+++ b/src/zenserver/monitoring/httpstats.h
diff --git a/zenserver/monitoring/httpstatus.cpp b/src/zenserver/monitoring/httpstatus.cpp
index 8b10601dd..8b10601dd 100644
--- a/zenserver/monitoring/httpstatus.cpp
+++ b/src/zenserver/monitoring/httpstatus.cpp
diff --git a/zenserver/monitoring/httpstatus.h b/src/zenserver/monitoring/httpstatus.h
index b04e45324..b04e45324 100644
--- a/zenserver/monitoring/httpstatus.h
+++ b/src/zenserver/monitoring/httpstatus.h
diff --git a/zenserver/objectstore/objectstore.cpp b/src/zenserver/objectstore/objectstore.cpp
index e5739418e..e5739418e 100644
--- a/zenserver/objectstore/objectstore.cpp
+++ b/src/zenserver/objectstore/objectstore.cpp
diff --git a/zenserver/objectstore/objectstore.h b/src/zenserver/objectstore/objectstore.h
index eaab57794..eaab57794 100644
--- a/zenserver/objectstore/objectstore.h
+++ b/src/zenserver/objectstore/objectstore.h
diff --git a/zenserver/projectstore/fileremoteprojectstore.cpp b/src/zenserver/projectstore/fileremoteprojectstore.cpp
index d7a34a6c2..d7a34a6c2 100644
--- a/zenserver/projectstore/fileremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/fileremoteprojectstore.cpp
diff --git a/zenserver/projectstore/fileremoteprojectstore.h b/src/zenserver/projectstore/fileremoteprojectstore.h
index 68d1eb71e..68d1eb71e 100644
--- a/zenserver/projectstore/fileremoteprojectstore.h
+++ b/src/zenserver/projectstore/fileremoteprojectstore.h
diff --git a/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
index 66cf3c4f8..66cf3c4f8 100644
--- a/zenserver/projectstore/jupiterremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
diff --git a/zenserver/projectstore/jupiterremoteprojectstore.h b/src/zenserver/projectstore/jupiterremoteprojectstore.h
index 31548af22..31548af22 100644
--- a/zenserver/projectstore/jupiterremoteprojectstore.h
+++ b/src/zenserver/projectstore/jupiterremoteprojectstore.h
diff --git a/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 847a79a1d..847a79a1d 100644
--- a/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
diff --git a/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index e4f664b85..e4f664b85 100644
--- a/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
diff --git a/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp
index 1e6ca51a1..1e6ca51a1 100644
--- a/zenserver/projectstore/remoteprojectstore.cpp
+++ b/src/zenserver/projectstore/remoteprojectstore.cpp
diff --git a/zenserver/projectstore/remoteprojectstore.h b/src/zenserver/projectstore/remoteprojectstore.h
index dcabaedd4..dcabaedd4 100644
--- a/zenserver/projectstore/remoteprojectstore.h
+++ b/src/zenserver/projectstore/remoteprojectstore.h
diff --git a/zenserver/projectstore/zenremoteprojectstore.cpp b/src/zenserver/projectstore/zenremoteprojectstore.cpp
index 6ff471ae5..6ff471ae5 100644
--- a/zenserver/projectstore/zenremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/zenremoteprojectstore.cpp
diff --git a/zenserver/projectstore/zenremoteprojectstore.h b/src/zenserver/projectstore/zenremoteprojectstore.h
index ef9dcad8c..ef9dcad8c 100644
--- a/zenserver/projectstore/zenremoteprojectstore.h
+++ b/src/zenserver/projectstore/zenremoteprojectstore.h
diff --git a/zenserver/resource.h b/src/zenserver/resource.h
index f2e3b471b..f2e3b471b 100644
--- a/zenserver/resource.h
+++ b/src/zenserver/resource.h
diff --git a/zenserver/targetver.h b/src/zenserver/targetver.h
index d432d6993..d432d6993 100644
--- a/zenserver/targetver.h
+++ b/src/zenserver/targetver.h
diff --git a/zenserver/testing/httptest.cpp b/src/zenserver/testing/httptest.cpp
index 349a95ab3..349a95ab3 100644
--- a/zenserver/testing/httptest.cpp
+++ b/src/zenserver/testing/httptest.cpp
diff --git a/zenserver/testing/httptest.h b/src/zenserver/testing/httptest.h
index 57d2d63f3..57d2d63f3 100644
--- a/zenserver/testing/httptest.h
+++ b/src/zenserver/testing/httptest.h
diff --git a/zenserver/upstream/hordecompute.cpp b/src/zenserver/upstream/hordecompute.cpp
index 64d9fff72..64d9fff72 100644
--- a/zenserver/upstream/hordecompute.cpp
+++ b/src/zenserver/upstream/hordecompute.cpp
diff --git a/zenserver/upstream/jupiter.cpp b/src/zenserver/upstream/jupiter.cpp
index dbb185bec..dbb185bec 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/src/zenserver/upstream/jupiter.cpp
diff --git a/zenserver/upstream/jupiter.h b/src/zenserver/upstream/jupiter.h
index 99e5c530f..99e5c530f 100644
--- a/zenserver/upstream/jupiter.h
+++ b/src/zenserver/upstream/jupiter.h
diff --git a/zenserver/upstream/upstream.h b/src/zenserver/upstream/upstream.h
index a57301206..a57301206 100644
--- a/zenserver/upstream/upstream.h
+++ b/src/zenserver/upstream/upstream.h
diff --git a/zenserver/upstream/upstreamapply.cpp b/src/zenserver/upstream/upstreamapply.cpp
index c719b225d..c719b225d 100644
--- a/zenserver/upstream/upstreamapply.cpp
+++ b/src/zenserver/upstream/upstreamapply.cpp
diff --git a/zenserver/upstream/upstreamapply.h b/src/zenserver/upstream/upstreamapply.h
index 4a095be6c..4a095be6c 100644
--- a/zenserver/upstream/upstreamapply.h
+++ b/src/zenserver/upstream/upstreamapply.h
diff --git a/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index e838b5fe2..e838b5fe2 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
diff --git a/zenserver/upstream/upstreamcache.h b/src/zenserver/upstream/upstreamcache.h
index 695c06b32..695c06b32 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/src/zenserver/upstream/upstreamcache.h
diff --git a/zenserver/upstream/upstreamservice.cpp b/src/zenserver/upstream/upstreamservice.cpp
index 6db1357c5..6db1357c5 100644
--- a/zenserver/upstream/upstreamservice.cpp
+++ b/src/zenserver/upstream/upstreamservice.cpp
diff --git a/zenserver/upstream/upstreamservice.h b/src/zenserver/upstream/upstreamservice.h
index f1da03c8c..f1da03c8c 100644
--- a/zenserver/upstream/upstreamservice.h
+++ b/src/zenserver/upstream/upstreamservice.h
diff --git a/zenserver/upstream/zen.cpp b/src/zenserver/upstream/zen.cpp
index 9e1212834..9e1212834 100644
--- a/zenserver/upstream/zen.cpp
+++ b/src/zenserver/upstream/zen.cpp
diff --git a/zenserver/upstream/zen.h b/src/zenserver/upstream/zen.h
index bfba8fa98..bfba8fa98 100644
--- a/zenserver/upstream/zen.h
+++ b/src/zenserver/upstream/zen.h
diff --git a/zenserver/windows/service.cpp b/src/zenserver/windows/service.cpp
index 89bacab0b..89bacab0b 100644
--- a/zenserver/windows/service.cpp
+++ b/src/zenserver/windows/service.cpp
diff --git a/zenserver/windows/service.h b/src/zenserver/windows/service.h
index 7c9610983..7c9610983 100644
--- a/zenserver/windows/service.h
+++ b/src/zenserver/windows/service.h
diff --git a/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 23bfb9535..23bfb9535 100644
--- a/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
diff --git a/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 635fd04e0..635fd04e0 100644
--- a/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
diff --git a/zenserver/zenserver.rc b/src/zenserver/zenserver.rc
index 6d31e2c6e..6d31e2c6e 100644
--- a/zenserver/zenserver.rc
+++ b/src/zenserver/zenserver.rc
diff --git a/zenstore-test/xmake.lua b/src/zenstore-test/xmake.lua
index 5dbcafa3c..5dbcafa3c 100644
--- a/zenstore-test/xmake.lua
+++ b/src/zenstore-test/xmake.lua
diff --git a/zenstore-test/zenstore-test.cpp b/src/zenstore-test/zenstore-test.cpp
index 00c1136b6..00c1136b6 100644
--- a/zenstore-test/zenstore-test.cpp
+++ b/src/zenstore-test/zenstore-test.cpp
diff --git a/zenstore/blockstore.cpp b/src/zenstore/blockstore.cpp
index 5dfa10c91..5dfa10c91 100644
--- a/zenstore/blockstore.cpp
+++ b/src/zenstore/blockstore.cpp
diff --git a/zenstore/cas.cpp b/src/zenstore/cas.cpp
index fdec78c60..fdec78c60 100644
--- a/zenstore/cas.cpp
+++ b/src/zenstore/cas.cpp
diff --git a/zenstore/cas.h b/src/zenstore/cas.h
index 9c48d4707..9c48d4707 100644
--- a/zenstore/cas.h
+++ b/src/zenstore/cas.h
diff --git a/zenstore/caslog.cpp b/src/zenstore/caslog.cpp
index 2a978ae12..2a978ae12 100644
--- a/zenstore/caslog.cpp
+++ b/src/zenstore/caslog.cpp
diff --git a/zenstore/cidstore.cpp b/src/zenstore/cidstore.cpp
index 5a5116faf..5a5116faf 100644
--- a/zenstore/cidstore.cpp
+++ b/src/zenstore/cidstore.cpp
diff --git a/zenstore/compactcas.cpp b/src/zenstore/compactcas.cpp
index 7b2c21b0f..7b2c21b0f 100644
--- a/zenstore/compactcas.cpp
+++ b/src/zenstore/compactcas.cpp
diff --git a/zenstore/compactcas.h b/src/zenstore/compactcas.h
index b0c6699eb..b0c6699eb 100644
--- a/zenstore/compactcas.h
+++ b/src/zenstore/compactcas.h
diff --git a/zenstore/filecas.cpp b/src/zenstore/filecas.cpp
index 1d25920c4..1d25920c4 100644
--- a/zenstore/filecas.cpp
+++ b/src/zenstore/filecas.cpp
diff --git a/zenstore/filecas.h b/src/zenstore/filecas.h
index 420b3a634..420b3a634 100644
--- a/zenstore/filecas.h
+++ b/src/zenstore/filecas.h
diff --git a/zenstore/gc.cpp b/src/zenstore/gc.cpp
index 370c3c965..370c3c965 100644
--- a/zenstore/gc.cpp
+++ b/src/zenstore/gc.cpp
diff --git a/zenstore/hashkeyset.cpp b/src/zenstore/hashkeyset.cpp
index a5436f5cb..a5436f5cb 100644
--- a/zenstore/hashkeyset.cpp
+++ b/src/zenstore/hashkeyset.cpp
diff --git a/zenstore/include/zenstore/blockstore.h b/src/zenstore/include/zenstore/blockstore.h
index 857ccae38..857ccae38 100644
--- a/zenstore/include/zenstore/blockstore.h
+++ b/src/zenstore/include/zenstore/blockstore.h
diff --git a/zenstore/include/zenstore/caslog.h b/src/zenstore/include/zenstore/caslog.h
index d8c3f22f3..d8c3f22f3 100644
--- a/zenstore/include/zenstore/caslog.h
+++ b/src/zenstore/include/zenstore/caslog.h
diff --git a/zenstore/include/zenstore/cidstore.h b/src/zenstore/include/zenstore/cidstore.h
index 16ca78225..16ca78225 100644
--- a/zenstore/include/zenstore/cidstore.h
+++ b/src/zenstore/include/zenstore/cidstore.h
diff --git a/zenstore/include/zenstore/gc.h b/src/zenstore/include/zenstore/gc.h
index e0354b331..e0354b331 100644
--- a/zenstore/include/zenstore/gc.h
+++ b/src/zenstore/include/zenstore/gc.h
diff --git a/zenstore/include/zenstore/hashkeyset.h b/src/zenstore/include/zenstore/hashkeyset.h
index 411a6256e..411a6256e 100644
--- a/zenstore/include/zenstore/hashkeyset.h
+++ b/src/zenstore/include/zenstore/hashkeyset.h
diff --git a/zenstore/include/zenstore/scrubcontext.h b/src/zenstore/include/zenstore/scrubcontext.h
index 0b884fcc6..0b884fcc6 100644
--- a/zenstore/include/zenstore/scrubcontext.h
+++ b/src/zenstore/include/zenstore/scrubcontext.h
diff --git a/zenstore/include/zenstore/zenstore.h b/src/zenstore/include/zenstore/zenstore.h
index 46d62029d..46d62029d 100644
--- a/zenstore/include/zenstore/zenstore.h
+++ b/src/zenstore/include/zenstore/zenstore.h
diff --git a/zenstore/xmake.lua b/src/zenstore/xmake.lua
index 4469c5650..4469c5650 100644
--- a/zenstore/xmake.lua
+++ b/src/zenstore/xmake.lua
diff --git a/zenstore/zenstore.cpp b/src/zenstore/zenstore.cpp
index d87652fde..d87652fde 100644
--- a/zenstore/zenstore.cpp
+++ b/src/zenstore/zenstore.cpp
diff --git a/zentest-appstub/xmake.lua b/src/zentest-appstub/xmake.lua
index d8e0283c1..d8e0283c1 100644
--- a/zentest-appstub/xmake.lua
+++ b/src/zentest-appstub/xmake.lua
diff --git a/zentest-appstub/zentest-appstub.cpp b/src/zentest-appstub/zentest-appstub.cpp
index 66e6e03fd..66e6e03fd 100644
--- a/zentest-appstub/zentest-appstub.cpp
+++ b/src/zentest-appstub/zentest-appstub.cpp
diff --git a/zenutil/basicfile.cpp b/src/zenutil/basicfile.cpp
index 1e6043d7e..1e6043d7e 100644
--- a/zenutil/basicfile.cpp
+++ b/src/zenutil/basicfile.cpp
diff --git a/zenutil/cache/cachekey.cpp b/src/zenutil/cache/cachekey.cpp
index 545b47f11..545b47f11 100644
--- a/zenutil/cache/cachekey.cpp
+++ b/src/zenutil/cache/cachekey.cpp
diff --git a/zenutil/cache/cachepolicy.cpp b/src/zenutil/cache/cachepolicy.cpp
index 3bca363bb..3bca363bb 100644
--- a/zenutil/cache/cachepolicy.cpp
+++ b/src/zenutil/cache/cachepolicy.cpp
diff --git a/zenutil/cache/cacherequests.cpp b/src/zenutil/cache/cacherequests.cpp
index 4c865ec22..4c865ec22 100644
--- a/zenutil/cache/cacherequests.cpp
+++ b/src/zenutil/cache/cacherequests.cpp
diff --git a/zenutil/cache/rpcrecording.cpp b/src/zenutil/cache/rpcrecording.cpp
index 4958a27f6..4958a27f6 100644
--- a/zenutil/cache/rpcrecording.cpp
+++ b/src/zenutil/cache/rpcrecording.cpp
diff --git a/zenutil/include/zenutil/basicfile.h b/src/zenutil/include/zenutil/basicfile.h
index 877df0f92..877df0f92 100644
--- a/zenutil/include/zenutil/basicfile.h
+++ b/src/zenutil/include/zenutil/basicfile.h
diff --git a/zenutil/include/zenutil/cache/cache.h b/src/zenutil/include/zenutil/cache/cache.h
index 1a1dd9386..1a1dd9386 100644
--- a/zenutil/include/zenutil/cache/cache.h
+++ b/src/zenutil/include/zenutil/cache/cache.h
diff --git a/zenutil/include/zenutil/cache/cachekey.h b/src/zenutil/include/zenutil/cache/cachekey.h
index 741375946..741375946 100644
--- a/zenutil/include/zenutil/cache/cachekey.h
+++ b/src/zenutil/include/zenutil/cache/cachekey.h
diff --git a/zenutil/include/zenutil/cache/cachepolicy.h b/src/zenutil/include/zenutil/cache/cachepolicy.h
index 9a745e42c..9a745e42c 100644
--- a/zenutil/include/zenutil/cache/cachepolicy.h
+++ b/src/zenutil/include/zenutil/cache/cachepolicy.h
diff --git a/zenutil/include/zenutil/cache/cacherequests.h b/src/zenutil/include/zenutil/cache/cacherequests.h
index f1999ebfe..f1999ebfe 100644
--- a/zenutil/include/zenutil/cache/cacherequests.h
+++ b/src/zenutil/include/zenutil/cache/cacherequests.h
diff --git a/zenutil/include/zenutil/cache/rpcrecording.h b/src/zenutil/include/zenutil/cache/rpcrecording.h
index 6d65a532a..6d65a532a 100644
--- a/zenutil/include/zenutil/cache/rpcrecording.h
+++ b/src/zenutil/include/zenutil/cache/rpcrecording.h
diff --git a/zenutil/include/zenutil/zenserverprocess.h b/src/zenutil/include/zenutil/zenserverprocess.h
index 1c204c144..1c204c144 100644
--- a/zenutil/include/zenutil/zenserverprocess.h
+++ b/src/zenutil/include/zenutil/zenserverprocess.h
diff --git a/zenutil/xmake.lua b/src/zenutil/xmake.lua
index e7d849bb2..e7d849bb2 100644
--- a/zenutil/xmake.lua
+++ b/src/zenutil/xmake.lua
diff --git a/zenutil/zenserverprocess.cpp b/src/zenutil/zenserverprocess.cpp
index 5ecde343b..5ecde343b 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/src/zenutil/zenserverprocess.cpp
diff --git a/test-data/test1/A.txt b/test-data/test1/A.txt
deleted file mode 100644
index 8c7e5a667..000000000
--- a/test-data/test1/A.txt
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/test-data/test1/ABC.txt b/test-data/test1/ABC.txt
deleted file mode 100644
index 48b83b862..000000000
--- a/test-data/test1/ABC.txt
+++ /dev/null
@@ -1 +0,0 @@
-ABC
\ No newline at end of file
diff --git a/test-data/test1/B.txt b/test-data/test1/B.txt
deleted file mode 100644
index 7371f47a6..000000000
--- a/test-data/test1/B.txt
+++ /dev/null
@@ -1 +0,0 @@
-B
\ No newline at end of file
diff --git a/test-data/test1/C.txt b/test-data/test1/C.txt
deleted file mode 100644
index 96d80cd6c..000000000
--- a/test-data/test1/C.txt
+++ /dev/null
@@ -1 +0,0 @@
-C
\ No newline at end of file
diff --git a/test-data/test1/dir/D.txt b/test-data/test1/dir/D.txt
deleted file mode 100644
index 02358d235..000000000
--- a/test-data/test1/dir/D.txt
+++ /dev/null
@@ -1 +0,0 @@
-D
\ No newline at end of file
diff --git a/test-data/test1/dir/E.txt b/test-data/test1/dir/E.txt
deleted file mode 100644
index 9fb75b8d4..000000000
--- a/test-data/test1/dir/E.txt
+++ /dev/null
@@ -1 +0,0 @@
-E
\ No newline at end of file
diff --git a/test-data/test1/dir/F.txt b/test-data/test1/dir/F.txt
deleted file mode 100644
index c137216fe..000000000
--- a/test-data/test1/dir/F.txt
+++ /dev/null
@@ -1 +0,0 @@
-F
\ No newline at end of file
diff --git a/test/minio.bat b/test/minio.bat
deleted file mode 100644
index 1ca1fb591..000000000
--- a/test/minio.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-set MINIO_ROOT_USER admin
-set MINIO_ROOT_PASSWORD password
-%~dp0\bin\minio.exe server %~dp0\..\.minio_data
diff --git a/test/remote1/zentest-appstub.exe b/test/remote1/zentest-appstub.exe
deleted file mode 100644
index 5cef22d56..000000000
--- a/test/remote1/zentest-appstub.exe
+++ /dev/null
diff --git a/xmake.lua b/xmake.lua
index db4ddb197..c1fdea37e 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -137,13 +137,13 @@ set_languages("cxx20")
 -- always generate debug information
 set_symbols("debug")
 
-includes("zencore", "zencore-test")
-includes("zenhttp")
-includes("zenstore", "zenstore-test")
-includes("zenutil")
-includes("zenserver", "zenserver-test")
-includes("zen")
-includes("zentest-appstub")
+includes("src/zencore", "src/zencore-test")
+includes("src/zenhttp")
+includes("src/zenstore", "src/zenstore-test")
+includes("src/zenutil")
+includes("src/zenserver", "src/zenserver-test")
+includes("src/zen")
+includes("src/zentest-appstub")
 
 task("bundle")
     set_menu {