move all storage-related services into storage tree (#571)

* move all storage-related services into storage tree
* move config into config/
* also move admin service into storage since it mostly has storage related functionality
* header consolidation

32 files changed, 31 insertions, 44 deletions

diff --git a/src/zenserver/config.cpp b/src/zenserver/config/config.cpp
index 8ee50cee2..d044c61d5 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config/config.cpp
@@ -2,7 +2,7 @@
 
 #include "config.h"
 
-#include "storageconfig.h"
+#include "storage/storageconfig.h"
 
 #include "config/luaconfig.h"
 #include "diag/logging.h"
diff --git a/src/zenserver/config.h b/src/zenserver/config/config.h
index 8471ee89b..8471ee89b 100644
--- a/src/zenserver/config.h
+++ b/src/zenserver/config/config.h
diff --git a/src/zenserver/diag/logging.cpp b/src/zenserver/diag/logging.cpp
index 34d9b05b7..ee36b2ca9 100644
--- a/src/zenserver/diag/logging.cpp
+++ b/src/zenserver/diag/logging.cpp
@@ -2,7 +2,7 @@
 
 #include "logging.h"
 
-#include "config.h"
+#include "config/config.h"
 
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 97847b65d..3119b37c6 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -1,7 +1,5 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "zenstorageserver.h"
-
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinaryvalidation.h>
 #include <zencore/config.h>
@@ -9,23 +7,22 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
+#include <zencore/memory/fmalloc.h>
+#include <zencore/memory/llm.h>
+#include <zencore/memory/memory.h>
+#include <zencore/memory/memorytrace.h>
+#include <zencore/memory/newdelete.h>
 #include <zencore/scopeguard.h>
 #include <zencore/sentryintegration.h>
 #include <zencore/session.h>
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/trace.h>
-
-#include <zencore/memory/fmalloc.h>
-#include <zencore/memory/llm.h>
-#include <zencore/memory/memory.h>
-#include <zencore/memory/memorytrace.h>
-#include <zencore/memory/newdelete.h>
-
 #include <zenutil/service.h>
 
 #include "diag/logging.h"
-#include "storageconfig.h"
+#include "storage/storageconfig.h"
+#include "storage/zenstorageserver.h"
 
 #if ZEN_PLATFORM_WINDOWS
 #	include <zencore/windows.h>
@@ -39,11 +36,8 @@
 #if ZEN_WITH_TESTS
 #	define ZEN_TEST_WITH_RUNNER 1
 #	include <zencore/testing.h>
-#	include <zenutil/zenutil.h>
 #endif
 
-#include <memory>
-
 namespace zen::utils {
 std::atomic_uint32_t SignalCounter[NSIG] = {0};
 
diff --git a/src/zenserver/stats/statsreporter.h b/src/zenserver/stats/statsreporter.h
index 2f93aa8bb..b4174073c 100644
--- a/src/zenserver/stats/statsreporter.h
+++ b/src/zenserver/stats/statsreporter.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "config.h"
+#include "config/config.h"
 
 #include <zencore/thread.h>
 #include <zenutil/statsreporter.h>
diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/storage/admin/admin.cpp
index 97522e892..4803063d7 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/storage/admin/admin.cpp
@@ -8,6 +8,9 @@
 #include <zencore/jobqueue.h>
 #include <zencore/logging.h>
 #include <zencore/string.h>
+#include <zenstore/cache/structuredcachestore.h>
+#include <zenstore/gc.h>
+#include <zenutil/workerpools.h>
 
 #if ZEN_WITH_TRACE
 #	include <zencore/trace.h>
@@ -17,11 +20,7 @@
 #	include <mimalloc.h>
 #endif
 
-#include <zenstore/gc.h>
-
-#include <zenstore/cache/structuredcachestore.h>
-#include <zenutil/workerpools.h>
-#include "config.h"
+#include "config/config.h"
 
 #include <chrono>
 
diff --git a/src/zenserver/admin/admin.h b/src/zenserver/storage/admin/admin.h
index 9a49f5120..9a49f5120 100644
--- a/src/zenserver/admin/admin.h
+++ b/src/zenserver/storage/admin/admin.h
diff --git a/src/zenserver/buildstore/httpbuildstore.cpp b/src/zenserver/storage/buildstore/httpbuildstore.cpp
index bce993f17..bce993f17 100644
--- a/src/zenserver/buildstore/httpbuildstore.cpp
+++ b/src/zenserver/storage/buildstore/httpbuildstore.cpp
diff --git a/src/zenserver/buildstore/httpbuildstore.h b/src/zenserver/storage/buildstore/httpbuildstore.h
index 50cb5db12..50cb5db12 100644
--- a/src/zenserver/buildstore/httpbuildstore.h
+++ b/src/zenserver/storage/buildstore/httpbuildstore.h
diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/storage/cache/httpstructuredcache.cpp
index 9f87c208c..ece1d7a46 100644
--- a/src/zenserver/cache/httpstructuredcache.cpp
+++ b/src/zenserver/storage/cache/httpstructuredcache.cpp
@@ -28,8 +28,8 @@
 #include <zenutil/rpcrecording.h>
 #include <zenutil/workerpools.h>
 
-#include "upstream/upstreamcache.h"
-#include "upstream/zen.h"
+#include "storage/upstream/upstreamcache.h"
+#include "storage/upstream/zen.h"
 #include "zenstore/cidstore.h"
 #include "zenstore/scrubcontext.h"
 
diff --git a/src/zenserver/cache/httpstructuredcache.h b/src/zenserver/storage/cache/httpstructuredcache.h
index a157148c9..a157148c9 100644
--- a/src/zenserver/cache/httpstructuredcache.h
+++ b/src/zenserver/storage/cache/httpstructuredcache.h
diff --git a/src/zenserver/objectstore/objectstore.cpp b/src/zenserver/storage/objectstore/objectstore.cpp
index b1e73c7df..3f40bf616 100644
--- a/src/zenserver/objectstore/objectstore.cpp
+++ b/src/zenserver/storage/objectstore/objectstore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <objectstore/objectstore.h>
+#include "objectstore.h"
 
 #include <zencore/base64.h>
 #include <zencore/basicfile.h>
diff --git a/src/zenserver/objectstore/objectstore.h b/src/zenserver/storage/objectstore/objectstore.h
index 44e50e208..44e50e208 100644
--- a/src/zenserver/objectstore/objectstore.h
+++ b/src/zenserver/storage/objectstore/objectstore.h
diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/storage/projectstore/httpprojectstore.cpp
index 1c6b5d6b0..1c6b5d6b0 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/storage/projectstore/httpprojectstore.cpp
diff --git a/src/zenserver/projectstore/httpprojectstore.h b/src/zenserver/storage/projectstore/httpprojectstore.h
index f0a0bcfa1..f0a0bcfa1 100644
--- a/src/zenserver/projectstore/httpprojectstore.h
+++ b/src/zenserver/storage/projectstore/httpprojectstore.h
diff --git a/src/zenserver/storageconfig.cpp b/src/zenserver/storage/storageconfig.cpp
index 86bb09c21..86bb09c21 100644
--- a/src/zenserver/storageconfig.cpp
+++ b/src/zenserver/storage/storageconfig.cpp
diff --git a/src/zenserver/storageconfig.h b/src/zenserver/storage/storageconfig.h
index 2c3197226..ca0cf4135 100644
--- a/src/zenserver/storageconfig.h
+++ b/src/zenserver/storage/storageconfig.h
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "config.h"
+#include "config/config.h"
 
 namespace zen {
 
diff --git a/src/zenserver/storage/upstream/upstream.h b/src/zenserver/storage/upstream/upstream.h
new file mode 100644
index 000000000..b4fd03983
--- /dev/null
+++ b/src/zenserver/storage/upstream/upstream.h
@@ -0,0 +1,7 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "upstreamcache.h"
+#include "upstreamservice.h"
+#include "zen.h"
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/storage/upstream/upstreamcache.cpp
index 8558e2a10..f7ae5f973 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/storage/upstream/upstreamcache.cpp
@@ -23,8 +23,8 @@
 #include <zenremotestore/jupiter/jupiterclient.h>
 #include <zenremotestore/jupiter/jupitersession.h>
 
-#include "cache/httpstructuredcache.h"
 #include "diag/logging.h"
+#include "storage/cache/httpstructuredcache.h"
 
 #include <fmt/format.h>
 
diff --git a/src/zenserver/upstream/upstreamcache.h b/src/zenserver/storage/upstream/upstreamcache.h
index d5d61c8d9..d5d61c8d9 100644
--- a/src/zenserver/upstream/upstreamcache.h
+++ b/src/zenserver/storage/upstream/upstreamcache.h
diff --git a/src/zenserver/upstream/upstreamservice.cpp b/src/zenserver/storage/upstream/upstreamservice.cpp
index 1dcbdb604..e7f7d2d5c 100644
--- a/src/zenserver/upstream/upstreamservice.cpp
+++ b/src/zenserver/storage/upstream/upstreamservice.cpp
@@ -1,7 +1,7 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
-#include <upstream/upstreamservice.h>
+#include "upstreamservice.h"
 
-#include <upstream/upstreamcache.h>
+#include "upstreamcache.h"
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/string.h>
diff --git a/src/zenserver/upstream/upstreamservice.h b/src/zenserver/storage/upstream/upstreamservice.h
index f1da03c8c..f1da03c8c 100644
--- a/src/zenserver/upstream/upstreamservice.h
+++ b/src/zenserver/storage/upstream/upstreamservice.h
diff --git a/src/zenserver/upstream/zen.cpp b/src/zenserver/storage/upstream/zen.cpp
index 25fd3a3bb..25fd3a3bb 100644
--- a/src/zenserver/upstream/zen.cpp
+++ b/src/zenserver/storage/upstream/zen.cpp
diff --git a/src/zenserver/upstream/zen.h b/src/zenserver/storage/upstream/zen.h
index 6321b46b1..6321b46b1 100644
--- a/src/zenserver/upstream/zen.h
+++ b/src/zenserver/storage/upstream/zen.h
diff --git a/src/zenserver/vfs/vfsservice.cpp b/src/zenserver/storage/vfs/vfsservice.cpp
index 863ec348a..863ec348a 100644
--- a/src/zenserver/vfs/vfsservice.cpp
+++ b/src/zenserver/storage/vfs/vfsservice.cpp
diff --git a/src/zenserver/vfs/vfsservice.h b/src/zenserver/storage/vfs/vfsservice.h
index 4e06da878..4e06da878 100644
--- a/src/zenserver/vfs/vfsservice.h
+++ b/src/zenserver/storage/vfs/vfsservice.h
diff --git a/src/zenserver/workspaces/httpworkspaces.cpp b/src/zenserver/storage/workspaces/httpworkspaces.cpp
index 7ef84743e..3fea46b2f 100644
--- a/src/zenserver/workspaces/httpworkspaces.cpp
+++ b/src/zenserver/storage/workspaces/httpworkspaces.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <workspaces/httpworkspaces.h>
+#include "httpworkspaces.h"
 
 #include <zencore/basicfile.h>
 #include <zencore/compactbinarybuilder.h>
diff --git a/src/zenserver/workspaces/httpworkspaces.h b/src/zenserver/storage/workspaces/httpworkspaces.h
index 89a8e8bdc..89a8e8bdc 100644
--- a/src/zenserver/workspaces/httpworkspaces.h
+++ b/src/zenserver/storage/workspaces/httpworkspaces.h
diff --git a/src/zenserver/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index 73896512d..73896512d 100644
--- a/src/zenserver/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
diff --git a/src/zenserver/zenstorageserver.h b/src/zenserver/storage/zenstorageserver.h
index e4c31399d..e4c31399d 100644
--- a/src/zenserver/zenstorageserver.h
+++ b/src/zenserver/storage/zenstorageserver.h
diff --git a/src/zenserver/upstream/upstream.h b/src/zenserver/upstream/upstream.h
deleted file mode 100644
index 4d45687fc..000000000
--- a/src/zenserver/upstream/upstream.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
-
-#pragma once
-
-#include <upstream/upstreamcache.h>
-#include <upstream/upstreamservice.h>
-#include <upstream/zen.h>
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index bf59658c8..11afb682c 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -28,13 +28,7 @@
 
 #if ZEN_PLATFORM_WINDOWS
 #	include <zencore/windows.h>
-#endif
-
-#if ZEN_PLATFORM_LINUX
-#	include <pwd.h>
-#endif
-
-#if ZEN_PLATFORM_MAC
+#else
 #	include <pwd.h>
 #endif
 
@@ -48,7 +42,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 //////////////////////////////////////////////////////////////////////////
 
-#include "config.h"
+#include "config/config.h"
 #include "diag/logging.h"
 
 #include <zencore/memory/llm.h>