diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09ca275110..0137d06d5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -416,9 +416,13 @@ add_library(Common STATIC
 	${CommonVulkan}
 	Common/ColorConv.cpp
 	Common/ColorConv.h
-	Common/ChunkFile.cpp
-	Common/ChunkFile.h
-	Common/ChunkFileDo.h
+	Common/Serialize/Serializer.cpp
+	Common/Serialize/Serializer.h
+	Common/Serialize/SerializeDeque.h
+	Common/Serialize/SerializeFuncs.h
+	Common/Serialize/SerializeList.h
+	Common/Serialize/SerializeMap.h
+	Common/Serialize/SerializeSet.h
 	Common/ConsoleListener.cpp
 	Common/ConsoleListener.h
 	Common/Crypto/md5.cpp
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index c54bc30238..40a9f61a06 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -354,9 +354,12 @@
     <ClInclude Include="ArmEmitter.h" />
     <ClInclude Include="BitScan.h" />
     <ClInclude Include="BitSet.h" />
-    <ClInclude Include="ChunkFileDo.h" />
+    <ClInclude Include="Serialize\SerializeDeque.h" />
+    <ClInclude Include="Serialize\SerializeFuncs.h" />
     <ClInclude Include="ColorConvNEON.h" />
-    <ClInclude Include="ChunkFile.h" />
+    <ClInclude Include="Serialize\SerializeList.h" />
+    <ClInclude Include="Serialize\SerializeMap.h" />
+    <ClInclude Include="Serialize\Serializer.h" />
     <ClInclude Include="CodeBlock.h" />
     <ClInclude Include="ColorConv.h" />
     <ClInclude Include="Common.h" />
@@ -406,6 +409,7 @@
     <ClInclude Include="MipsEmitter.h" />
     <ClInclude Include="MsgHandler.h" />
     <ClInclude Include="OSVersion.h" />
+    <ClInclude Include="Serialize\SerializeSet.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="Swap.h" />
@@ -445,7 +449,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="ChunkFile.cpp" />
+    <ClCompile Include="Serialize\Serializer.cpp" />
     <ClCompile Include="ColorConv.cpp" />
     <ClCompile Include="ConsoleListener.cpp" />
     <ClCompile Include="CPUDetect.cpp" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index a19ee2e281..92551a3e85 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -3,7 +3,6 @@
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="ABI.h" />
-    <ClInclude Include="ChunkFile.h" />
     <ClInclude Include="Common.h" />
     <ClInclude Include="CommonFuncs.h" />
     <ClInclude Include="CommonTypes.h" />
@@ -76,7 +75,24 @@
     </ClInclude>
     <ClInclude Include="ExceptionHandlerSetup.h" />
     <ClInclude Include="MachineContext.h" />
-    <ClInclude Include="ChunkFileDo.h" />
+    <ClInclude Include="Serialize\Serializer.h">
+      <Filter>Serialize</Filter>
+    </ClInclude>
+    <ClInclude Include="Serialize\SerializeFuncs.h">
+      <Filter>Serialize</Filter>
+    </ClInclude>
+    <ClInclude Include="Serialize\SerializeMap.h">
+      <Filter>Serialize</Filter>
+    </ClInclude>
+    <ClInclude Include="Serialize\SerializeList.h">
+      <Filter>Serialize</Filter>
+    </ClInclude>
+    <ClInclude Include="Serialize\SerializeDeque.h">
+      <Filter>Serialize</Filter>
+    </ClInclude>
+    <ClInclude Include="Serialize\SerializeSet.h">
+      <Filter>Serialize</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp" />
@@ -106,7 +122,6 @@
     <ClCompile Include="Crypto\sha256.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
-    <ClCompile Include="ChunkFile.cpp" />
     <ClCompile Include="MipsEmitter.cpp" />
     <ClCompile Include="Arm64Emitter.cpp" />
     <ClCompile Include="ColorConv.cpp" />
@@ -141,6 +156,9 @@
       <Filter>Vulkan</Filter>
     </ClCompile>
     <ClCompile Include="ExceptionHandlerSetup.cpp" />
+    <ClCompile Include="Serialize\Serializer.cpp">
+      <Filter>Serialize</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -155,5 +173,8 @@
     <Filter Include="Vulkan">
       <UniqueIdentifier>{c14d66ef-5f7c-4565-975a-72774e7ccfb9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Serialize">
+      <UniqueIdentifier>{7be79ad5-3520-46a1-a370-dce2a943978c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Common/FixedSizeQueue.h b/Common/FixedSizeQueue.h
index 03ebf5c41f..ed7eb14a75 100644
--- a/Common/FixedSizeQueue.h
+++ b/Common/FixedSizeQueue.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #include <cstring>
-#include "ChunkFile.h"
-#include "MemoryUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/Serialize/Serializer.h"
 
 // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
 // real STL classes.
diff --git a/Common/ChunkFileDoDeque.h b/Common/Serialize/SerializeDeque.h
similarity index 91%
rename from Common/ChunkFileDoDeque.h
rename to Common/Serialize/SerializeDeque.h
index 1c2aa9339e..d0dc8adbb0 100644
--- a/Common/ChunkFileDoDeque.h
+++ b/Common/Serialize/SerializeDeque.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
-// Templates for save state serialization.  See ChunkFile.h.
+// Templates for save state serialization.  See Serializer.h.
 #include <deque>
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 template<class T>
 void DoDeque(PointerWrap &p, std::deque<T> &x, T &default_val) {
diff --git a/Common/ChunkFileDo.h b/Common/Serialize/SerializeFuncs.h
similarity index 96%
rename from Common/ChunkFileDo.h
rename to Common/Serialize/SerializeFuncs.h
index e43f229e8a..3080749fa3 100644
--- a/Common/ChunkFileDo.h
+++ b/Common/Serialize/SerializeFuncs.h
@@ -17,10 +17,10 @@
 
 #pragma once
 
-// Templates for save state serialization.  See ChunkFile.h.
+// Templates for save state serialization.  See Serializer.h.
 #include <string>
 #include <type_traits>
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/Swap.h"
 
 void Do(PointerWrap &p, std::string &x);
diff --git a/Common/ChunkFileDoList.h b/Common/Serialize/SerializeList.h
similarity index 96%
rename from Common/ChunkFileDoList.h
rename to Common/Serialize/SerializeList.h
index 1ae1a2a12d..ff4ed57a9a 100644
--- a/Common/ChunkFileDoList.h
+++ b/Common/Serialize/SerializeList.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
-// Templates for save state serialization.  See ChunkFile.h.
+// Templates for save state serialization.  See Serializer.h.
 #include <list>
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 template<class T>
 void DoList(PointerWrap &p, std::list<T> &x, T &default_val) {
diff --git a/Common/ChunkFileDoMap.h b/Common/Serialize/SerializeMap.h
similarity index 97%
rename from Common/ChunkFileDoMap.h
rename to Common/Serialize/SerializeMap.h
index 5c01a244c8..9190f5067e 100644
--- a/Common/ChunkFileDoMap.h
+++ b/Common/Serialize/SerializeMap.h
@@ -17,10 +17,10 @@
 
 #pragma once
 
-// Templates for save state serialization.  See ChunkFile.h.
+// Templates for save state serialization.  See Serializer.h.
 #include <map>
 #include <unordered_map>
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 template<class M>
 void DoMap(PointerWrap &p, M &x, typename M::mapped_type &default_val) {
diff --git a/Common/ChunkFileDoSet.h b/Common/Serialize/SerializeSet.h
similarity index 93%
rename from Common/ChunkFileDoSet.h
rename to Common/Serialize/SerializeSet.h
index ff2186b9f2..7e22f21e56 100644
--- a/Common/ChunkFileDoSet.h
+++ b/Common/Serialize/SerializeSet.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
-// Templates for save state serialization.  See ChunkFile.h.
+// Templates for save state serialization.  See Serializer.h.
 #include <set>
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 template <class T>
 void DoSet(PointerWrap &p, std::set<T> &x) {
diff --git a/Common/ChunkFile.cpp b/Common/Serialize/Serializer.cpp
similarity index 99%
rename from Common/ChunkFile.cpp
rename to Common/Serialize/Serializer.cpp
index 7252d46d68..c2eca8731e 100644
--- a/Common/ChunkFile.cpp
+++ b/Common/Serialize/Serializer.cpp
@@ -19,8 +19,8 @@
 #include <cstring>
 #include <snappy-c.h>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
 
diff --git a/Common/ChunkFile.h b/Common/Serialize/Serializer.h
similarity index 100%
rename from Common/ChunkFile.h
rename to Common/Serialize/Serializer.h
diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp
index 7819370885..b87ee057ed 100644
--- a/Core/CoreTiming.cpp
+++ b/Core/CoreTiming.cpp
@@ -23,9 +23,9 @@
 #include "base/logging.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDoList.h"
 #include "Common/MsgHandler.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeList.h"
 #include "Core/CoreTiming.h"
 #include "Core/Core.h"
 #include "Core/Config.h"
diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp
index 1fb4a4623e..131c739ce1 100644
--- a/Core/CwCheat.cpp
+++ b/Core/CwCheat.cpp
@@ -4,8 +4,8 @@
 #include <cstdint>
 #include "i18n/i18n.h"
 #include "Common/StringUtils.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/FileUtil.h"
 #include "Core/CoreTiming.h"
 #include "Core/CoreParameter.h"
diff --git a/Core/Dialog/PSPDialog.cpp b/Core/Dialog/PSPDialog.cpp
index 4d7eda334a..fd01a96d4f 100644
--- a/Core/Dialog/PSPDialog.cpp
+++ b/Core/Dialog/PSPDialog.cpp
@@ -17,8 +17,8 @@
 
 #include "i18n/i18n.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/sceCtrl.h"
diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp
index e8b239982d..319314fd20 100644
--- a/Core/Dialog/PSPGamedataInstallDialog.cpp
+++ b/Core/Dialog/PSPGamedataInstallDialog.cpp
@@ -17,8 +17,8 @@
 
 #include <algorithm>
 #include "Common/Common.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/ELF/ParamSFO.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp
index b655dd6300..292c213558 100755
--- a/Core/Dialog/PSPMsgDialog.cpp
+++ b/Core/Dialog/PSPMsgDialog.cpp
@@ -16,8 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <algorithm>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
 #include "Core/Dialog/PSPMsgDialog.h"
 #include "Core/Dialog/PSPSaveDialog.h"
diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp
index 4a77d37a8c..1898cbcd94 100644
--- a/Core/Dialog/PSPNetconfDialog.cpp
+++ b/Core/Dialog/PSPNetconfDialog.cpp
@@ -16,8 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "i18n/i18n.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Config.h"
 #include "Core/Dialog/PSPNetconfDialog.h"
 #include "Core/MemMapHelpers.h"
diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
index 4cec09e0c2..60bcb6d6f5 100755
--- a/Core/Dialog/PSPOskDialog.cpp
+++ b/Core/Dialog/PSPOskDialog.cpp
@@ -21,7 +21,7 @@
 #include "math/math_util.h"
 #include "util/text/utf8.h"
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Dialog/PSPOskDialog.h"
 #include "Core/Util/PPGeDraw.h"
 #include "Core/HLE/sceCtrl.h"
@@ -29,7 +29,7 @@
 #include "Core/HLE/sceUtility.h"
 #include "Core/Config.h"
 #include "Core/Reporting.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "GPU/GPUState.h"
 
 #ifndef _WIN32
diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp
index f663c61518..80b4f7c6e1 100755
--- a/Core/Dialog/PSPSaveDialog.cpp
+++ b/Core/Dialog/PSPSaveDialog.cpp
@@ -25,8 +25,8 @@
 #include "thread/threadutil.h"
 
 #include "Common/FileUtil.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "Core/Util/PPGeDraw.h"
 #include "Core/HLE/sceCtrl.h"
diff --git a/Core/Dialog/PSPScreenshotDialog.cpp b/Core/Dialog/PSPScreenshotDialog.cpp
index 2d5c847828..acec8d08d4 100644
--- a/Core/Dialog/PSPScreenshotDialog.cpp
+++ b/Core/Dialog/PSPScreenshotDialog.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/Dialog/PSPScreenshotDialog.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp
index 32374e98cf..1e021d94fc 100644
--- a/Core/Dialog/SavedataParam.cpp
+++ b/Core/Dialog/SavedataParam.cpp
@@ -17,8 +17,8 @@
 
 #include "i18n/i18n.h"
 #include "base/logging.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
 #include "Core/Config.h"
 #include "Core/Host.h"
diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp
index b32f8cc1af..7edb316eef 100644
--- a/Core/FileSystems/DirectoryFileSystem.cpp
+++ b/Core/FileSystems/DirectoryFileSystem.cpp
@@ -23,8 +23,8 @@
 #include "file/zip_read.h"
 #include "i18n/i18n.h"
 #include "util/text/utf8.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/FileUtil.h"
 #include "Core/FileSystems/DirectoryFileSystem.h"
 #include "Core/FileSystems/ISOFileSystem.h"
diff --git a/Core/FileSystems/FileSystem.cpp b/Core/FileSystems/FileSystem.cpp
index 7fae8183e7..40b527f562 100644
--- a/Core/FileSystems/FileSystem.cpp
+++ b/Core/FileSystems/FileSystem.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/FileSystems/FileSystem.h"
 
 void PSPFileInfo::DoState(PointerWrap &p) {
diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp
index 7ead5c5e4d..04c52f14c6 100644
--- a/Core/FileSystems/ISOFileSystem.cpp
+++ b/Core/FileSystems/ISOFileSystem.cpp
@@ -22,8 +22,8 @@
 
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/FileSystems/ISOFileSystem.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/MemMap.h"
diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp
index b4d545a25d..31f7bf5689 100644
--- a/Core/FileSystems/MetaFileSystem.cpp
+++ b/Core/FileSystems/MetaFileSystem.cpp
@@ -18,9 +18,9 @@
 #include <algorithm>
 #include <set>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Common/StringUtils.h"
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "Core/HLE/sceKernelThread.h"
diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp
index 974823415d..df3375fffb 100644
--- a/Core/FileSystems/VirtualDiscFileSystem.cpp
+++ b/Core/FileSystems/VirtualDiscFileSystem.cpp
@@ -19,8 +19,8 @@
 
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/FileSystems/VirtualDiscFileSystem.h"
 #include "Core/FileSystems/ISOFileSystem.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp
index 074688676f..ae3afa57b8 100644
--- a/Core/Font/PGF.cpp
+++ b/Core/Font/PGF.cpp
@@ -21,8 +21,8 @@
 // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3.
 
 #include <algorithm>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/Font/PGF.h"
diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
index 6a731ef340..06cdf4f390 100644
--- a/Core/HLE/HLE.cpp
+++ b/Core/HLE/HLE.cpp
@@ -24,7 +24,7 @@
 #include "base/timeutil.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/HLEHelperThread.cpp b/Core/HLE/HLEHelperThread.cpp
index c84be0feca..a142820b92 100644
--- a/Core/HLE/HLEHelperThread.cpp
+++ b/Core/HLE/HLEHelperThread.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/HLE.h"
diff --git a/Core/HLE/ThreadQueueList.h b/Core/HLE/ThreadQueueList.h
index e08b9c07a5..72282e2a3f 100644
--- a/Core/HLE/ThreadQueueList.h
+++ b/Core/HLE/ThreadQueueList.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include "Core/HLE/sceKernel.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 
 struct ThreadQueueList {
 	// Number of queues (number of priority levels starting at 0.)
diff --git a/Core/HLE/__sceAudio.cpp b/Core/HLE/__sceAudio.cpp
index d8472edc47..57ef29281d 100644
--- a/Core/HLE/__sceAudio.cpp
+++ b/Core/HLE/__sceAudio.cpp
@@ -19,8 +19,8 @@
 #include <mutex>
 
 #include "Common/CommonTypes.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/FixedSizeQueue.h"
 
 #ifdef _M_SSE
diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index 6e22b3801f..681e11e493 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -33,7 +33,7 @@
 #include <cstring>
 #include "util/text/parsers.h"
 #include "thread/threadutil.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HLE/sceKernelInterrupt.h"
diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
index b84a13de6d..e5d39745ee 100644
--- a/Core/HLE/proAdhoc.h
+++ b/Core/HLE/proAdhoc.h
@@ -43,7 +43,7 @@
 
 #include "base/timeutil.h"
 #include "net/resolve.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
index fb54546fdb..bdaeea8b98 100644
--- a/Core/HLE/sceAtrac.cpp
+++ b/Core/HLE/sceAtrac.cpp
@@ -17,8 +17,8 @@
 
 #include <algorithm>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceAudio.cpp b/Core/HLE/sceAudio.cpp
index c5d2d54a0a..41eb487167 100644
--- a/Core/HLE/sceAudio.cpp
+++ b/Core/HLE/sceAudio.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/FixedSizeQueue.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/Host.h"
diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp
index 2e29668cdd..d21be884b8 100644
--- a/Core/HLE/sceAudiocodec.cpp
+++ b/Core/HLE/sceAudiocodec.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceAudiocodec.h"
diff --git a/Core/HLE/sceCcc.cpp b/Core/HLE/sceCcc.cpp
index 7040a5f329..2dba0143cd 100644
--- a/Core/HLE/sceCcc.cpp
+++ b/Core/HLE/sceCcc.cpp
@@ -19,8 +19,8 @@
 #include "util/text/utf16.h"
 #include "util/text/shiftjis.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Debugger/Breakpoints.h"
 #include "Core/MemMap.h"
 #include "Core/HLE/HLE.h"
diff --git a/Core/HLE/sceCtrl.cpp b/Core/HLE/sceCtrl.cpp
index 28957509b2..a87cba554f 100644
--- a/Core/HLE/sceCtrl.cpp
+++ b/Core/HLE/sceCtrl.cpp
@@ -18,8 +18,8 @@
 #include <cmath>
 #include <mutex>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 1781bc4aec..5551513e7f 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -36,9 +36,9 @@
 
 #include "gfx_es2/gpu_features.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/CoreParameter.h"
diff --git a/Core/HLE/sceDmac.cpp b/Core/HLE/sceDmac.cpp
index 9290cc4d76..4f186facfe 100644
--- a/Core/HLE/sceDmac.cpp
+++ b/Core/HLE/sceDmac.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp
index 786d7b0ed4..4577aa5d83 100644
--- a/Core/HLE/sceFont.cpp
+++ b/Core/HLE/sceFont.cpp
@@ -7,9 +7,9 @@
 #include <map>
 #include <algorithm>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceFont.h"
diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp
index 7e90b9e8a4..0cdae03b8a 100644
--- a/Core/HLE/sceGe.cpp
+++ b/Core/HLE/sceGe.cpp
@@ -19,10 +19,10 @@
 #include <vector>
 #include <mutex>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoList.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeList.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Common/ThreadSafeList.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
diff --git a/Core/HLE/sceHeap.cpp b/Core/HLE/sceHeap.cpp
index edf8b82698..0de98e1443 100644
--- a/Core/HLE/sceHeap.cpp
+++ b/Core/HLE/sceHeap.cpp
@@ -15,9 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/MemMap.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
diff --git a/Core/HLE/sceImpose.cpp b/Core/HLE/sceImpose.cpp
index 8a3b60fec0..086cc83c17 100644
--- a/Core/HLE/sceImpose.cpp
+++ b/Core/HLE/sceImpose.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceImpose.h"
diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
index 9f1a167f66..16206298f2 100644
--- a/Core/HLE/sceIo.cpp
+++ b/Core/HLE/sceIo.cpp
@@ -22,10 +22,10 @@
 #include "thread/threadutil.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
-#include "Common/ChunkFileDoSet.h"
 #include "Common/FileUtil.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
+#include "Common/Serialize/SerializeSet.h"
 #include "Core/Core.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp
index feb0c0ea58..aa6d554ded 100644
--- a/Core/HLE/sceJpeg.cpp
+++ b/Core/HLE/sceJpeg.cpp
@@ -19,8 +19,8 @@
 #include "ext/jpge/jpgd.h"
 
 #include "Common/Common.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceJpeg.h"
diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp
index 30fe5dc999..6521f3e79c 100644
--- a/Core/HLE/sceKernel.cpp
+++ b/Core/HLE/sceKernel.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/LogManager.h"
 #include "Core/Core.h"
 #include "Core/Config.h"
diff --git a/Core/HLE/sceKernelAlarm.cpp b/Core/HLE/sceKernelAlarm.cpp
index ce78663ded..d6b12703df 100644
--- a/Core/HLE/sceKernelAlarm.cpp
+++ b/Core/HLE/sceKernelAlarm.cpp
@@ -16,9 +16,9 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <list>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoList.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeList.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelAlarm.h"
 #include "Core/HLE/sceKernelInterrupt.h"
diff --git a/Core/HLE/sceKernelEventFlag.cpp b/Core/HLE/sceKernelEventFlag.cpp
index fac0cc1164..b4c28732b6 100644
--- a/Core/HLE/sceKernelEventFlag.cpp
+++ b/Core/HLE/sceKernelEventFlag.cpp
@@ -15,9 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/sceKernelHeap.cpp b/Core/HLE/sceKernelHeap.cpp
index e73f9f60c6..0399f3a0a6 100644
--- a/Core/HLE/sceKernelHeap.cpp
+++ b/Core/HLE/sceKernelHeap.cpp
@@ -1,7 +1,7 @@
 #include <string>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
index fe7b00a9e1..8d8e4124db 100644
--- a/Core/HLE/sceKernelInterrupt.cpp
+++ b/Core/HLE/sceKernelInterrupt.cpp
@@ -19,10 +19,10 @@
 #include <list>
 #include <map>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoList.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeList.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp
index d18fe88b5a..29ff672e2a 100644
--- a/Core/HLE/sceKernelMbx.cpp
+++ b/Core/HLE/sceKernelMbx.cpp
@@ -17,9 +17,9 @@
 
 #include <map>
 #include <vector>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/sceKernel.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernelMbx.h"
diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp
index 3965469280..7da8bc4ef2 100644
--- a/Core/HLE/sceKernelMemory.cpp
+++ b/Core/HLE/sceKernelMemory.cpp
@@ -20,9 +20,9 @@
 #include <vector>
 #include <map>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/System.h"
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index 8d4d0f85c0..c049729246 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -22,9 +22,9 @@
 #include "zlib.h"
 
 #include "base/stringutil.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoSet.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeSet.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
 #include "Core/Config.h"
diff --git a/Core/HLE/sceKernelMsgPipe.cpp b/Core/HLE/sceKernelMsgPipe.cpp
index 632e9815b6..2df1f2d105 100644
--- a/Core/HLE/sceKernelMsgPipe.cpp
+++ b/Core/HLE/sceKernelMsgPipe.cpp
@@ -17,9 +17,9 @@
 
 #include <algorithm>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/Reporting.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
diff --git a/Core/HLE/sceKernelMutex.cpp b/Core/HLE/sceKernelMutex.cpp
index 527a4ffc7a..1b6b314764 100644
--- a/Core/HLE/sceKernelMutex.cpp
+++ b/Core/HLE/sceKernelMutex.cpp
@@ -18,9 +18,9 @@
 #include <algorithm>
 #include <map>
 #include <unordered_map>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/HLE.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceKernelSemaphore.cpp b/Core/HLE/sceKernelSemaphore.cpp
index 3d74bffa3d..0b90a3067c 100644
--- a/Core/HLE/sceKernelSemaphore.cpp
+++ b/Core/HLE/sceKernelSemaphore.cpp
@@ -16,9 +16,9 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <algorithm>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index d6c64f87e1..5e4ebe84d1 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -23,12 +23,12 @@
 
 #include "base/logging.h"
 
-#include "Common/LogManager.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoList.h"
-#include "Common/ChunkFileDoMap.h"
 #include "Common/CommonTypes.h"
+#include "Common/LogManager.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeList.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/HLETables.h"
 #include "Core/MIPS/MIPSAnalyst.h"
diff --git a/Core/HLE/sceKernelTime.cpp b/Core/HLE/sceKernelTime.cpp
index 64b454f7e4..8bfa812e30 100644
--- a/Core/HLE/sceKernelTime.cpp
+++ b/Core/HLE/sceKernelTime.cpp
@@ -23,8 +23,8 @@
 
 #include <time.h>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/sceKernel.h"
diff --git a/Core/HLE/sceKernelVTimer.cpp b/Core/HLE/sceKernelVTimer.cpp
index 643ca3a5ab..245db8a395 100644
--- a/Core/HLE/sceKernelVTimer.cpp
+++ b/Core/HLE/sceKernelVTimer.cpp
@@ -17,9 +17,9 @@
 
 #include <algorithm>
 #include <list>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoList.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeList.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp
index 048d4df1ef..b3bdcb9b18 100644
--- a/Core/HLE/sceMp3.cpp
+++ b/Core/HLE/sceMp3.cpp
@@ -18,8 +18,8 @@
 #include <map>
 #include <algorithm>
 
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/Config.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp
index 646ef63e9e..376c4adeaf 100644
--- a/Core/HLE/sceMp4.cpp
+++ b/Core/HLE/sceMp4.cpp
@@ -17,8 +17,8 @@
 
 #include <algorithm>
 
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/Reporting.h"
diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
index d9f264cfa0..6a10183fab 100644
--- a/Core/HLE/sceMpeg.cpp
+++ b/Core/HLE/sceMpeg.cpp
@@ -20,8 +20,8 @@
 #include <algorithm>
 #include <memory>
 
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Common/Swap.h"
 #include "Core/HLE/sceMpeg.h"
 #include "Core/HLE/sceKernelModule.h"
diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp
index f7acd4e851..a631ee09c9 100644
--- a/Core/HLE/sceNet.cpp
+++ b/Core/HLE/sceNet.cpp
@@ -25,9 +25,9 @@
 #include "net/resolve.h"
 #include "util/text/parsers.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelMemory.h"
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index 174e9ed930..1260fcaead 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -28,9 +28,9 @@
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/MemMapHelpers.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/Util/PortManager.h"
 
diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp
index 610e21234f..caa8e1d8fe 100644
--- a/Core/HLE/scePower.cpp
+++ b/Core/HLE/scePower.cpp
@@ -16,8 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 #include <map>
 #include <vector>
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp
index e02da6b4f1..0a601db8d4 100644
--- a/Core/HLE/scePsmf.cpp
+++ b/Core/HLE/scePsmf.cpp
@@ -15,9 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
 #include "Core/System.h"
diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp
index eb19ce95b2..f9ad48aa7e 100644
--- a/Core/HLE/sceRtc.cpp
+++ b/Core/HLE/sceRtc.cpp
@@ -26,8 +26,8 @@
 #include <time.h>
 #include "base/timeutil.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp
index 0e5f95f65e..a79e511ae7 100644
--- a/Core/HLE/sceSas.cpp
+++ b/Core/HLE/sceSas.cpp
@@ -35,7 +35,7 @@
 #include "base/basictypes.h"
 #include "profiler/profiler.h"
 #include "thread/threadutil.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/sceSsl.cpp b/Core/HLE/sceSsl.cpp
index 65efc6cde4..7361962d1d 100644
--- a/Core/HLE/sceSsl.cpp
+++ b/Core/HLE/sceSsl.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MemMap.h"
diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp
index e609a14592..9ff737f1b5 100644
--- a/Core/HLE/sceUmd.cpp
+++ b/Core/HLE/sceUmd.cpp
@@ -19,9 +19,9 @@
 
 #include "file/file_util.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/Loaders.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
diff --git a/Core/HLE/sceUsb.cpp b/Core/HLE/sceUsb.cpp
index 6300be0118..60622c9cf0 100644
--- a/Core/HLE/sceUsb.cpp
+++ b/Core/HLE/sceUsb.cpp
@@ -16,8 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "base/NativeApp.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceUsbCam.cpp b/Core/HLE/sceUsbCam.cpp
index 751952dbb9..4b3ec1a4ef 100644
--- a/Core/HLE/sceUsbCam.cpp
+++ b/Core/HLE/sceUsbCam.cpp
@@ -20,8 +20,8 @@
 
 #include "base/NativeApp.h"
 #include "ppsspp_config.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/sceUsbCam.h"
 #include "Core/HLE/sceUsbMic.h"
diff --git a/Core/HLE/sceUsbGps.cpp b/Core/HLE/sceUsbGps.cpp
index dce4fe5fb3..3d014318ac 100644
--- a/Core/HLE/sceUsbGps.cpp
+++ b/Core/HLE/sceUsbGps.cpp
@@ -17,8 +17,8 @@
 
 #include <ctime>
 #include "base/NativeApp.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceUsbGps.h"
diff --git a/Core/HLE/sceUsbMic.cpp b/Core/HLE/sceUsbMic.cpp
index 9f165ed064..30035f1584 100644
--- a/Core/HLE/sceUsbMic.cpp
+++ b/Core/HLE/sceUsbMic.cpp
@@ -18,8 +18,8 @@
 #include <mutex>
 
 #include "base/NativeApp.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HLE/sceKernelThread.h"
diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp
index 29e745a7f4..0421c6bb67 100644
--- a/Core/HLE/sceUtility.cpp
+++ b/Core/HLE/sceUtility.cpp
@@ -20,10 +20,10 @@
 
 #include "file/ini_file.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
-#include "Common/ChunkFileDoSet.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
+#include "Common/Serialize/SerializeSet.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HLE/sceVaudio.cpp b/Core/HLE/sceVaudio.cpp
index de617a78b4..7d5819114f 100644
--- a/Core/HLE/sceVaudio.cpp
+++ b/Core/HLE/sceVaudio.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Reporting.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
diff --git a/Core/HW/AsyncIOManager.cpp b/Core/HW/AsyncIOManager.cpp
index 78f636b809..1d4ce89b0a 100644
--- a/Core/HW/AsyncIOManager.cpp
+++ b/Core/HW/AsyncIOManager.cpp
@@ -18,10 +18,10 @@
 #include <condition_variable>
 #include <mutex>
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
-#include "Common/ChunkFileDoSet.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
+#include "Common/Serialize/SerializeSet.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/Reporting.h"
 #include "Core/System.h"
diff --git a/Core/HW/BufferQueue.cpp b/Core/HW/BufferQueue.cpp
index 8051720d6c..9fbffe0c65 100644
--- a/Core/HW/BufferQueue.cpp
+++ b/Core/HW/BufferQueue.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoMap.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeMap.h"
 #include "Core/HW/BufferQueue.h"
 
 void BufferQueue::DoState(PointerWrap &p) {
diff --git a/Core/HW/BufferQueue.h b/Core/HW/BufferQueue.h
index b69782e985..b587b29498 100644
--- a/Core/HW/BufferQueue.h
+++ b/Core/HW/BufferQueue.h
@@ -19,7 +19,7 @@
 
 #include <map>
 #include <cstring>
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 
 struct BufferQueue {
 	BufferQueue(int size = 0x20000) {
diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp
index 83735a02ce..6b1d646bd1 100644
--- a/Core/HW/MediaEngine.cpp
+++ b/Core/HW/MediaEngine.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Config.h"
 #include "Core/Debugger/Breakpoints.h"
 #include "Core/HW/MediaEngine.h"
diff --git a/Core/HW/MemoryStick.cpp b/Core/HW/MemoryStick.cpp
index d04f116508..f2acf2991b 100644
--- a/Core/HW/MemoryStick.cpp
+++ b/Core/HW/MemoryStick.cpp
@@ -1,5 +1,5 @@
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/CoreTiming.h"
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "Core/HW/MemoryStick.h"
diff --git a/Core/HW/MpegDemux.cpp b/Core/HW/MpegDemux.cpp
index d65db8d4cf..da121f72e0 100644
--- a/Core/HW/MpegDemux.cpp
+++ b/Core/HW/MpegDemux.cpp
@@ -1,4 +1,4 @@
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HW/MpegDemux.h"
 #include "Core/Reporting.h"
 
diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp
index 7cb6db52d0..913c6948cf 100644
--- a/Core/HW/SasAudio.cpp
+++ b/Core/HW/SasAudio.cpp
@@ -20,7 +20,7 @@
 #include "base/basictypes.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/HLE/sceAtrac.h"
 #include "Core/Config.h"
diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp
index 3730b299eb..b6a51438c9 100644
--- a/Core/HW/SimpleAudioDec.cpp
+++ b/Core/HW/SimpleAudioDec.cpp
@@ -17,7 +17,7 @@
 
 #include <algorithm>
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Config.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/HW/SimpleAudioDec.h"
diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
index 27617e3ba7..29ecf60b76 100644
--- a/Core/HW/StereoResampler.cpp
+++ b/Core/HW/StereoResampler.cpp
@@ -38,7 +38,7 @@
 #include "base/logging.h"
 #include "base/timeutil.h"
 #include "base/NativeApp.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/MathUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
diff --git a/Core/HW/StereoResampler.h b/Core/HW/StereoResampler.h
index 451b598d66..4b10d032c0 100644
--- a/Core/HW/StereoResampler.h
+++ b/Core/HW/StereoResampler.h
@@ -22,7 +22,7 @@
 #include <cstdint>
 #include <atomic>
 
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/CommonTypes.h"
 
 struct AudioDebugStats;
diff --git a/Core/MIPS/IR/IRFrontend.cpp b/Core/MIPS/IR/IRFrontend.cpp
index d1ccfec8bf..86f6b0e198 100644
--- a/Core/MIPS/IR/IRFrontend.cpp
+++ b/Core/MIPS/IR/IRFrontend.cpp
@@ -17,8 +17,8 @@
 
 #include "base/logging.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Debugger/Breakpoints.h"
 #include "Core/Debugger/SymbolMap.h"
 #include "Core/Reporting.h"
diff --git a/Core/MIPS/IR/IRJit.cpp b/Core/MIPS/IR/IRJit.cpp
index 9c07d83280..12af157044 100644
--- a/Core/MIPS/IR/IRJit.cpp
+++ b/Core/MIPS/IR/IRJit.cpp
@@ -19,7 +19,7 @@
 #include "base/logging.h"
 #include "ext/xxhash.h"
 #include "profiler/profiler.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/StringUtils.h"
 
 #include "Core/Core.h"
diff --git a/Core/MIPS/JitCommon/JitCommon.cpp b/Core/MIPS/JitCommon/JitCommon.cpp
index 232c099ec9..397cc85ad9 100644
--- a/Core/MIPS/JitCommon/JitCommon.cpp
+++ b/Core/MIPS/JitCommon/JitCommon.cpp
@@ -21,8 +21,8 @@
 #include "ext/udis86/udis86.h"
 
 #include "Common/StringUtils.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 #include "Core/Util/DisArm64.h"
 #include "Core/Config.h"
diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp
index 6415d5c57e..a85e5a9999 100644
--- a/Core/MIPS/MIPS.cpp
+++ b/Core/MIPS/MIPS.cpp
@@ -21,8 +21,8 @@
 #include "math/math_util.h"
 
 #include "Common.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/ConfigValues.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSInt.h"
diff --git a/Core/MIPS/MIPS/MipsJit.cpp b/Core/MIPS/MIPS/MipsJit.cpp
index e7419bf305..345ff74018 100644
--- a/Core/MIPS/MIPS/MipsJit.cpp
+++ b/Core/MIPS/MIPS/MipsJit.cpp
@@ -20,7 +20,7 @@
 
 #include "base/logging.h"
 #include "profiler/profiler.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Core/Reporting.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
diff --git a/Core/MIPS/fake/FakeJit.cpp b/Core/MIPS/fake/FakeJit.cpp
index 1a521ee68b..25e085c0ed 100644
--- a/Core/MIPS/fake/FakeJit.cpp
+++ b/Core/MIPS/fake/FakeJit.cpp
@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "base/logging.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Core/Reporting.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp
index f68993d3d8..fb4ec02292 100644
--- a/Core/MIPS/x86/Jit.cpp
+++ b/Core/MIPS/x86/Jit.cpp
@@ -24,8 +24,8 @@
 #include "math/math_util.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Core.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp
index d4d6bc9ed9..1a60d42b9c 100644
--- a/Core/MemMap.cpp
+++ b/Core/MemMap.cpp
@@ -27,8 +27,8 @@
 #include "Common/Common.h"
 #include "Common/MemoryUtil.h"
 #include "Common/MemArena.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 #include "Core/MemMap.h"
 #include "Core/MemFault.h"
diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index a993b98947..0447d6adb9 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -22,9 +22,9 @@
 
 #include "Core/Reporting.h"
 
-#include "Common/ChunkFileDo.h"
 #include "Common/CPUDetect.h"
 #include "Common/FileUtil.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/Config.h"
diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
index 46d661b2ce..19a78cc6ac 100644
--- a/Core/SaveState.cpp
+++ b/Core/SaveState.cpp
@@ -26,8 +26,8 @@
 #include "util/text/parsers.h"
 
 #include "Common/FileUtil.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 
 #include "Core/SaveState.h"
 #include "Core/Config.h"
diff --git a/Core/SaveState.h b/Core/SaveState.h
index 98b5d9b7d9..f2c1a3a426 100644
--- a/Core/SaveState.h
+++ b/Core/SaveState.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 
 namespace SaveState
 {
diff --git a/Core/Util/BlockAllocator.cpp b/Core/Util/BlockAllocator.cpp
index 10d3d7e627..c302d8e91b 100644
--- a/Core/Util/BlockAllocator.cpp
+++ b/Core/Util/BlockAllocator.cpp
@@ -18,8 +18,8 @@
 #include <cstring>
 
 #include "Common/Log.h"
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
 #include "Core/Util/BlockAllocator.h"
 #include "Core/Reporting.h"
diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp
index 9b5cb865f4..356bd4ef90 100644
--- a/Core/Util/PPGeDraw.cpp
+++ b/Core/Util/PPGeDraw.cpp
@@ -26,8 +26,8 @@
 #include "image/png_load.h"
 #include "util/text/utf8.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/HDRemaster.h"
 #include "Core/Host.h"
 #include "GPU/ge_constants.h"
diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp
index 8535d1fb5e..31a2faa449 100644
--- a/GPU/D3D11/GPU_D3D11.cpp
+++ b/GPU/D3D11/GPU_D3D11.cpp
@@ -36,7 +36,7 @@
 
 #include <set>
 
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/GraphicsContext.h"
 #include "base/NativeApp.h"
 #include "base/logging.h"
diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp
index 9c490edfa9..73049a864b 100644
--- a/GPU/Directx9/GPU_DX9.cpp
+++ b/GPU/Directx9/GPU_DX9.cpp
@@ -17,7 +17,7 @@
 
 #include <set>
 
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/GraphicsContext.h"
 #include "base/NativeApp.h"
 #include "base/logging.h"
diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp
index 3c3f881aae..1597ae0218 100644
--- a/GPU/GLES/GPU_GLES.cpp
+++ b/GPU/GLES/GPU_GLES.cpp
@@ -19,7 +19,7 @@
 #include "profiler/profiler.h"
 #include "i18n/i18n.h"
 
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/FileUtil.h"
 #include "Common/GraphicsContext.h"
 
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 48d0a332e9..4b8d995983 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -5,16 +5,16 @@
 #include "base/timeutil.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFileDo.h"
-#include "Common/ChunkFileDoList.h"
 #include "Common/ColorConv.h"
 #include "Common/GraphicsContext.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
+#include "Common/Serialize/SerializeList.h"
 #include "Core/Reporting.h"
 #include "GPU/GeDisasm.h"
 #include "GPU/GPU.h"
 #include "GPU/GPUCommon.h"
 #include "GPU/GPUState.h"
-#include "ChunkFile.h"
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/MemMap.h"
diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp
index c64e57d49f..bc62a3661b 100644
--- a/GPU/GPUState.cpp
+++ b/GPU/GPUState.cpp
@@ -18,8 +18,8 @@
 #include "GPU/ge_constants.h"
 #include "GPU/GPUState.h"
 
-#include "Common/ChunkFile.h"
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Core/CoreParameter.h"
 #include "Core/Config.h"
 #include "Core/System.h"
diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index 7000084dcb..eb31fbc95e 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -22,7 +22,7 @@
 #include "base/timeutil.h"
 #include "profiler/profiler.h"
 
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/FileUtil.h"
 #include "Common/GraphicsContext.h"
 
diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp
index 7a25c34afa..16c8e5cea1 100644
--- a/UI/BackgroundAudio.cpp
+++ b/UI/BackgroundAudio.cpp
@@ -7,7 +7,7 @@
 #include "file/vfs.h"
 #include "ui/root.h"
 
-#include "Common/ChunkFileDo.h"
+#include "Common/Serialize/SerializeFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/FixedSizeQueue.h"
 #include "Core/HW/SimpleAudioDec.h"
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index 747a2a83f0..d07e29c0a5 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -384,8 +384,12 @@
     <ClInclude Include="..\..\Common\ArmCommon.h" />
     <ClInclude Include="..\..\Common\ArmEmitter.h" />
     <ClInclude Include="..\..\Common\BitSet.h" />
-    <ClInclude Include="..\..\Common\ChunkFile.h" />
-    <ClInclude Include="..\..\Common\ChunkFileDo.h" />
+    <ClInclude Include="..\..\Common\Serialize\Serializer.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeDeque.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeFuncs.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeList.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeMap.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeSet.h" />
     <ClInclude Include="..\..\Common\CodeBlock.h" />
     <ClInclude Include="..\..\Common\ColorConv.h" />
     <ClInclude Include="..\..\Common\ColorConvNEON.h" />
@@ -429,7 +433,7 @@
     <ClCompile Include="..\..\Common\Arm64Emitter.cpp" />
     <ClCompile Include="..\..\Common\ArmCPUDetect.cpp" />
     <ClCompile Include="..\..\Common\ArmEmitter.cpp" />
-    <ClCompile Include="..\..\Common\ChunkFile.cpp" />
+    <ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
     <ClCompile Include="..\..\Common\ColorConv.cpp" />
     <ClCompile Include="..\..\Common\ColorConvNEON.cpp" />
     <ClCompile Include="..\..\Common\ConsoleListener.cpp" />
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters
index ec50d08b2a..5a670fd890 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@@ -11,7 +11,7 @@
     <ClCompile Include="..\..\Common\Arm64Emitter.cpp" />
     <ClCompile Include="..\..\Common\ArmCPUDetect.cpp" />
     <ClCompile Include="..\..\Common\ArmEmitter.cpp" />
-    <ClCompile Include="..\..\Common\ChunkFile.cpp" />
+    <ClCompile Include="..\..\Common\Serialize\Serializer.cpp" />
     <ClCompile Include="..\..\Common\ColorConv.cpp" />
     <ClCompile Include="..\..\Common\ColorConvNEON.cpp" />
     <ClCompile Include="..\..\Common\ConsoleListener.cpp" />
@@ -55,8 +55,12 @@
     <ClInclude Include="..\..\Common\ArmCommon.h" />
     <ClInclude Include="..\..\Common\ArmEmitter.h" />
     <ClInclude Include="..\..\Common\BitSet.h" />
-    <ClInclude Include="..\..\Common\ChunkFile.h" />
-    <ClInclude Include="..\..\Common\ChunkFileDo.h" />
+    <ClInclude Include="..\..\Common\Serialize\Serializer.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializerDeque.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializerFuncs.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializerList.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializerMap.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializerSet.h" />
     <ClInclude Include="..\..\Common\CodeBlock.h" />
     <ClInclude Include="..\..\Common\ColorConv.h" />
     <ClInclude Include="..\..\Common\ColorConvNEON.h" />
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 9b2d62b92a..4f7d7c2899 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -205,7 +205,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Crypto/md5.cpp \
   $(SRC)/Common/Crypto/sha1.cpp \
   $(SRC)/Common/Crypto/sha256.cpp \
-  $(SRC)/Common/ChunkFile.cpp \
+  $(SRC)/Common/Serialize/Serializer.cpp \
   $(SRC)/Common/ColorConv.cpp \
   $(SRC)/Common/ExceptionHandlerSetup.cpp \
   $(SRC)/Common/KeyMap.cpp \
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index cf38aae92b..1a347a8acb 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -141,7 +141,7 @@ SOURCES_CXX += \
 	$(COMMONDIR)/Crypto/sha256.cpp
 
 SOURCES_CXX += \
-	$(COMMONDIR)/ChunkFile.cpp \
+	$(COMMONDIR)/Serialize/Serializer.cpp \
 	$(COMMONDIR)/ConsoleListener.cpp \
 	$(COMMONDIR)/ExceptionHandlerSetup.cpp \
 	$(COMMONDIR)/FileUtil.cpp \
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index 2c782a4b3c..6058b27670 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "base/timeutil.h"
-#include "Common/ChunkFile.h"
+#include "Common/Serialize/Serializer.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Core.h"