diff --git a/src/main/deploy/pathplanner/autos/Hub to Shoot.auto b/src/main/deploy/pathplanner/autos/1. Hub to Shoot.auto
similarity index 59%
rename from src/main/deploy/pathplanner/autos/Hub to Shoot.auto
rename to src/main/deploy/pathplanner/autos/1. Hub to Shoot.auto
index 236077b..5877b05 100644
--- a/src/main/deploy/pathplanner/autos/Hub to Shoot.auto	
+++ b/src/main/deploy/pathplanner/autos/1. Hub to Shoot.auto	
@@ -7,30 +7,24 @@
         {
           "type": "path",
           "data": {
-            "pathName": "Hub to Depot"
-          }
-        },
-        {
-          "type": "path",
-          "data": {
-            "pathName": "Depot to Shooting Point"
+            "pathName": "1.1 Hub to Shoot Path"
           }
         },
         {
           "type": "deadline",
           "data": {
             "commands": [
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 10.0
-                }
-              },
               {
                 "type": "named",
                 "data": {
                   "name": "ChassisAlignShoot"
                 }
+              },
+              {
+                "type": "wait",
+                "data": {
+                  "waitTime": 10.0
+                }
               }
             ]
           }
@@ -38,7 +32,32 @@
         {
           "type": "path",
           "data": {
-            "pathName": "Shooting Point to Depot"
+            "pathName": "1.2 Shoot to Depot Path"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "1.3 Depot to Shoot Path"
+          }
+        },
+        {
+          "type": "deadline",
+          "data": {
+            "commands": [
+              {
+                "type": "named",
+                "data": {
+                  "name": "ChassisAlignShoot"
+                }
+              },
+              {
+                "type": "wait",
+                "data": {
+                  "waitTime": 10.0
+                }
+              }
+            ]
           }
         }
       ]
diff --git a/src/main/deploy/pathplanner/autos/Chaos Monkey.auto b/src/main/deploy/pathplanner/autos/9. Chaos Monkey.auto
similarity index 84%
rename from src/main/deploy/pathplanner/autos/Chaos Monkey.auto
rename to src/main/deploy/pathplanner/autos/9. Chaos Monkey.auto
index 4796d1c..047298f 100644
--- a/src/main/deploy/pathplanner/autos/Chaos Monkey.auto	
+++ b/src/main/deploy/pathplanner/autos/9. Chaos Monkey.auto	
@@ -7,7 +7,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "Chaos Monkey Path"
+            "pathName": "9.1 Chaos Monkey Path"
           }
         }
       ]
diff --git a/src/main/deploy/pathplanner/autos/Hub to Depot.auto b/src/main/deploy/pathplanner/autos/Hub to Depot.auto
deleted file mode 100644
index baf27d1..0000000
--- a/src/main/deploy/pathplanner/autos/Hub to Depot.auto	
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "2025.0",
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "Hub to Depot"
-          }
-        }
-      ]
-    }
-  },
-  "resetOdom": true,
-  "folder": null,
-  "choreoAuto": false
-}
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/autos/New Auto.auto b/src/main/deploy/pathplanner/autos/New Auto.auto
deleted file mode 100644
index 268147b..0000000
--- a/src/main/deploy/pathplanner/autos/New Auto.auto	
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "2025.0",
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "New Path"
-          }
-        }
-      ]
-    }
-  },
-  "resetOdom": true,
-  "folder": null,
-  "choreoAuto": false
-}
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/autos/Test.auto b/src/main/deploy/pathplanner/autos/Test.auto
deleted file mode 100644
index b3197af..0000000
--- a/src/main/deploy/pathplanner/autos/Test.auto
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "2025.0",
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "Test Path"
-          }
-        }
-      ]
-    }
-  },
-  "resetOdom": true,
-  "folder": null,
-  "choreoAuto": false
-}
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/Hub to Depot.path b/src/main/deploy/pathplanner/paths/1.1 Hub to Shoot Path.path
similarity index 84%
rename from src/main/deploy/pathplanner/paths/Hub to Depot.path
rename to src/main/deploy/pathplanner/paths/1.1 Hub to Shoot Path.path
index 39f3bc5..fca99e0 100644
--- a/src/main/deploy/pathplanner/paths/Hub to Depot.path	
+++ b/src/main/deploy/pathplanner/paths/1.1 Hub to Shoot Path.path	
@@ -3,12 +3,12 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 13.0,
+        "x": 3.5,
         "y": 4.0
       },
       "prevControl": null,
       "nextControl": {
-        "x": 14.0,
+        "x": 3.0,
         "y": 4.0
       },
       "isLocked": false,
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 15.5,
-        "y": 2.0
+        "x": 2.0,
+        "y": 4.0
       },
       "prevControl": {
-        "x": 13.5,
-        "y": 2.0000000000000004
+        "x": 2.5,
+        "y": 4.0
       },
       "nextControl": null,
       "isLocked": false,
@@ -48,7 +48,7 @@
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 2.6905523852280466
+    "rotation": -179.69626968995792
   },
   "useDefaultConstraints": true
 }
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/Test Path.path b/src/main/deploy/pathplanner/paths/1.2 Shoot to Depot Path.path
similarity index 76%
rename from src/main/deploy/pathplanner/paths/Test Path.path
rename to src/main/deploy/pathplanner/paths/1.2 Shoot to Depot Path.path
index 9c7cd5b..55c2201 100644
--- a/src/main/deploy/pathplanner/paths/Test Path.path	
+++ b/src/main/deploy/pathplanner/paths/1.2 Shoot to Depot Path.path	
@@ -4,24 +4,24 @@
     {
       "anchor": {
         "x": 2.0,
-        "y": 3.892939759036145
+        "y": 4.0
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.999999999999999,
-        "y": 3.892939759036145
+        "x": 2.2144854970378125,
+        "y": 3.8554998234204434
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 3.0,
-        "y": 3.892939759036145
+        "x": 1.0,
+        "y": 6.0
       },
       "prevControl": {
-        "x": 2.0,
-        "y": 3.892939759036145
+        "x": 1.2166471375173105,
+        "y": 5.875244167248359
       },
       "nextControl": null,
       "isLocked": false,
@@ -42,13 +42,13 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 0.0
+    "rotation": -178.09121133641756
   },
   "reversed": false,
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 1.0511807495437313
+    "rotation": 0.4910281334858283
   },
   "useDefaultConstraints": true
 }
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/Shooting Point to Depot.path b/src/main/deploy/pathplanner/paths/1.3 Depot to Shoot Path.path
similarity index 79%
rename from src/main/deploy/pathplanner/paths/Shooting Point to Depot.path
rename to src/main/deploy/pathplanner/paths/1.3 Depot to Shoot Path.path
index 9a62b19..0b35cbb 100644
--- a/src/main/deploy/pathplanner/paths/Shooting Point to Depot.path	
+++ b/src/main/deploy/pathplanner/paths/1.3 Depot to Shoot Path.path	
@@ -3,25 +3,25 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 14.5,
-        "y": 4.0
+        "x": 1.0,
+        "y": 6.0
       },
       "prevControl": null,
       "nextControl": {
-        "x": 14.387524472828067,
-        "y": 4.487185032392618
+        "x": 1.453699105174549,
+        "y": 6.084627986890304
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 15.5,
-        "y": 2.0
+        "x": 2.0,
+        "y": 4.0
       },
       "prevControl": {
-        "x": 15.699374534462622,
-        "y": 1.5414699628074375
+        "x": 2.266577414275921,
+        "y": 3.829411518660614
       },
       "nextControl": null,
       "isLocked": false,
@@ -48,7 +48,7 @@
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 0.0
+    "rotation": -179.69626968995792
   },
   "useDefaultConstraints": true
 }
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/Chaos Monkey Path.path b/src/main/deploy/pathplanner/paths/9.1 Chaos Monkey Path.path
similarity index 62%
rename from src/main/deploy/pathplanner/paths/Chaos Monkey Path.path
rename to src/main/deploy/pathplanner/paths/9.1 Chaos Monkey Path.path
index 08bc439..b209333 100644
--- a/src/main/deploy/pathplanner/paths/Chaos Monkey Path.path	
+++ b/src/main/deploy/pathplanner/paths/9.1 Chaos Monkey Path.path	
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.5,
-        "y": 7.5
+        "x": 3.5184925161825644,
+        "y": 7.5345006466771025
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.5000000000000007,
-        "y": 7.5
+        "x": 4.489963675146704,
+        "y": 7.219438447522688
       },
       "isLocked": false,
       "linkedName": null
@@ -17,15 +17,15 @@
     {
       "anchor": {
         "x": 7.6,
-        "y": 6.81063855421925
+        "y": 6.812200117368956
       },
       "prevControl": {
-        "x": 7.498127631539383,
-        "y": 7.805436031369352
+        "x": 7.532870181778978,
+        "y": 7.8099443669167
       },
       "nextControl": {
-        "x": 7.745476905739448,
-        "y": 5.390036864084266
+        "x": 7.650893142287796,
+        "y": 6.055780073270545
       },
       "isLocked": false,
       "linkedName": null
@@ -33,15 +33,15 @@
     {
       "anchor": {
         "x": 7.6,
-        "y": 0.9424578313276835
+        "y": 0.9617601315610045
       },
       "prevControl": {
-        "x": 7.647828711717099,
-        "y": 1.4502101472608384
+        "x": 7.654625343431328,
+        "y": 1.468826273060325
       },
       "nextControl": {
-        "x": 7.526915662650708,
-        "y": 0.16659036144816464
+        "x": 7.527819365080411,
+        "y": 0.2917349428743933
       },
       "isLocked": false,
       "linkedName": null
@@ -52,15 +52,24 @@
         "y": 0.6692650602433468
       },
       "prevControl": {
-        "x": 0.19442168674709331,
-        "y": 0.8331807228939487
+        "x": 1.096874747061515,
+        "y": 0.6440356562159093
       },
       "nextControl": null,
       "isLocked": false,
       "linkedName": null
     }
   ],
-  "rotationTargets": [],
+  "rotationTargets": [
+    {
+      "waypointRelativePos": 1.2332261810856255,
+      "rotationDegrees": -90.0
+    },
+    {
+      "waypointRelativePos": 1.7516108262639798,
+      "rotationDegrees": 0.0
+    }
+  ],
   "constraintZones": [],
   "pointTowardsZones": [],
   "eventMarkers": [
@@ -81,13 +90,13 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 0.0
+    "rotation": -1.2282908533168926
   },
   "reversed": false,
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 0.0
+    "rotation": -0.1533900770684255
   },
   "useDefaultConstraints": true
 }
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/Depot to Shooting Point.path b/src/main/deploy/pathplanner/paths/Depot to Shooting Point.path
deleted file mode 100644
index 6087546..0000000
--- a/src/main/deploy/pathplanner/paths/Depot to Shooting Point.path	
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "version": "2025.0",
-  "waypoints": [
-    {
-      "anchor": {
-        "x": 15.5,
-        "y": 2.0
-      },
-      "prevControl": null,
-      "nextControl": {
-        "x": 15.387524472828067,
-        "y": 2.4871850323926177
-      },
-      "isLocked": false,
-      "linkedName": null
-    },
-    {
-      "anchor": {
-        "x": 14.5,
-        "y": 4.0
-      },
-      "prevControl": {
-        "x": 14.699374534462622,
-        "y": 3.5414699628074375
-      },
-      "nextControl": null,
-      "isLocked": false,
-      "linkedName": null
-    }
-  ],
-  "rotationTargets": [],
-  "constraintZones": [],
-  "pointTowardsZones": [],
-  "eventMarkers": [],
-  "globalConstraints": {
-    "maxVelocity": 3.0,
-    "maxAcceleration": 3.0,
-    "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0,
-    "nominalVoltage": 12.0,
-    "unlimited": false
-  },
-  "goalEndState": {
-    "velocity": 0,
-    "rotation": 0.0
-  },
-  "reversed": false,
-  "folder": null,
-  "idealStartingState": {
-    "velocity": 0,
-    "rotation": 0.0
-  },
-  "useDefaultConstraints": true
-}
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/New Path.path b/src/main/deploy/pathplanner/paths/New Path.path
deleted file mode 100644
index bfa742c..0000000
--- a/src/main/deploy/pathplanner/paths/New Path.path	
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "version": "2025.0",
-  "waypoints": [
-    {
-      "anchor": {
-        "x": 1.2106987951807227,
-        "y": 3.892939759036145
-      },
-      "prevControl": null,
-      "nextControl": {
-        "x": 2.210698795180722,
-        "y": 3.892939759036145
-      },
-      "isLocked": false,
-      "linkedName": null
-    },
-    {
-      "anchor": {
-        "x": 2.904493975903614,
-        "y": 3.892939759036145
-      },
-      "prevControl": {
-        "x": 1.904493975903614,
-        "y": 3.892939759036145
-      },
-      "nextControl": null,
-      "isLocked": false,
-      "linkedName": null
-    }
-  ],
-  "rotationTargets": [],
-  "constraintZones": [],
-  "pointTowardsZones": [],
-  "eventMarkers": [],
-  "globalConstraints": {
-    "maxVelocity": 3.0,
-    "maxAcceleration": 3.0,
-    "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0,
-    "nominalVoltage": 12.0,
-    "unlimited": false
-  },
-  "goalEndState": {
-    "velocity": 0,
-    "rotation": 0.0
-  },
-  "reversed": false,
-  "folder": null,
-  "idealStartingState": {
-    "velocity": 0,
-    "rotation": 1.0511807495437313
-  },
-  "useDefaultConstraints": true
-}
\ No newline at end of file