diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index b7c8d2f8da..d9cf9467ef 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -151,8 +151,8 @@ bundle_exe: all
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
 	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
-	$(Q)cd $(ROOT_DIR)/os/win32/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
-	$(Q)mv $(ROOT_DIR)/os/win32/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
+	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
+	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
 
 ifdef OSXAPP
 install:
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 566353e7bb..a9d20174d9 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -735,10 +735,6 @@
 				RelativePath=".\..\src\tgp.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\thread_win32.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tile_map.cpp"
 				>
@@ -1503,10 +1499,6 @@
 				RelativePath=".\..\src\tgp.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\thread.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tile_cmd.h"
 				>
@@ -3580,6 +3572,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Threading"
+			>
+			<File
+				RelativePath=".\..\src\thread\thread.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\thread\thread_win32.cpp"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="64-bit Specific Files"
 			Filter="asm"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 310bc574ee..9bf2eaeb68 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -732,10 +732,6 @@
 				RelativePath=".\..\src\tgp.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\thread_win32.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tile_map.cpp"
 				>
@@ -1500,10 +1496,6 @@
 				RelativePath=".\..\src\tgp.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\thread.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tile_cmd.h"
 				>
@@ -3577,6 +3569,18 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Threading"
+			>
+			<File
+				RelativePath=".\..\src\thread\thread.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\thread\thread_win32.cpp"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="64-bit Specific Files"
 			Filter="asm"
diff --git a/source.list b/source.list
index 03186c07d4..3dafee29f0 100644
--- a/source.list
+++ b/source.list
@@ -76,23 +76,6 @@ strings.cpp
 subsidy.cpp
 texteff.cpp
 tgp.cpp
-#if HAVE_THREAD
-	#if WIN32
-		thread_win32.cpp
-	#else
-		#if OS2
-			thread_os2.cpp
-		#else
-			#if MORPHOS
-				thread_morphos.cpp
-			#else
-				thread_pthread.cpp
-			#end
-		#end
-	#end
-#else
-	thread_none.cpp
-#end
 tile_map.cpp
 #if WIN32
 #else
@@ -304,7 +287,6 @@ terraform_gui.h
 textbuf_gui.h
 texteff.hpp
 tgp.h
-thread.h
 tile_cmd.h
 tile_type.h
 tilehighlight_func.h
@@ -940,3 +922,23 @@ sound/null_s.cpp
 		os/macosx/splash.cpp
 	#end
 #end
+
+# Threading
+thread/thread.h
+#if HAVE_THREAD
+	#if WIN32
+		thread/thread_win32.cpp
+	#else
+		#if OS2
+			thread/thread_os2.cpp
+		#else
+			#if MORPHOS
+				thread/thread_morphos.cpp
+			#else
+				thread/thread_pthread.cpp
+			#end
+		#end
+	#end
+#else
+	thread/thread_none.cpp
+#end
diff --git a/src/genworld.cpp b/src/genworld.cpp
index b7ca107fb6..1018cac29d 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -14,7 +14,7 @@
 #include "landscape.h"
 #include "company_func.h"
 #include "variables.h"
-#include "thread.h"
+#include "thread/thread.h"
 #include "command_func.h"
 #include "genworld.h"
 #include "gfxinit.h"
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 6e386cf86d..76447ca70d 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -32,7 +32,7 @@
 #include "landscape_type.h"
 #include "querystring_gui.h"
 #include "town.h"
-#include "thread.h"
+#include "thread/thread.h"
 #include "settings_func.h"
 
 #include "table/strings.h"
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 0662c18c5a..8d0add6777 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -26,7 +26,7 @@
 #include "landscape_type.h"
 #include "network/network_func.h"
 #include "core/smallvec_type.hpp"
-#include "thread.h"
+#include "thread/thread.h"
 #include "window_func.h"
 
 #include "table/palettes.h"
diff --git a/src/network/core/tcp_connect.cpp b/src/network/core/tcp_connect.cpp
index bfc642c4b0..5d5d2febad 100644
--- a/src/network/core/tcp_connect.cpp
+++ b/src/network/core/tcp_connect.cpp
@@ -16,7 +16,7 @@
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../core/smallvec_type.hpp"
-#include "../../thread.h"
+#include "../../thread/thread.h"
 
 #include "tcp.h"
 
diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp
index a3f7244872..b751fba343 100644
--- a/src/network/network_gamelist.cpp
+++ b/src/network/network_gamelist.cpp
@@ -17,7 +17,7 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../core/alloc_func.hpp"
-#include "../thread.h"
+#include "../thread/thread.h"
 #include "../string_func.h"
 #include "network_internal.h"
 #include "network_udp.h"
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index de11b6cb7c..7785f635bb 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -28,7 +28,7 @@
 #include "../string_func.h"
 #include "../company_base.h"
 #include "../settings_type.h"
-#include "../thread.h"
+#include "../thread/thread.h"
 #include "../rev.h"
 
 #include "core/udp.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index a99a735ec6..a46a7a734c 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -60,7 +60,7 @@
 #include "elrail_func.h"
 #include "rev.h"
 #include "highscore.h"
-#include "thread.h"
+#include "thread/thread.h"
 #include "station_base.h"
 
 #include "newgrf_commons.h"
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 71e8b803f4..65a1d2e8ea 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -24,7 +24,7 @@
 #include "../openttd.h"
 #include "../debug.h"
 #include "../station_base.h"
-#include "../thread.h"
+#include "../thread/thread.h"
 #include "../town.h"
 #include "../network/network.h"
 #include "../variables.h"
diff --git a/src/thread.h b/src/thread/thread.h
similarity index 100%
rename from src/thread.h
rename to src/thread/thread.h
diff --git a/src/thread_morphos.cpp b/src/thread/thread_morphos.cpp
similarity index 98%
rename from src/thread_morphos.cpp
rename to src/thread/thread_morphos.cpp
index 5248a7837b..abf2cf0ccc 100644
--- a/src/thread_morphos.cpp
+++ b/src/thread/thread_morphos.cpp
@@ -9,10 +9,10 @@
 
 /** @file thread_morphos.cpp MorphOS implementation of Threads. */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "thread.h"
-#include "debug.h"
-#include "core/alloc_func.hpp"
+#include "../debug.h"
+#include "../core/alloc_func.hpp"
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/src/thread_none.cpp b/src/thread/thread_none.cpp
similarity index 98%
rename from src/thread_none.cpp
rename to src/thread/thread_none.cpp
index 1893aebd2d..861f2cfd6d 100644
--- a/src/thread_none.cpp
+++ b/src/thread/thread_none.cpp
@@ -9,7 +9,7 @@
 
 /** @file thread_none.cpp No-Threads-Available implementation of Threads */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "thread.h"
 
 /* static */ bool ThreadObject::New(OTTDThreadFunc proc, void *param, ThreadObject **thread)
diff --git a/src/thread_os2.cpp b/src/thread/thread_os2.cpp
similarity index 99%
rename from src/thread_os2.cpp
rename to src/thread/thread_os2.cpp
index 18122fe153..1145e8e414 100644
--- a/src/thread_os2.cpp
+++ b/src/thread/thread_os2.cpp
@@ -9,7 +9,7 @@
 
 /** @file thread_os2.cpp OS/2 implementation of Threads. */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "thread.h"
 
 #define INCL_DOS
diff --git a/src/thread_pthread.cpp b/src/thread/thread_pthread.cpp
similarity index 99%
rename from src/thread_pthread.cpp
rename to src/thread/thread_pthread.cpp
index 9edfd4e142..483b71c0f3 100644
--- a/src/thread_pthread.cpp
+++ b/src/thread/thread_pthread.cpp
@@ -9,7 +9,7 @@
 
 /** @file thread_pthread.cpp POSIX pthread implementation of Threads. */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "thread.h"
 #include <pthread.h>
 
diff --git a/src/thread_win32.cpp b/src/thread/thread_win32.cpp
similarity index 97%
rename from src/thread_win32.cpp
rename to src/thread/thread_win32.cpp
index 8b1d11544b..e752de1aef 100644
--- a/src/thread_win32.cpp
+++ b/src/thread/thread_win32.cpp
@@ -9,10 +9,10 @@
 
 /** @file thread_win32.cpp Win32 thread implementation of Threads. */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "thread.h"
-#include "debug.h"
-#include "core/alloc_func.hpp"
+#include "../debug.h"
+#include "../core/alloc_func.hpp"
 #include <stdlib.h>
 #include <windows.h>
 #include <process.h>