diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
index ded005ee13..b86376c874 100644
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
@@ -1000,37 +1000,41 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="YAPF"
+			Name="Misc"
 			Filter="">
 			<File
-				RelativePath=".\..\src\yapf\array.hpp">
+				RelativePath=".\..\src\misc\array.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\autocopyptr.hpp">
+				RelativePath=".\..\src\misc\autocopyptr.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\binaryheap.hpp">
+				RelativePath=".\..\src\misc\binaryheap.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\blob.hpp">
+				RelativePath=".\..\src\misc\blob.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\countedptr.hpp">
+				RelativePath=".\..\src\misc\countedptr.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\crc32.hpp">
+				RelativePath=".\..\src\misc\crc32.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\fixedsizearray.hpp">
+				RelativePath=".\..\src\misc\fixedsizearray.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\follow_track.cpp">
+				RelativePath=".\..\src\misc\hashtable.hpp">
 			</File>
+		</Filter>
+		<Filter
+			Name="YAPF"
+			Filter="">
 			<File
-				RelativePath=".\..\src\yapf\follow_track.hpp">
+				RelativePath=".\..\src\yapf\follow_track.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\hashtable.hpp">
+				RelativePath=".\..\src\yapf\follow_track.hpp">
 			</File>
 			<File
 				RelativePath=".\..\src\yapf\nodelist.hpp">
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 580613e96d..d7a2064083 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1283,37 +1283,41 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="YAPF"
+			Name="Misc"
 			Filter="">
 			<File
-				RelativePath=".\..\src\yapf\array.hpp">
+				RelativePath=".\..\src\misc\array.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\autocopyptr.hpp">
+				RelativePath=".\..\src\misc\autocopyptr.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\binaryheap.hpp">
+				RelativePath=".\..\src\misc\binaryheap.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\blob.hpp">
+				RelativePath=".\..\src\misc\blob.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\countedptr.hpp">
+				RelativePath=".\..\src\misc\countedptr.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\crc32.hpp">
+				RelativePath=".\..\src\misc\crc32.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\fixedsizearray.hpp">
+				RelativePath=".\..\src\misc\fixedsizearray.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\follow_track.cpp">
+				RelativePath=".\..\src\misc\hashtable.hpp">
 			</File>
+		</Filter>
+		<Filter
+			Name="YAPF"
+			Filter="">
 			<File
-				RelativePath=".\..\src\yapf\follow_track.hpp">
+				RelativePath=".\..\src\yapf\follow_track.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\hashtable.hpp">
+				RelativePath=".\..\src\yapf\follow_track.hpp">
 			</File>
 			<File
 				RelativePath=".\..\src\yapf\nodelist.hpp">
diff --git a/source.list b/source.list
index ec563a8577..e7247a7b8c 100644
--- a/source.list
+++ b/source.list
@@ -298,17 +298,19 @@ unmovable_map.h
 void_map.h
 water_map.h
 
+# Misc
+misc/array.hpp
+misc/autocopyptr.hpp
+misc/binaryheap.hpp
+misc/blob.hpp
+misc/countedptr.hpp
+misc/crc32.hpp
+misc/fixedsizearray.hpp
+misc/hashtable.hpp
+
 # YAPF
-yapf/array.hpp
-yapf/autocopyptr.hpp
-yapf/binaryheap.hpp
-yapf/blob.hpp
-yapf/countedptr.hpp
-yapf/crc32.hpp
-yapf/fixedsizearray.hpp
 yapf/follow_track.cpp
 yapf/follow_track.hpp
-yapf/hashtable.hpp
 yapf/nodelist.hpp
 yapf/track_dir.hpp
 yapf/yapf.h