From a865fbddcda3eec4b9745dd54c58512a280ade60 Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:05:48 -0700
Subject: [PATCH 1/7] Move `MapCoordinate` to `libOPHD`

Search and replace for header includes:
`#include "(.*)MapCoordinate.h"`
`#include <libOPHD/Map/MapCoordinate.h>`

Followed by manually moving the includes to the appropriate section.
---
 appOPHD/GraphWalker.cpp                    | 3 ++-
 appOPHD/Map/MapView.h                      | 3 +--
 appOPHD/Map/Tile.h                         | 3 +--
 appOPHD/States/MapViewState.h              | 4 ++--
 appOPHD/States/MapViewStateHelper.h        | 4 ++--
 appOPHD/States/MapViewStateUi.cpp          | 3 ++-
 appOPHD/UI/NotificationArea.h              | 4 ++--
 appOPHD/appOPHD.vcxproj                    | 2 --
 appOPHD/appOPHD.vcxproj.filters            | 6 ------
 {appOPHD => libOPHD}/Map/MapCoordinate.cpp | 2 +-
 {appOPHD => libOPHD}/Map/MapCoordinate.h   | 2 +-
 libOPHD/libOPHD.vcxproj                    | 2 ++
 libOPHD/libOPHD.vcxproj.filters            | 6 ++++++
 13 files changed, 22 insertions(+), 22 deletions(-)
 rename {appOPHD => libOPHD}/Map/MapCoordinate.cpp (89%)
 rename {appOPHD => libOPHD}/Map/MapCoordinate.h (87%)

diff --git a/appOPHD/GraphWalker.cpp b/appOPHD/GraphWalker.cpp
index 8a3c0fcbb..110e5b48b 100644
--- a/appOPHD/GraphWalker.cpp
+++ b/appOPHD/GraphWalker.cpp
@@ -1,12 +1,13 @@
 #include "GraphWalker.h"
 
-#include "Map/MapCoordinate.h"
 #include "Map/TileMap.h"
 #include "MapObjects/Structure.h"
 
 #include <libOPHD/DirectionOffset.h>
 #include <libOPHD/EnumDirection.h>
 
+#include <libOPHD/Map/MapCoordinate.h>
+
 
 using namespace NAS2D;
 
diff --git a/appOPHD/Map/MapView.h b/appOPHD/Map/MapView.h
index 1974f92f8..5ff0a1eec 100644
--- a/appOPHD/Map/MapView.h
+++ b/appOPHD/Map/MapView.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "../Map/MapCoordinate.h"
-
+#include <libOPHD/Map/MapCoordinate.h>
 #include <libOPHD/Map/MapOffset.h>
 
 #include <NAS2D/Math/Rectangle.h>
diff --git a/appOPHD/Map/Tile.h b/appOPHD/Map/Tile.h
index 5cedb3445..d5395b4f9 100644
--- a/appOPHD/Map/Tile.h
+++ b/appOPHD/Map/Tile.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "MapCoordinate.h"
-
 #include <libOPHD/EnumTerrainType.h>
+#include <libOPHD/Map/MapCoordinate.h>
 
 #include <NAS2D/Math/Point.h>
 #include <NAS2D/Math/Vector.h>
diff --git a/appOPHD/States/MapViewState.h b/appOPHD/States/MapViewState.h
index b92b4d93b..fa3bc1d11 100644
--- a/appOPHD/States/MapViewState.h
+++ b/appOPHD/States/MapViewState.h
@@ -12,8 +12,6 @@
 
 #include "../Constants/Numbers.h"
 
-#include "../Map/MapCoordinate.h"
-
 #include "../MapObjects/Robot.h"
 #include "../MapObjects/Structure.h"
 
@@ -38,6 +36,8 @@
 #include "../UI/MiniMap.h"
 #include "../UI/CheatMenu.h"
 
+#include <libOPHD/Map/MapCoordinate.h>
+
 #include <libOPHD/Population/PopulationPool.h>
 #include <libOPHD/Population/Population.h>
 #include <libOPHD/Population/Morale.h>
diff --git a/appOPHD/States/MapViewStateHelper.h b/appOPHD/States/MapViewStateHelper.h
index 3c385aea1..5060c9693 100644
--- a/appOPHD/States/MapViewStateHelper.h
+++ b/appOPHD/States/MapViewStateHelper.h
@@ -9,12 +9,12 @@
 
 #pragma once
 
-#include "../Map/MapCoordinate.h"
-
 #include <libOPHD/EnumConnectorDir.h>
 #include <libOPHD/EnumProductType.h>
 #include <libOPHD/EnumStructureID.h>
 
+#include <libOPHD/Map/MapCoordinate.h>
+
 #include <map>
 
 
diff --git a/appOPHD/States/MapViewStateUi.cpp b/appOPHD/States/MapViewStateUi.cpp
index 6470ac6fe..43340e39d 100644
--- a/appOPHD/States/MapViewStateUi.cpp
+++ b/appOPHD/States/MapViewStateUi.cpp
@@ -15,7 +15,6 @@
 #include "../PointerType.h"
 #include "../StructureCatalogue.h"
 #include "../StructureManager.h"
-#include "../Map/MapCoordinate.h"
 #include "../Map/TileMap.h"
 #include "../Map/MapView.h"
 
@@ -26,6 +25,8 @@
 #include <libOPHD/DirectionOffset.h>
 #include <libOPHD/EnumDirection.h>
 
+#include <libOPHD/Map/MapCoordinate.h>
+
 #include <NAS2D/Utility.h>
 #include <NAS2D/Renderer/Renderer.h>
 
diff --git a/appOPHD/UI/NotificationArea.h b/appOPHD/UI/NotificationArea.h
index e4e5f857e..1350b8617 100644
--- a/appOPHD/UI/NotificationArea.h
+++ b/appOPHD/UI/NotificationArea.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <libControls/Control.h>
+#include <libOPHD/Map/MapCoordinate.h>
 
-#include "../Map/MapCoordinate.h"
+#include <libControls/Control.h>
 
 #include <NAS2D/EventHandler.h>
 #include <NAS2D/Math/Point.h>
diff --git a/appOPHD/appOPHD.vcxproj b/appOPHD/appOPHD.vcxproj
index f29b04375..5bd80bbe6 100644
--- a/appOPHD/appOPHD.vcxproj
+++ b/appOPHD/appOPHD.vcxproj
@@ -186,7 +186,6 @@
     <ClCompile Include="GraphWalker.cpp" />
     <ClCompile Include="IOHelper.cpp" />
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="Map\MapCoordinate.cpp" />
     <ClCompile Include="Map\MapView.cpp" />
     <ClCompile Include="Map\Tile.cpp" />
     <ClCompile Include="Map\TileMap.cpp" />
@@ -278,7 +277,6 @@
     <ClInclude Include="Constants\UiConstants.h" />
     <ClInclude Include="GraphWalker.h" />
     <ClInclude Include="IOHelper.h" />
-    <ClInclude Include="Map\MapCoordinate.h" />
     <ClInclude Include="Map\MapView.h" />
     <ClInclude Include="Map\Tile.h" />
     <ClInclude Include="Map\TileMap.h" />
diff --git a/appOPHD/appOPHD.vcxproj.filters b/appOPHD/appOPHD.vcxproj.filters
index 90df88232..ce1f737d3 100644
--- a/appOPHD/appOPHD.vcxproj.filters
+++ b/appOPHD/appOPHD.vcxproj.filters
@@ -87,9 +87,6 @@
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Map\MapCoordinate.cpp">
-      <Filter>Source Files\Map</Filter>
-    </ClCompile>
     <ClCompile Include="Map\MapView.cpp">
       <Filter>Source Files\Map</Filter>
     </ClCompile>
@@ -359,9 +356,6 @@
     <ClInclude Include="IOHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Map\MapCoordinate.h">
-      <Filter>Header Files\Map</Filter>
-    </ClInclude>
     <ClInclude Include="Map\MapView.h">
       <Filter>Header Files\Map</Filter>
     </ClInclude>
diff --git a/appOPHD/Map/MapCoordinate.cpp b/libOPHD/Map/MapCoordinate.cpp
similarity index 89%
rename from appOPHD/Map/MapCoordinate.cpp
rename to libOPHD/Map/MapCoordinate.cpp
index 283bfeaa2..5c262bd4c 100644
--- a/appOPHD/Map/MapCoordinate.cpp
+++ b/libOPHD/Map/MapCoordinate.cpp
@@ -1,7 +1,7 @@
 
 #include "MapCoordinate.h"
 
-#include <libOPHD/DirectionOffset.h>
+#include "../DirectionOffset.h"
 
 
 MapCoordinate MapCoordinate::translate(MapOffset mapOffset) const
diff --git a/appOPHD/Map/MapCoordinate.h b/libOPHD/Map/MapCoordinate.h
similarity index 87%
rename from appOPHD/Map/MapCoordinate.h
rename to libOPHD/Map/MapCoordinate.h
index fdeb25090..1126215ba 100644
--- a/appOPHD/Map/MapCoordinate.h
+++ b/libOPHD/Map/MapCoordinate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <libOPHD/Map/MapOffset.h>
+#include "MapOffset.h"
 
 #include <NAS2D/Math/Point.h>
 
diff --git a/libOPHD/libOPHD.vcxproj b/libOPHD/libOPHD.vcxproj
index ce71dc87a..9cdc2f3ba 100644
--- a/libOPHD/libOPHD.vcxproj
+++ b/libOPHD/libOPHD.vcxproj
@@ -164,6 +164,7 @@
   <ItemGroup>
     <ClCompile Include="DirectionOffset.cpp" />
     <ClCompile Include="libOPHD.cpp" />
+    <ClCompile Include="Map\MapCoordinate.cpp" />
     <ClCompile Include="Population\Morale.cpp" />
     <ClCompile Include="Population\PopulationPool.cpp" />
     <ClCompile Include="Population\Population.cpp" />
@@ -184,6 +185,7 @@
     <ClInclude Include="EnumProductType.h" />
     <ClInclude Include="EnumStructureID.h" />
     <ClInclude Include="EnumTerrainType.h" />
+    <ClInclude Include="Map\MapCoordinate.h" />
     <ClInclude Include="Map\MapOffset.h" />
     <ClInclude Include="RandomNumberGenerator.h" />
     <ClInclude Include="Population\Population.h" />
diff --git a/libOPHD/libOPHD.vcxproj.filters b/libOPHD/libOPHD.vcxproj.filters
index 7c3998ecb..be1e69836 100644
--- a/libOPHD/libOPHD.vcxproj.filters
+++ b/libOPHD/libOPHD.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="libOPHD.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Map\MapCoordinate.cpp">
+      <Filter>Source Files\Map</Filter>
+    </ClCompile>
     <ClCompile Include="Population\PopulationPool.cpp">
       <Filter>Source Files\Population</Filter>
     </ClCompile>
@@ -119,6 +122,9 @@
     <ClInclude Include="XmlSerializer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Map\MapCoordinate.h">
+      <Filter>Header Files\Map</Filter>
+    </ClInclude>
     <ClInclude Include="Map\MapOffset.h">
       <Filter>Header Files\Map</Filter>
     </ClInclude>

From f48ed17bd59aef6e9152ec26ee1d11a0a6ed3e3a Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:07:51 -0700
Subject: [PATCH 2/7] Adjust blank lines for consistency

---
 libOPHD/DirectionOffset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libOPHD/DirectionOffset.cpp b/libOPHD/DirectionOffset.cpp
index 855f1b8d2..5ad5e8f79 100644
--- a/libOPHD/DirectionOffset.cpp
+++ b/libOPHD/DirectionOffset.cpp
@@ -1,10 +1,10 @@
-
 #include "DirectionOffset.h"
 
 #include "EnumDirection.h"
 
 #include <map>
 
+
 namespace
 {
 	const std::map<Direction, NAS2D::Vector<int>> DirectionOffsetTable =

From 9ecae92bff5ea8eeb7cda4de15242f5ea232780c Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:11:29 -0700
Subject: [PATCH 3/7] Remove dummy file `libOPHD.cpp`

This file was just an empty placeholder from when the project was first created and no other source files existed. The project needed at least one source file in order to compile it. The placeholder file is no longer needed now that other source files have been moved to this project.
---
 libOPHD/libOPHD.cpp             | 0
 libOPHD/libOPHD.vcxproj         | 1 -
 libOPHD/libOPHD.vcxproj.filters | 3 ---
 3 files changed, 4 deletions(-)
 delete mode 100644 libOPHD/libOPHD.cpp

diff --git a/libOPHD/libOPHD.cpp b/libOPHD/libOPHD.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/libOPHD/libOPHD.vcxproj b/libOPHD/libOPHD.vcxproj
index 9cdc2f3ba..726f1c831 100644
--- a/libOPHD/libOPHD.vcxproj
+++ b/libOPHD/libOPHD.vcxproj
@@ -163,7 +163,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DirectionOffset.cpp" />
-    <ClCompile Include="libOPHD.cpp" />
     <ClCompile Include="Map\MapCoordinate.cpp" />
     <ClCompile Include="Population\Morale.cpp" />
     <ClCompile Include="Population\PopulationPool.cpp" />
diff --git a/libOPHD/libOPHD.vcxproj.filters b/libOPHD/libOPHD.vcxproj.filters
index be1e69836..7676c2c07 100644
--- a/libOPHD/libOPHD.vcxproj.filters
+++ b/libOPHD/libOPHD.vcxproj.filters
@@ -33,9 +33,6 @@
     <ClCompile Include="DirectionOffset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="libOPHD.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Map\MapCoordinate.cpp">
       <Filter>Source Files\Map</Filter>
     </ClCompile>

From 8809e5fc54a72f3a83bed6f0818cec9698b0c482 Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:17:05 -0700
Subject: [PATCH 4/7] Sort project entries for consistency

---
 libOPHD/libOPHD.vcxproj         | 12 ++++-----
 libOPHD/libOPHD.vcxproj.filters | 46 ++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/libOPHD/libOPHD.vcxproj b/libOPHD/libOPHD.vcxproj
index 726f1c831..796a7e773 100644
--- a/libOPHD/libOPHD.vcxproj
+++ b/libOPHD/libOPHD.vcxproj
@@ -163,14 +163,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DirectionOffset.cpp" />
+    <ClCompile Include="XmlSerializer.cpp" />
     <ClCompile Include="Map\MapCoordinate.cpp" />
     <ClCompile Include="Population\Morale.cpp" />
-    <ClCompile Include="Population\PopulationPool.cpp" />
     <ClCompile Include="Population\Population.cpp" />
+    <ClCompile Include="Population\PopulationPool.cpp" />
     <ClCompile Include="Population\PopulationTable.cpp" />
     <ClCompile Include="Technology\ResearchTracker.cpp" />
     <ClCompile Include="Technology\TechnologyCatalog.cpp" />
-    <ClCompile Include="XmlSerializer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DirectionOffset.h" />
@@ -184,17 +184,17 @@
     <ClInclude Include="EnumProductType.h" />
     <ClInclude Include="EnumStructureID.h" />
     <ClInclude Include="EnumTerrainType.h" />
+    <ClInclude Include="RandomNumberGenerator.h" />
+    <ClInclude Include="XmlSerializer.h" />
     <ClInclude Include="Map\MapCoordinate.h" />
     <ClInclude Include="Map\MapOffset.h" />
-    <ClInclude Include="RandomNumberGenerator.h" />
-    <ClInclude Include="Population\Population.h" />
-    <ClInclude Include="Population\PopulationTable.h" />
     <ClInclude Include="Population\Morale.h" />
+    <ClInclude Include="Population\Population.h" />
     <ClInclude Include="Population\PopulationPool.h" />
+    <ClInclude Include="Population\PopulationTable.h" />
     <ClInclude Include="Technology\ResearchTracker.h" />
     <ClInclude Include="Technology\Technology.h" />
     <ClInclude Include="Technology\TechnologyCatalog.h" />
-    <ClInclude Include="XmlSerializer.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\nas2d-core\NAS2D\NAS2D.vcxproj">
diff --git a/libOPHD/libOPHD.vcxproj.filters b/libOPHD/libOPHD.vcxproj.filters
index 7676c2c07..67b28c368 100644
--- a/libOPHD/libOPHD.vcxproj.filters
+++ b/libOPHD/libOPHD.vcxproj.filters
@@ -33,29 +33,29 @@
     <ClCompile Include="DirectionOffset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="XmlSerializer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="Map\MapCoordinate.cpp">
       <Filter>Source Files\Map</Filter>
     </ClCompile>
-    <ClCompile Include="Population\PopulationPool.cpp">
-      <Filter>Source Files\Population</Filter>
+    <ClCompile Include="Population\Morale.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Population\Population.cpp">
       <Filter>Source Files\Population</Filter>
     </ClCompile>
-    <ClCompile Include="Population\PopulationTable.cpp">
+    <ClCompile Include="Population\PopulationPool.cpp">
       <Filter>Source Files\Population</Filter>
     </ClCompile>
-    <ClCompile Include="Technology\TechnologyCatalog.cpp">
-      <Filter>Source Files\Technology</Filter>
+    <ClCompile Include="Population\PopulationTable.cpp">
+      <Filter>Source Files\Population</Filter>
     </ClCompile>
     <ClCompile Include="Technology\ResearchTracker.cpp">
       <Filter>Source Files\Technology</Filter>
     </ClCompile>
-    <ClCompile Include="XmlSerializer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Population\Morale.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Technology\TechnologyCatalog.cpp">
+      <Filter>Source Files\Technology</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -95,18 +95,27 @@
     <ClInclude Include="RandomNumberGenerator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Population\Population.h">
-      <Filter>Header Files\Population</Filter>
+    <ClInclude Include="XmlSerializer.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Population\PopulationTable.h">
-      <Filter>Header Files\Population</Filter>
+    <ClInclude Include="Map\MapCoordinate.h">
+      <Filter>Header Files\Map</Filter>
+    </ClInclude>
+    <ClInclude Include="Map\MapOffset.h">
+      <Filter>Header Files\Map</Filter>
     </ClInclude>
     <ClInclude Include="Population\Morale.h">
       <Filter>Header Files\Population</Filter>
     </ClInclude>
+    <ClInclude Include="Population\Population.h">
+      <Filter>Header Files\Population</Filter>
+    </ClInclude>
     <ClInclude Include="Population\PopulationPool.h">
       <Filter>Header Files\Population</Filter>
     </ClInclude>
+    <ClInclude Include="Population\PopulationTable.h">
+      <Filter>Header Files\Population</Filter>
+    </ClInclude>
     <ClInclude Include="Technology\ResearchTracker.h">
       <Filter>Header Files\Technology</Filter>
     </ClInclude>
@@ -116,15 +125,6 @@
     <ClInclude Include="Technology\TechnologyCatalog.h">
       <Filter>Header Files\Technology</Filter>
     </ClInclude>
-    <ClInclude Include="XmlSerializer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Map\MapCoordinate.h">
-      <Filter>Header Files\Map</Filter>
-    </ClInclude>
-    <ClInclude Include="Map\MapOffset.h">
-      <Filter>Header Files\Map</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\.clang-format" />

From 88ec069bee280aee462bc0a4f53410b6582db25e Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:23:09 -0700
Subject: [PATCH 5/7] Sort project file filters for consistency

---
 appOPHD/appOPHD.vcxproj.filters | 64 ++++++++++++++++-----------------
 libOPHD/libOPHD.vcxproj.filters | 12 +++----
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/appOPHD/appOPHD.vcxproj.filters b/appOPHD/appOPHD.vcxproj.filters
index ce1f737d3..3b765cba4 100644
--- a/appOPHD/appOPHD.vcxproj.filters
+++ b/appOPHD/appOPHD.vcxproj.filters
@@ -5,8 +5,16 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Source Files\States">
-      <UniqueIdentifier>{4c338eac-6a16-447d-9675-0fb6f6775bda}</UniqueIdentifier>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Map">
+      <UniqueIdentifier>{8013e5ff-baf7-4499-bff7-a7e38570a994}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\MapObjects">
       <UniqueIdentifier>{52eb17f3-c971-4ead-bf0c-5c4e384abc52}</UniqueIdentifier>
@@ -17,18 +25,29 @@
     <Filter Include="Source Files\MapObjects\Structures">
       <UniqueIdentifier>{4ed844e6-1ccb-4e6f-887c-381f36561c0e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\MicroPather">
+      <UniqueIdentifier>{53d69791-75af-4014-99df-f2d2582597ca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\States">
+      <UniqueIdentifier>{4c338eac-6a16-447d-9675-0fb6f6775bda}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Source Files\UI">
       <UniqueIdentifier>{53be18b8-eaba-46f1-98d9-72eaaeb9c314}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\UI\Core">
       <UniqueIdentifier>{a106ce63-62be-4ae0-956c-53b458bed822}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    <Filter Include="Source Files\UI\Reports">
+      <UniqueIdentifier>{463384e6-546b-4f3c-adda-f9c094bc326e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\States">
-      <UniqueIdentifier>{402a383d-3f20-4883-b636-09f71bc952da}</UniqueIdentifier>
+    <Filter Include="Source Files\UI\SpecializedListBox">
+      <UniqueIdentifier>{cd5e28df-9593-4566-86b8-d6e3a5c24335}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Constants">
+      <UniqueIdentifier>{df1a7586-89dd-467f-b703-58d0b820cd47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Map">
+      <UniqueIdentifier>{ef0f2f7d-e0aa-47f6-a564-6a2de9a2cef2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\MapObjects">
       <UniqueIdentifier>{f1567006-6b53-4e9f-a038-9e5e9d444cb3}</UniqueIdentifier>
@@ -39,43 +58,24 @@
     <Filter Include="Header Files\MapObjects\Structures">
       <UniqueIdentifier>{1d0c1304-94ea-4f94-b1e6-439408414946}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\MicroPather">
+      <UniqueIdentifier>{2edfd0b6-d405-4d57-954e-054f9de7cf34}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\States">
+      <UniqueIdentifier>{402a383d-3f20-4883-b636-09f71bc952da}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Header Files\UI">
       <UniqueIdentifier>{7554b729-89ba-4834-bcb5-d29c59f0d91a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\UI\Core">
       <UniqueIdentifier>{50739b22-ad40-4252-9c5d-4fd92dfa3be7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Constants">
-      <UniqueIdentifier>{df1a7586-89dd-467f-b703-58d0b820cd47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Map">
-      <UniqueIdentifier>{ef0f2f7d-e0aa-47f6-a564-6a2de9a2cef2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Map">
-      <UniqueIdentifier>{8013e5ff-baf7-4499-bff7-a7e38570a994}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\UI\Reports">
       <UniqueIdentifier>{a44c6715-e1af-4914-a179-42b503304355}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\UI\Reports">
-      <UniqueIdentifier>{463384e6-546b-4f3c-adda-f9c094bc326e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\UI\SpecializedListBox">
-      <UniqueIdentifier>{cd5e28df-9593-4566-86b8-d6e3a5c24335}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\UI\SpecializedListBox">
       <UniqueIdentifier>{cb143db0-8f9f-4ca0-b688-47c9e12cce98}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\MicroPather">
-      <UniqueIdentifier>{2edfd0b6-d405-4d57-954e-054f9de7cf34}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\MicroPather">
-      <UniqueIdentifier>{53d69791-75af-4014-99df-f2d2582597ca}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="GraphWalker.cpp">
diff --git a/libOPHD/libOPHD.vcxproj.filters b/libOPHD/libOPHD.vcxproj.filters
index 67b28c368..71869c8c8 100644
--- a/libOPHD/libOPHD.vcxproj.filters
+++ b/libOPHD/libOPHD.vcxproj.filters
@@ -13,21 +13,21 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\Population">
-      <UniqueIdentifier>{964e7130-2144-43ab-a0c0-ff1f199d1c15}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Population">
       <UniqueIdentifier>{d903cae4-8bc6-462c-afb0-c731298b8840}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Technology">
-      <UniqueIdentifier>{9d60dddd-887a-4c9d-9a55-97884aedd298}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Technology">
       <UniqueIdentifier>{f03fdd93-09f6-4050-a5df-18305b27811d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\Map">
       <UniqueIdentifier>{402a7397-db9d-4c85-9cde-d12b218e5932}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\Population">
+      <UniqueIdentifier>{964e7130-2144-43ab-a0c0-ff1f199d1c15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Technology">
+      <UniqueIdentifier>{9d60dddd-887a-4c9d-9a55-97884aedd298}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DirectionOffset.cpp">

From 38b8efd71b071e38985b4558f402788b453271b6 Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:27:57 -0700
Subject: [PATCH 6/7] Remove obsolete filter for `UI\Core`

---
 appOPHD/appOPHD.vcxproj.filters | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/appOPHD/appOPHD.vcxproj.filters b/appOPHD/appOPHD.vcxproj.filters
index 3b765cba4..debd710bc 100644
--- a/appOPHD/appOPHD.vcxproj.filters
+++ b/appOPHD/appOPHD.vcxproj.filters
@@ -34,9 +34,6 @@
     <Filter Include="Source Files\UI">
       <UniqueIdentifier>{53be18b8-eaba-46f1-98d9-72eaaeb9c314}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\UI\Core">
-      <UniqueIdentifier>{a106ce63-62be-4ae0-956c-53b458bed822}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\UI\Reports">
       <UniqueIdentifier>{463384e6-546b-4f3c-adda-f9c094bc326e}</UniqueIdentifier>
     </Filter>
@@ -67,9 +64,6 @@
     <Filter Include="Header Files\UI">
       <UniqueIdentifier>{7554b729-89ba-4834-bcb5-d29c59f0d91a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\UI\Core">
-      <UniqueIdentifier>{50739b22-ad40-4252-9c5d-4fd92dfa3be7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\UI\Reports">
       <UniqueIdentifier>{a44c6715-e1af-4914-a179-42b503304355}</UniqueIdentifier>
     </Filter>

From d98c447bae827e63203a30a3662d5fb91831a123 Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 3 Feb 2025 13:28:19 -0700
Subject: [PATCH 7/7] Add missing filter for source files in `Map\`

Re-use the GUID from the removed `UI\Core` filter from `appOPHD`.
---
 libOPHD/libOPHD.vcxproj.filters | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libOPHD/libOPHD.vcxproj.filters b/libOPHD/libOPHD.vcxproj.filters
index 71869c8c8..74b33e6a6 100644
--- a/libOPHD/libOPHD.vcxproj.filters
+++ b/libOPHD/libOPHD.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Source Files\Map">
+      <UniqueIdentifier>{a106ce63-62be-4ae0-956c-53b458bed822}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Source Files\Population">
       <UniqueIdentifier>{d903cae4-8bc6-462c-afb0-c731298b8840}</UniqueIdentifier>
     </Filter>