diff --git a/source/graphics/tests/test_MeshManager.h b/source/graphics/tests/test_MeshManager.h
index 568e82001b..6852d892b6 100644
--- a/source/graphics/tests/test_MeshManager.h
+++ b/source/graphics/tests/test_MeshManager.h
@@ -1,9 +1,9 @@
 #include "lib/self_test.h"
 
 #include "lib/res/file/vfs.h"
-#include "lib/res/file/vfs_optimizer.h"
+#include "lib/res/file/archive/vfs_optimizer.h"
 #include "lib/res/file/path.h"
-#include "lib/res/file/trace.h"
+#include "lib/res/file/archive/trace.h"
 #include "lib/res/h_mgr.h"
 
 #include "graphics/ColladaManager.h"
diff --git a/source/lib/res/file/vfs_optimizer.cpp b/source/lib/res/file/archive/vfs_optimizer.cpp
similarity index 99%
rename from source/lib/res/file/vfs_optimizer.cpp
rename to source/lib/res/file/archive/vfs_optimizer.cpp
index bbe6d12b28..8feb16a962 100644
--- a/source/lib/res/file/vfs_optimizer.cpp
+++ b/source/lib/res/file/archive/vfs_optimizer.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <ctime>
 
-#include "file_internal.h"
+#include "../file_internal.h"
 
 // enough for 64K unique files - ought to suffice.
 typedef u16 FileId;
diff --git a/source/lib/res/file/vfs_optimizer.h b/source/lib/res/file/archive/vfs_optimizer.h
similarity index 100%
rename from source/lib/res/file/vfs_optimizer.h
rename to source/lib/res/file/archive/vfs_optimizer.h
diff --git a/source/lib/res/file/file_internal.h b/source/lib/res/file/file_internal.h
index 78db200d89..c756702756 100644
--- a/source/lib/res/file/file_internal.h
+++ b/source/lib/res/file/file_internal.h
@@ -17,19 +17,18 @@
 
 #include "file_stats.h"	// must come after file and file_cache
 
-#include "compression.h"
-#include "zip.h"
-#include "archive.h"
-#include "archive_builder.h"
+#include "archive/compression.h"
+#include "archive/zip.h"
+#include "archive/archive.h"
+#include "archive/archive_builder.h"
+#include "archive/trace.h"
+#include "archive/vfs_optimizer.h"
 
 #include "vfs.h"
 #include "vfs_mount.h"
 #include "vfs_tree.h"
 #include "vfs_redirector.h"
 
-#include "trace.h"
-#include "vfs_optimizer.h"
-
 const size_t AIO_SECTOR_SIZE = 512;
 
 // block := power-of-two sized chunk of a file.
diff --git a/source/lib/res/file/vfs_mount.h b/source/lib/res/file/vfs_mount.h
index 9f4c713eed..08003e4a0e 100644
--- a/source/lib/res/file/vfs_mount.h
+++ b/source/lib/res/file/vfs_mount.h
@@ -16,7 +16,7 @@ struct Mount;	// must come before vfs_tree.h
 
 #include "lib/res/handle.h"
 #include "file.h"
-#include "zip.h"
+#include "archive/zip.h"
 #include "vfs_tree.h"
 
 
diff --git a/source/main.cpp b/source/main.cpp
index 8f3502e961..919746c83b 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -18,7 +18,7 @@ that of Atlas depending on commandline parameters.
 #include "lib/external_libraries/sdl.h"
 #include "lib/res/file/vfs.h"
 #include "lib/res/sound/snd_mgr.h"
-#include "lib/res/file/vfs_optimizer.h"
+#include "lib/res/file/archive/vfs_optimizer.h"
 
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/GameSetup/Atlas.h"
diff --git a/source/ps/GameSetup/Config.cpp b/source/ps/GameSetup/Config.cpp
index 95906f1d66..62379fc050 100644
--- a/source/ps/GameSetup/Config.cpp
+++ b/source/ps/GameSetup/Config.cpp
@@ -6,9 +6,9 @@
 #include "ps/GameSetup/CmdLineArgs.h"
 #include "lib/timer.h"
 #include "lib/res/sound/snd_mgr.h"
-#include "lib/res/file/trace.h"
+#include "lib/res/file/archive/trace.h"
 #include "lib/res/file/vfs.h"
-#include "lib/res/file/vfs_optimizer.h"
+#include "lib/res/file/archive/vfs_optimizer.h"
 #include "Config.h"
 
 #define LOG_CATEGORY "config"
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index 7dbe46c4a2..56baa9c86a 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -9,7 +9,7 @@
 #include "lib/sysdep/cpu.h"
 #include "lib/sysdep/gfx.h"
 #include "lib/res/res.h"
-#include "lib/res/file/trace.h"
+#include "lib/res/file/archive/trace.h"
 #include "lib/res/sound/snd_mgr.h"
 #include "lib/res/graphics/tex.h"
 #include "lib/res/graphics/cursor.h"
diff --git a/source/ps/XML/tests/test_Xeromyces.h b/source/ps/XML/tests/test_Xeromyces.h
index b921df3dcb..a125e13f35 100644
--- a/source/ps/XML/tests/test_Xeromyces.h
+++ b/source/ps/XML/tests/test_Xeromyces.h
@@ -3,7 +3,6 @@
 #include "ps/XML/Xeromyces.h"
 #include "lib/res/file/vfs.h"
 #include "lib/res/file/path.h"
-#include "lib/res/file/trace.h"
 #include "lib/res/h_mgr.h"
 
 class TestXeromyces : public CxxTest::TestSuite 
diff --git a/source/ps/scripting/JSInterface_VFS.cpp b/source/ps/scripting/JSInterface_VFS.cpp
index 6a91b9e51a..179b0ad51d 100644
--- a/source/ps/scripting/JSInterface_VFS.cpp
+++ b/source/ps/scripting/JSInterface_VFS.cpp
@@ -5,7 +5,7 @@
 #include "ps/CStr.h"
 #include "ps/VFSUtil.h"
 #include "lib/res/res.h"
-#include "lib/res/file/vfs_optimizer.h"	// ArchiveBuilderCancel
+#include "lib/res/file/archive/vfs_optimizer.h"	// ArchiveBuilderCancel
 #include "lib/res/file/vfs_mount.h"	// TNODE_NOT_FOUND
 #include "scripting/ScriptingHost.h"
 #include "scripting/JSConversions.h"