diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AnimMutation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_AnimMutation.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AnimMutation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_AnimMutation.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AssetMutation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_AssetMutation.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AssetMutation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_AssetMutation.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Components.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Components.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Components.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Components.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_DiffBlueprints.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_DiffBlueprints.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Discovery.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Discovery.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Discovery.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Discovery.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Dispatchers.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Dispatchers.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Dispatchers.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Dispatchers.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Graphs.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Graphs.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Graphs.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Graphs.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Interfaces.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Interfaces.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialInstance.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_MaterialInstance.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialInstance.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_MaterialInstance.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialMutation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_MaterialMutation.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialMutation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_MaterialMutation.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialRead.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_MaterialRead.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialRead.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_MaterialRead.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Mutation.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Mutation.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Params.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Params.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Params.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Params.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_PinMutation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_PinMutation.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_PinMutation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_PinMutation.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Read.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Read.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Read.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Read.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_StateMachine.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_StateMachine.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_StateMachine.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_StateMachine.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_UserTypes.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_UserTypes.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_UserTypes.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_UserTypes.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Validation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Validation.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Validation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Validation.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Variables.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Variables.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Variables.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/Handlers/MCPHandlers_Variables.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers.cpp
index 1571e9d4..676ee129 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers.cpp
@@ -1,19 +1,19 @@
-#include "MCPHandlers_DiffBlueprints.h"
-#include "MCPHandlers_Interfaces.h"
-#include "MCPHandlers_Mutation.h"
-#include "MCPHandlers_PinMutation.h"
-#include "MCPHandlers_AssetMutation.h"
-#include "MCPHandlers_Validation.h"
-#include "MCPHandlers_UserTypes.h"
-#include "MCPHandlers_AnimMutation.h"
-#include "MCPHandlers_Read.h"
-#include "MCPHandlers_Discovery.h"
-#include "MCPHandlers_Graphs.h"
-#include "MCPHandlers_Variables.h"
-#include "MCPHandlers_Params.h"
-#include "MCPHandlers_Dispatchers.h"
-#include "MCPHandlers_Components.h"
-#include "MCPHandlers_MaterialRead.h"
-#include "MCPHandlers_MaterialMutation.h"
-#include "MCPHandlers_MaterialInstance.h"
-#include "MCPHandlers_StateMachine.h"
+#include "Handlers/MCPHandlers_DiffBlueprints.h"
+#include "Handlers/MCPHandlers_Interfaces.h"
+#include "Handlers/MCPHandlers_Mutation.h"
+#include "Handlers/MCPHandlers_PinMutation.h"
+#include "Handlers/MCPHandlers_AssetMutation.h"
+#include "Handlers/MCPHandlers_Validation.h"
+#include "Handlers/MCPHandlers_UserTypes.h"
+#include "Handlers/MCPHandlers_AnimMutation.h"
+#include "Handlers/MCPHandlers_Read.h"
+#include "Handlers/MCPHandlers_Discovery.h"
+#include "Handlers/MCPHandlers_Graphs.h"
+#include "Handlers/MCPHandlers_Variables.h"
+#include "Handlers/MCPHandlers_Params.h"
+#include "Handlers/MCPHandlers_Dispatchers.h"
+#include "Handlers/MCPHandlers_Components.h"
+#include "Handlers/MCPHandlers_MaterialRead.h"
+#include "Handlers/MCPHandlers_MaterialMutation.h"
+#include "Handlers/MCPHandlers_MaterialInstance.h"
+#include "Handlers/MCPHandlers_StateMachine.h"