diff --git a/tmp/win32port/zlib/ZLib.vcxproj.user b/tmp/win32port/zlib/ZLib.vcxproj.user
deleted file mode 100644
index 695b5c78..00000000
--- a/tmp/win32port/zlib/ZLib.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/tmp/win32port/zlib/ZLib.vcxproj b/win32port/zlib/ZLib.vcxproj
similarity index 100%
rename from tmp/win32port/zlib/ZLib.vcxproj
rename to win32port/zlib/ZLib.vcxproj
diff --git a/tmp/win32port/zlib/ZLib.vcxproj.filters b/win32port/zlib/ZLib.vcxproj.filters
similarity index 100%
rename from tmp/win32port/zlib/ZLib.vcxproj.filters
rename to win32port/zlib/ZLib.vcxproj.filters
diff --git a/tmp/win32port/zlib/adler32.c b/win32port/zlib/adler32.c
similarity index 100%
rename from tmp/win32port/zlib/adler32.c
rename to win32port/zlib/adler32.c
diff --git a/tmp/win32port/zlib/compress.c b/win32port/zlib/compress.c
similarity index 100%
rename from tmp/win32port/zlib/compress.c
rename to win32port/zlib/compress.c
diff --git a/tmp/win32port/zlib/crc32.c b/win32port/zlib/crc32.c
similarity index 100%
rename from tmp/win32port/zlib/crc32.c
rename to win32port/zlib/crc32.c
diff --git a/tmp/win32port/zlib/crc32.h b/win32port/zlib/crc32.h
similarity index 100%
rename from tmp/win32port/zlib/crc32.h
rename to win32port/zlib/crc32.h
diff --git a/tmp/win32port/zlib/deflate.c b/win32port/zlib/deflate.c
similarity index 100%
rename from tmp/win32port/zlib/deflate.c
rename to win32port/zlib/deflate.c
diff --git a/tmp/win32port/zlib/deflate.h b/win32port/zlib/deflate.h
similarity index 100%
rename from tmp/win32port/zlib/deflate.h
rename to win32port/zlib/deflate.h
diff --git a/tmp/win32port/zlib/gzio.c b/win32port/zlib/gzio.c
similarity index 100%
rename from tmp/win32port/zlib/gzio.c
rename to win32port/zlib/gzio.c
diff --git a/tmp/win32port/zlib/infback.c b/win32port/zlib/infback.c
similarity index 100%
rename from tmp/win32port/zlib/infback.c
rename to win32port/zlib/infback.c
diff --git a/tmp/win32port/zlib/inffast.c b/win32port/zlib/inffast.c
similarity index 100%
rename from tmp/win32port/zlib/inffast.c
rename to win32port/zlib/inffast.c
diff --git a/tmp/win32port/zlib/inffast.h b/win32port/zlib/inffast.h
similarity index 100%
rename from tmp/win32port/zlib/inffast.h
rename to win32port/zlib/inffast.h
diff --git a/tmp/win32port/zlib/inffixed.h b/win32port/zlib/inffixed.h
similarity index 100%
rename from tmp/win32port/zlib/inffixed.h
rename to win32port/zlib/inffixed.h
diff --git a/tmp/win32port/zlib/inflate.c b/win32port/zlib/inflate.c
similarity index 100%
rename from tmp/win32port/zlib/inflate.c
rename to win32port/zlib/inflate.c
diff --git a/tmp/win32port/zlib/inflate.h b/win32port/zlib/inflate.h
similarity index 100%
rename from tmp/win32port/zlib/inflate.h
rename to win32port/zlib/inflate.h
diff --git a/tmp/win32port/zlib/inftrees.c b/win32port/zlib/inftrees.c
similarity index 100%
rename from tmp/win32port/zlib/inftrees.c
rename to win32port/zlib/inftrees.c
diff --git a/tmp/win32port/zlib/inftrees.h b/win32port/zlib/inftrees.h
similarity index 100%
rename from tmp/win32port/zlib/inftrees.h
rename to win32port/zlib/inftrees.h
diff --git a/tmp/win32port/zlib/trees.c b/win32port/zlib/trees.c
similarity index 100%
rename from tmp/win32port/zlib/trees.c
rename to win32port/zlib/trees.c
diff --git a/tmp/win32port/zlib/trees.h b/win32port/zlib/trees.h
similarity index 100%
rename from tmp/win32port/zlib/trees.h
rename to win32port/zlib/trees.h
diff --git a/tmp/win32port/zlib/uncompr.c b/win32port/zlib/uncompr.c
similarity index 100%
rename from tmp/win32port/zlib/uncompr.c
rename to win32port/zlib/uncompr.c
diff --git a/tmp/win32port/zlib/zconf.h b/win32port/zlib/zconf.h
similarity index 100%
rename from tmp/win32port/zlib/zconf.h
rename to win32port/zlib/zconf.h
diff --git a/tmp/win32port/zlib/zlib.h b/win32port/zlib/zlib.h
similarity index 100%
rename from tmp/win32port/zlib/zlib.h
rename to win32port/zlib/zlib.h
diff --git a/tmp/win32port/zlib/zutil.c b/win32port/zlib/zutil.c
similarity index 100%
rename from tmp/win32port/zlib/zutil.c
rename to win32port/zlib/zutil.c
diff --git a/tmp/win32port/zlib/zutil.h b/win32port/zlib/zutil.h
similarity index 100%
rename from tmp/win32port/zlib/zutil.h
rename to win32port/zlib/zutil.h