diff --git a/build/premake/premake.lua b/build/premake/premake.lua
index e285a8827f..1028583fa0 100755
--- a/build/premake/premake.lua
+++ b/build/premake/premake.lua
@@ -399,6 +399,7 @@ function setup_all_libs ()
 		"lib/sysdep/ia32",
 		"lib/res",
 		"lib/res/file",
+		"lib/res/file/archive",
 		"lib/res/graphics",
 		"lib/res/sound",
 		"lib/external_libraries"
diff --git a/source/lib/res/file/archive.cpp b/source/lib/res/file/archive/archive.cpp
similarity index 99%
rename from source/lib/res/file/archive.cpp
rename to source/lib/res/file/archive/archive.cpp
index c5fb109f04..e4e011efbf 100644
--- a/source/lib/res/file/archive.cpp
+++ b/source/lib/res/file/archive/archive.cpp
@@ -15,7 +15,7 @@
 #include "lib/timer.h"
 #include "lib/allocators.h"
 #include "lib/res/res.h"
-#include "file_internal.h"
+#include "../file_internal.h"
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/source/lib/res/file/archive.h b/source/lib/res/file/archive/archive.h
similarity index 97%
rename from source/lib/res/file/archive.h
rename to source/lib/res/file/archive/archive.h
index 1a6c485ebb..c6dafc6a30 100644
--- a/source/lib/res/file/archive.h
+++ b/source/lib/res/file/archive/archive.h
@@ -13,7 +13,7 @@
 #define INCLUDED_ARCHIVE
 
 #include "lib/res/handle.h"
-#include "file.h"			// FileCB for afile_enum
+#include "../file.h"			// FileCB for afile_enum
 #include "compression.h"	// CompressionMethod
 
 namespace ERR
@@ -114,7 +114,7 @@ extern ssize_t afile_read(File* f, off_t ofs, size_t size, FileIOBuf* pbuf, File
 // would have to be inflated sequentially, which defeats the point of mapping.
 
 
-// map the entire file <zf> into memory. mapping compressed files
+// map the entire file <f> into memory. mapping compressed files
 // isn't allowed, since the compression algorithm is unspecified.
 // output parameters are zeroed on failure.
 //
@@ -123,7 +123,7 @@ extern ssize_t afile_read(File* f, off_t ofs, size_t size, FileIOBuf* pbuf, File
 // may be removed when no longer needed.
 extern LibError afile_map(File* f, u8*& p, size_t& size);
 
-// remove the mapping of file <zf>; fail if not mapped.
+// remove the mapping of file <f>; fail if not mapped.
 //
 // the mapping will be removed (if still open) when its archive is closed.
 // however, map/unmap calls should be paired so that the archive mapping
diff --git a/source/lib/res/file/archive_builder.cpp b/source/lib/res/file/archive/archive_builder.cpp
similarity index 95%
rename from source/lib/res/file/archive_builder.cpp
rename to source/lib/res/file/archive/archive_builder.cpp
index 8e520116d4..bd7828e817 100644
--- a/source/lib/res/file/archive_builder.cpp
+++ b/source/lib/res/file/archive/archive_builder.cpp
@@ -12,7 +12,7 @@
 #include "archive_builder.h"
 
 #include "lib/timer.h"
-#include "file_internal.h"
+#include "../file_internal.h"
 
 // un-nice dependencies:
 #include "ps/Loader.h"
diff --git a/source/lib/res/file/archive_builder.h b/source/lib/res/file/archive/archive_builder.h
similarity index 100%
rename from source/lib/res/file/archive_builder.h
rename to source/lib/res/file/archive/archive_builder.h
diff --git a/source/lib/res/file/compression.cpp b/source/lib/res/file/archive/compression.cpp
similarity index 99%
rename from source/lib/res/file/compression.cpp
rename to source/lib/res/file/archive/compression.cpp
index 71abdb3c5a..aad24a4f4b 100644
--- a/source/lib/res/file/compression.cpp
+++ b/source/lib/res/file/archive/compression.cpp
@@ -17,7 +17,7 @@
 #include "lib/res/mem.h"
 #include "lib/allocators.h"
 #include "lib/timer.h"
-#include "file_io.h"	// IO_EOF
+#include "../file_io.h"	// IO_EOF
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/source/lib/res/file/compression.h b/source/lib/res/file/archive/compression.h
similarity index 98%
rename from source/lib/res/file/compression.h
rename to source/lib/res/file/archive/compression.h
index 3f83d8d1e3..b243dfcbf5 100644
--- a/source/lib/res/file/compression.h
+++ b/source/lib/res/file/archive/compression.h
@@ -28,7 +28,7 @@ enum CompressionMethod
 {
 	CM_NONE,
 
-	// zlib "deflate" - see RFC 1750, 1751.
+	// zlib "deflate" (RFC 1750, 1751) and Adler32 checksum
 	CM_DEFLATE,
 
 	CM_UNSUPPORTED
diff --git a/source/lib/res/file/tests/test_archive_builder.h b/source/lib/res/file/archive/tests/test_archive_builder.h
similarity index 93%
rename from source/lib/res/file/tests/test_archive_builder.h
rename to source/lib/res/file/archive/tests/test_archive_builder.h
index 9c05c1a2b4..3239072889 100644
--- a/source/lib/res/file/tests/test_archive_builder.h
+++ b/source/lib/res/file/archive/tests/test_archive_builder.h
@@ -5,8 +5,8 @@
 #include "lib/res/file/file.h"
 #include "lib/res/file/file_cache.h"
 #include "lib/res/file/vfs.h"
-#include "lib/res/file/archive.h"
-#include "lib/res/file/archive_builder.h"
+#include "lib/res/file/archive/archive.h"
+#include "lib/res/file/archive/archive_builder.h"
 #include "lib/res/h_mgr.h"
 #include "lib/res/mem.h"
 #include "lib/rand.h"
diff --git a/source/lib/res/file/tests/test_compression.h b/source/lib/res/file/archive/tests/test_compression.h
similarity index 94%
rename from source/lib/res/file/tests/test_compression.h
rename to source/lib/res/file/archive/tests/test_compression.h
index 7ddf2a363d..94edea435b 100644
--- a/source/lib/res/file/tests/test_compression.h
+++ b/source/lib/res/file/archive/tests/test_compression.h
@@ -1,7 +1,7 @@
 #include "lib/self_test.h"
 
 #include "lib/self_test.h"
-#include "lib/res/file/compression.h"
+#include "lib/res/file/archive/compression.h"
 
 class TestCompression : public CxxTest::TestSuite 
 {
diff --git a/source/lib/res/file/tests/test_zip.h b/source/lib/res/file/archive/tests/test_zip.h
similarity index 88%
rename from source/lib/res/file/tests/test_zip.h
rename to source/lib/res/file/archive/tests/test_zip.h
index deded5a962..d052434ec4 100644
--- a/source/lib/res/file/tests/test_zip.h
+++ b/source/lib/res/file/archive/tests/test_zip.h
@@ -2,7 +2,7 @@
 
 #include <time.h>
 
-#include "lib/res/file/zip.h"
+#include "lib/res/file/archive/zip.h"
 
 class TestZip : public CxxTest::TestSuite 
 {
diff --git a/source/lib/res/file/trace.cpp b/source/lib/res/file/archive/trace.cpp
similarity index 99%
rename from source/lib/res/file/trace.cpp
rename to source/lib/res/file/archive/trace.cpp
index c6845401d0..9022d15ab4 100644
--- a/source/lib/res/file/trace.cpp
+++ b/source/lib/res/file/archive/trace.cpp
@@ -15,7 +15,7 @@
 #include "lib/allocators.h"
 #include "lib/timer.h"
 #include "lib/sysdep/cpu.h"
-#include "file_internal.h"
+#include "../file_internal.h"
 
 
 ERROR_ASSOCIATE(ERR::TRACE_EMPTY, "No valid entries in trace", -1);
diff --git a/source/lib/res/file/trace.h b/source/lib/res/file/archive/trace.h
similarity index 100%
rename from source/lib/res/file/trace.h
rename to source/lib/res/file/archive/trace.h
diff --git a/source/lib/res/file/zip.cpp b/source/lib/res/file/archive/zip.cpp
similarity index 99%
rename from source/lib/res/file/zip.cpp
rename to source/lib/res/file/archive/zip.cpp
index 6f697d1fe3..0a8ff68862 100644
--- a/source/lib/res/file/zip.cpp
+++ b/source/lib/res/file/archive/zip.cpp
@@ -19,7 +19,7 @@
 #include "lib/allocators.h"
 #include "lib/timer.h"
 #include "lib/res/res.h"
-#include "file_internal.h"
+#include "../file_internal.h"
 
 
 //-----------------------------------------------------------------------------
diff --git a/source/lib/res/file/zip.h b/source/lib/res/file/archive/zip.h
similarity index 100%
rename from source/lib/res/file/zip.h
rename to source/lib/res/file/archive/zip.h