diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
index 4cf8bc51..5fc9b61b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingTypes.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h
index 7c349d54..dfbfac8d 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingServer.h"
 #include "WingActorComponent.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
index 7a6b47ec..4fa179a7 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingServer.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h
index 154747a6..a65c416c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "Misc/Paths.h"
 #include "Misc/PackageName.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_ContentBrowse.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_ContentBrowse.h
index 9e2815e3..ce04f488 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_ContentBrowse.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_ContentBrowse.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "AssetRegistry/AssetData.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h
index 1e364298..400ad4b4 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "Misc/PackageName.h"
 #include "AssetRegistry/AssetRegistryModule.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_FindReferences.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_FindReferences.h
index a2d90d6d..9ddac884 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_FindReferences.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_FindReferences.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "AssetRegistry/AssetData.h"
 #include "AssetRegistry/IAssetRegistry.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h
index 11dee8d6..2522be76 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "AssetToolsModule.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h
index b5d1ae85..b6dae8fb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "Misc/PackageName.h"
 #include "FileHelpers.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Search.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Search.h
index 897bd894..3672081e 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Search.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Search.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "WingTypes.h"
 #include "AssetRegistry/AssetRegistryModule.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h
index 0ffdf177..1c935568 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingVariables.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h
index c57b749c..0c0b58fe 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Add.h
index 713cc234..f73aeb16 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Add.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Remove.h
index e1f502d8..e1e69f7e 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintInterface_Remove.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingTypes.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Compile.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Compile.h
index 466e2cff..a5b72c66 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Compile.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Compile.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
index 19c333fd..eb36843c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "WingServer.h"
 #include "WingTypes.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Reparent.h
index 7d5a4e01..7cec4e02 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Reparent.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Reparent.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingTypes.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Create_ClassArg.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Create_ClassArg.h
index da03678c..bdec7f89 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Create_ClassArg.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Create_ClassArg.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "Factories/Factory.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingTypes.h"
 #include "WingProperty.h"
 #include "WingFactories.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Create_MaterialInstance.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Create_MaterialInstance.h
index ebb194c2..ad5f40f1 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Create_MaterialInstance.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Create_MaterialInstance.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Materials/Material.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Create_NoArgs.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Create_NoArgs.h
index 8ce3d747..c1f3b12a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Create_NoArgs.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Create_NoArgs.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "Factories/Factory.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFactories.h"
 #include "Factories/BlueprintFunctionLibraryFactory.h"
 #include "Create_NoArgs.generated.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h
index ef19aba6..53165ca3 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h
index e36afb59..1c91f169 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h
index d5d744e9..f572db86 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_SetMany.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_SetMany.h
index 0e823f5b..053b290f 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_SetMany.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_SetMany.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h
index 236967c7..af1db71a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingServer.h"
 #include "WingTypes.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h
index 77171295..86904c26 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingServer.h"
 #include "WingTypes.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h
index 0ef0d836..5541067a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingManual.h"
 #include "Documentation_Manual.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_ListOpenAssets.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_ListOpenAssets.h
index 30c103ec..19ebb9fc 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_ListOpenAssets.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_ListOpenAssets.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "Editor.h"
 #include "Subsystems/AssetEditorSubsystem.h"
 #include "Editor_ListOpenAssets.generated.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h
index 90f0e33a..5a5adff6 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "Editor.h"
 #include "Subsystems/AssetEditorSubsystem.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h
index e52cd54e..9b036325 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h
index e0da26bc..59449ebf 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h
index 3cb47bf3..574f5afb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h
index 67d11056..516524ee 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingToolMenu.h"
 #include "WingServer.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h
index 52cae633..0647763e 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingGraphExport.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h
index 10218044..c9921c8e 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "EdGraph/EdGraphNode.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h
index cda23304..7b1d9208 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingServer.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h
index 981fb526..b34f1c83 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "EdGraph/EdGraphNode.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h
index ef66bc9f..aa6e393d 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingGraphActions.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h
index 2c30939b..ca2bd6ff 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "EdGraph/EdGraphNode.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h
index 844d5c06..5fe3d015 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
-#include "WingPinReference.h"
+#include "WingReferences.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
 #include "EdGraph/EdGraphPin.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h
index 384c1774..e5f7ae8b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h
index 4d093b9f..e17c4544 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingToolMenu.h"
 #include "WingServer.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
index 41342308..e01276cb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
@@ -2,9 +2,9 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingPinReference.h"
+#include "WingReferences.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
index b2927885..4a9ca40b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
@@ -2,9 +2,9 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingPinReference.h"
+#include "WingReferences.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h
index 11fc1891..beecaae4 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h
index 45bcab0e..fab9dc1e 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingParameterEditor.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h
index bfe32698..96ee14ab 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingParameterEditor.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h
index 9d5e1edb..ff550070 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingParameterEditor.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Material_Compile.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Material_Compile.h
index bf7ff3e3..14c2ad37 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Material_Compile.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Material_Compile.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "Materials/Material.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h
index ebe69e9b..4744d60c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingServer.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_Factories.h b/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_Factories.h
index e0154a4b..15bd762c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_Factories.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_Factories.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFactories.h"
 #include "SysInfo_Factories.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_PackageContents.h b/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_PackageContents.h
index 7c1c0d0d..cb063db9 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_PackageContents.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/SysInfo_PackageContents.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "UObject/UObjectHash.h"
 #include "SysInfo_PackageContents.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h b/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h
index 47444048..b9dde991 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingTypes.h"
 #include "EdGraphSchema_K2.h"
 #include "GameFramework/Actor.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h
index 3c4cb280..4315789c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingVariables.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h
index 9cbb6771..35d07aa0 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingVariables.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h
index 58bc2698..12df1448 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingVariables.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h
index 4c626a9c..07db678d 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingVariables.h"
 #include "Variables_Remove.generated.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h
index f313d96e..41e7f312 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingWidgets.h"
 #include "WingUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h
index 084ed924..a6d57abb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WidgetBlueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h
index f5302e30..dbfc32bb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
 #include "WingWidgets.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_SearchTypes.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_SearchTypes.h
index 692b2366..3e68f29d 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_SearchTypes.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_SearchTypes.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingWidgets.h"
 #include "Widget_SearchTypes.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
index 78ade1d9..ef07a273 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
@@ -1,9 +1,9 @@
 #include "WingFetcher.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 #include "WingActorComponent.h"
-#include "WingPinReference.h"
+#include "WingReferences.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphNode.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp
index f9153a76..526b7678 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp
@@ -1,6 +1,6 @@
 #include "WingManual.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingTypes.h"
 
 void WingManual::PrintHandlerPrototype(const FWingHandlerConfig& Handler)
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
index bb9e1264..5ac72908 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
@@ -1,7 +1,8 @@
 #include "WingProperty.h"
 #include "WingActorComponent.h"
 #include "WingUtils.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
+#include "WingReferences.h"
 #include "WingServer.h"
 #include "WingTypes.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingPinReference.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingReferences.cpp
similarity index 95%
rename from Plugins/UEWingman/Source/UEWingman/Private/WingPinReference.cpp
rename to Plugins/UEWingman/Source/UEWingman/Private/WingReferences.cpp
index a9b78352..b207a452 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingPinReference.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingReferences.cpp
@@ -1,4 +1,4 @@
-#include "WingPinReference.h"
+#include "WingReferences.h"
 #include "WingUtils.h"
 #include "EdGraph/EdGraphNode.h"
 #include "EdGraph/EdGraphPin.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
index f407f00f..b52e8aaf 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
@@ -1,5 +1,5 @@
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingProperty.h"
 #include "WingManual.h"
 #include "WingLogCapture.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp
index 8a7d2cdb..e997b360 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp
@@ -3,7 +3,7 @@
 #include "WingProperty.h"
 #include "WingTypes.h"
 #include "WingServer.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingTokenizer.h"
 #include "PropertyHandle.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingActorComponent.h b/Plugins/UEWingman/Source/UEWingman/Public/WingActorComponent.h
index 0ae81d70..29a610df 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingActorComponent.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingActorComponent.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingActorComponent.generated.h"
 
 class UBlueprint;
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingHandler.h b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
similarity index 82%
rename from Plugins/UEWingman/Source/UEWingman/Public/WingHandler.h
rename to Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
index b4e3ff53..d86ac33a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingHandler.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
@@ -4,7 +4,7 @@
 #include "UObject/Object.h"
 #include "UObject/StrongObjectPtr.h"
 #include "Dom/JsonObject.h"
-#include "WingHandler.generated.h"
+#include "WingBasics.generated.h"
 
 // Marker struct for handler parameters that accept a JSON object.
 // PopulateFromJson stashes the actual JSON object into the Json field.
@@ -108,27 +108,3 @@ struct FWingStructAndUStruct
 	FWingStructAndUStruct(T *Struct) : StructPtr(Struct), UStructPtr(Struct->StaticStruct()) {}
 };
 
-
-// WingStructPointer: Allows us to store a pointer to a
-// ustruct in a variable of class UObject, through the magic
-// of an extra level of indirection.  If the struct is part of
-// a UObject, then the Object field should be point at the
-// object to ensure it doesn't get garbage collected.  If the
-// editable flag is false, it means the struct is for viewing
-// only.
-
-UCLASS()
-class UWingStructPointer : public UObject
-{
-	GENERATED_BODY()
-public:
-	UPROPERTY()
-	UObject* Object;
-	
-	UPROPERTY()
-	UStruct* StructType;
-	
-	void *StructBase;
-
-	bool Editable;
-};
\ No newline at end of file
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingFactories.h b/Plugins/UEWingman/Source/UEWingman/Public/WingFactories.h
index bd6f2a87..f921dc8d 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingFactories.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingFactories.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "Factories/Factory.h"
 #include "Factories/EnumFactory.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingFactories.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h b/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h
index 19e39c6a..29d09444 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Containers/Set.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 
 class WingManual
 {
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h b/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
index b36ab632..883022f4 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
@@ -4,7 +4,7 @@
 #include "Materials/Material.h"
 #include "WingTokenizer.h"
 #include "Materials/MaterialInstanceConstant.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingParameterEditor.generated.h"
 
 USTRUCT()
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingPinReference.h b/Plugins/UEWingman/Source/UEWingman/Public/WingPinReference.h
deleted file mode 100644
index 1ecb28ca..00000000
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingPinReference.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "CoreMinimal.h"
-#include "UObject/Object.h"
-#include "WingHandler.h"
-#include "WingPinReference.generated.h"
-
-class UEdGraphNode;
-class UEdGraphPin;
-
-UCLASS()
-class UWingPinReference : public UObject
-{
-	GENERATED_BODY()
-
-public:
-	UPROPERTY()
-	UEdGraphNode* Node = nullptr;
-
-	FName PinName;
-
-	UEdGraphPin* GetPin() const;
-	UEdGraphPin* CheckGetPin(WingOut Errors) const;
-};
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h b/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h
index 7fcdcd52..a79dca02 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingUtils.h"
 
 // A resolved property: the FProperty descriptor plus a pointer to
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingReferences.h b/Plugins/UEWingman/Source/UEWingman/Public/WingReferences.h
new file mode 100644
index 00000000..204595a2
--- /dev/null
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingReferences.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "WingBasics.h"
+#include "WingReferences.generated.h"
+
+class UEdGraphNode;
+class UEdGraphPin;
+
+////////////////////////////////////////////////////////////
+//
+// The WingFetcher module allows you to start at an asset and
+// walk to any object within that asset.  For example, you can
+// start at an actor blueprint, walk to its event graph, then
+// walk to a graph node, and then walk to a graph pin.
+//
+// The following classes make it possible to 'walk' to a
+// place that isn't a UObject, or that isn't a single UObject.
+// We accomplish this by creating a UObject class that
+// contains some sort of reference to the item in question.
+//
+////////////////////////////////////////////////////////////
+
+
+// WingStructPointer: Stores a pointer to a ustruct which is
+// inside a UObject.  This makes it possible to walk to a
+// struct property.
+//
+// The Object field should be point at the containing object
+// to ensure it doesn't get garbage collected.
+// 
+// The editable flag indicates whether the struct property
+// we walked into is marked CPF_Edit.  If not, then the intent
+// is that this struct is for viewing only.
+
+UCLASS()
+class UWingStructPointer : public UObject
+{
+	GENERATED_BODY()
+public:
+	UPROPERTY()
+	UObject* Object;
+	
+	UPROPERTY()
+	UStruct* StructType;
+	
+	void *StructBase;
+
+	bool Editable;
+};
+
+// WingPinReference: Stores the name of a UEdGraphPin which is
+// inside a UEdGraphNode.
+
+UCLASS()
+class UWingPinReference : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY()
+	UEdGraphNode* Node = nullptr;
+
+	FName PinName;
+
+	UEdGraphPin* GetPin() const;
+	UEdGraphPin* CheckGetPin(WingOut Errors) const;
+};
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h b/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
index 76f3d1a7..28ca3b94 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
@@ -9,7 +9,7 @@
 #include "WingUtils.h"
 #include "WingNotifier.h"
 #include "WingLogCapture.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingManual.h"
 #include "WingServer.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h b/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h
index 0b345eb7..6a7f933d 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "CoreMinimal.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 
 // -----------------------------------------------------------------
 //
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h b/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h
index b87bbd9e..5a6946fd 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "EditorSubsystem.h"
 #include "EdGraph/EdGraphPin.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 #include "WingTypes.generated.h"
 
 struct WingTokenizer;
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
index 29673e21..28a46866 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
@@ -15,7 +15,7 @@
 #include "Components/Widget.h"
 #include "WingActorComponent.h"
 #include "WingVariables.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 
 struct FEdGraphSchemaAction;
 class UAnimationStateMachineGraph;
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h b/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
index 32c415ac..83865fbe 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "EdGraph/EdGraphPin.h"
 #include "Engine/Blueprint.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 
 struct WingTokenizer;
 class UK2Node_CustomEvent;
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h b/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
index 4543cabc..e9a30976 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "Components/Widget.h"
-#include "WingHandler.h"
+#include "WingBasics.h"
 
 class UWidgetTree;
 struct FAssetData;