diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/ActionExplorationDriver.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/ActionExplorationDriver.cs
index 0d862f64..d913983f 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/ActionExplorationDriver.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/ActionExplorationDriver.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using RegressionGames;
 using RegressionGames.StateRecorder.BotSegments.Models;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 using RegressionGames.StateRecorder.Models;
 using UnityEngine;
 
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/BotSegmentsPlaybackController.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/BotSegmentsPlaybackController.cs
index 446613d2..98835275 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/BotSegmentsPlaybackController.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/BotSegmentsPlaybackController.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using Newtonsoft.Json;
 using RegressionGames.StateRecorder.BotSegments.Models;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 using RegressionGames.StateRecorder.Models;
 using StateRecorder.BotSegments;
 using StateRecorder.BotSegments.Models;
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/JsonConverters/BotActionJsonConverter.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/JsonConverters/BotActionJsonConverter.cs
index 8033f111..95070e27 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/JsonConverters/BotActionJsonConverter.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/JsonConverters/BotActionJsonConverter.cs
@@ -3,7 +3,7 @@
 using Newtonsoft.Json.Linq;
 using RegressionGames.StateRecorder.BotSegments.Models;
 using RegressionGames.StateRecorder.BotSegments.Models.BotActions;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 
 
 namespace RegressionGames.StateRecorder.BotSegments.JsonConverters
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments.meta b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments.meta
similarity index 100%
rename from src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments.meta
rename to src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments.meta
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/IKeyMomentExploration.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/IKeyMomentExploration.cs
similarity index 54%
rename from src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/IKeyMomentExploration.cs
rename to src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/IKeyMomentExploration.cs
index 1fdcc90f..4ccc6528 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/IKeyMomentExploration.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/IKeyMomentExploration.cs
@@ -1,4 +1,4 @@
-namespace RegressionGames.StateRecorder.BotSegments.Models.KeyMoments
+namespace RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments
 {
     public interface IKeyMomentExploration
     {
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/IKeyMomentExploration.cs.meta b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/IKeyMomentExploration.cs.meta
similarity index 100%
rename from src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/IKeyMomentExploration.cs.meta
rename to src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/IKeyMomentExploration.cs.meta
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions/KeyMomentMouseActionData.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/KeyMomentMouseActionData.cs
similarity index 99%
rename from src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions/KeyMomentMouseActionData.cs
rename to src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/KeyMomentMouseActionData.cs
index 63c86f24..97bf1e13 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions/KeyMomentMouseActionData.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/KeyMomentMouseActionData.cs
@@ -10,7 +10,7 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions
+namespace RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments
 {
     [Serializable]
     public class PreconditionNormalizedPathData
@@ -642,6 +642,7 @@ private Vector2 GetClickPositionForMatch((ObjectStatus, (float,float,float,float
                             var preconditionMatchesI = preconditionMatches[i];
                             if (preconditionMatchesI.Count > 0)
                             {
+                                // TODO: Currently this narrows the bounds.. but can cause you to actually get further from the original click position... i think we need to consider the 'most' overlapping match with the original for similar objects before choosing to narrow
                                 foreach (var preconditionMatchI in preconditionMatchesI)
                                 {
                                     var isInteractable = true;
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions/KeyMomentMouseActionData.cs.meta b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/KeyMomentMouseActionData.cs.meta
similarity index 100%
rename from src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions/KeyMomentMouseActionData.cs.meta
rename to src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/BotActions/KeyMoments/KeyMomentMouseActionData.cs.meta
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions.meta b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions.meta
deleted file mode 100644
index ddbcdd7b..00000000
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 539d8f195d62486fbf21dcb1c57af9be
-timeCreated: 1733235018
\ No newline at end of file
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/KeyMoments/MouseKeyMomentEvaluator.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/KeyMoments/MouseKeyMomentEvaluator.cs
index 590a1183..5dc801d3 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/KeyMoments/MouseKeyMomentEvaluator.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/KeyMoments/MouseKeyMomentEvaluator.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using RegressionGames.StateRecorder.BotSegments.Models;
 using RegressionGames.StateRecorder.BotSegments.Models.BotCriteria;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 using RegressionGames.StateRecorder.Models;
 
 namespace RegressionGames.StateRecorder.KeyMoments
diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/ScreenRecorder.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/ScreenRecorder.cs
index 3df009af..24e6e843 100644
--- a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/ScreenRecorder.cs
+++ b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/ScreenRecorder.cs
@@ -9,14 +9,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Newtonsoft.Json;
 using RegressionGames.ActionManager;
 using RegressionGames.CodeCoverage;
 using RegressionGames.RemoteOrchestration;
 using RegressionGames.StateRecorder.BotSegments.Models;
 using RegressionGames.StateRecorder.BotSegments.Models.BotActions;
 using RegressionGames.StateRecorder.BotSegments.Models.BotCriteria;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
 using RegressionGames.StateRecorder.Models;
 using StateRecorder.BotSegments;
 #if UNITY_EDITOR