diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -472,10 +472,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\aystar.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
@@ -640,10 +636,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\npf.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\openttd.cpp"
 				>
 			</File>
@@ -652,18 +644,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfind.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\queue.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\rail.cpp"
 				>
 			</File>
@@ -808,10 +792,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\aystar.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\base_media_base.h"
 				>
 			</File>
@@ -1256,10 +1236,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\npf.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\music\null_m.h"
 				>
 			</File>
@@ -1288,10 +1264,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfind.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\pbs.h"
 				>
 			</File>
@@ -1300,10 +1272,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\queue.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\rail.h"
 				>
 			</File>
@@ -3481,70 +3449,118 @@
 			</File>
 		</Filter>
 		<Filter
+			Name="Pathfinder"
+			>
+			<File
+				RelativePath=".\..\src\pathfinder\opf\opf_ship.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\opf\opf_ship.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\pathfinder_func.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="NPF"
+			>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\aystar.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\aystar.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\queue.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\npf.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\npf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\npf_func.h"
+				>
+			</File>
+		</Filter>
+		<Filter
 			Name="YAPF"
 			>
 			<File
-				RelativePath=".\..\src\yapf\follow_track.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\nodelist.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_base.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_common.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_costbase.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_costcache.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_costrail.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_destrail.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_node.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_node_road.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_rail.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_road.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\yapf\yapf_ship.cpp"
+				RelativePath=".\..\src\pathfinder\yapf\follow_track.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\nodelist.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_costbase.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_costcache.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_costrail.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_destrail.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_node.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_node_rail.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_node_road.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_rail.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_road.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
 				>
 			</File>
 		</Filter>