diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/Engines/AutoEngineSample.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/Engines/AutoEngineSample.java
new file mode 100644
index 0000000..1299622
--- /dev/null
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/Engines/AutoEngineSample.java
@@ -0,0 +1,4 @@
+package org.timecrafters.CenterStage.Autonomous.Engines;
+
+public class AutoEngineSample {
+}
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/States/AutoStateSample.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/States/AutoStateSample.java
new file mode 100644
index 0000000..2fca3ad
--- /dev/null
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/States/AutoStateSample.java
@@ -0,0 +1,4 @@
+package org.timecrafters.CenterStage.Autonomous.States;
+
+public class AutoStateSample {
+}
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/TestingStates/TestingStateSample.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/TestingStates/TestingStateSample.java
new file mode 100644
index 0000000..42e57cc
--- /dev/null
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/Autonomous/TestingStates/TestingStateSample.java
@@ -0,0 +1,4 @@
+package org.timecrafters.CenterStage.Autonomous.TestingStates;
+
+public class TestingStateSample {
+}
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/Engines/ProtoBotEngineSodi.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ProtoBotEngineSodi.java
similarity index 74%
rename from TeamCode/src/main/java/org/timecrafters/CenterStage/Engines/ProtoBotEngineSodi.java
rename to TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ProtoBotEngineSodi.java
index b267f92..a00ef0a 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/Engines/ProtoBotEngineSodi.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ProtoBotEngineSodi.java
@@ -1,4 +1,4 @@
-package org.timecrafters.CenterStage.Engines;
+package org.timecrafters.CenterStage.TeleOp.Engines;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/Engines/PrototypeRobotEngine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/PrototypeRobotEngine.java
similarity index 78%
rename from TeamCode/src/main/java/org/timecrafters/CenterStage/Engines/PrototypeRobotEngine.java
rename to TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/PrototypeRobotEngine.java
index 7d2f1b6..f3ae5f2 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/Engines/PrototypeRobotEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/PrototypeRobotEngine.java
@@ -1,9 +1,10 @@
-package org.timecrafters.CenterStage.Engines;
+package org.timecrafters.CenterStage.TeleOp.Engines;
 
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
 
 import org.timecrafters.CenterStage.Common.PrototypeRobot;
-import org.timecrafters.CenterStage.States.PrototypeRobotDrivetrainState;
+import org.timecrafters.CenterStage.TeleOp.States.PrototypeRobotDrivetrainState;
+
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
 @TeleOp(name = "Prototype Robot", group = "PROTOTYPE")
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/States/ProtoBotStateSodi.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/States/ProtoBotStateSodi.java
similarity index 82%
rename from TeamCode/src/main/java/org/timecrafters/CenterStage/States/ProtoBotStateSodi.java
rename to TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/States/ProtoBotStateSodi.java
index 83a6c1d..4cfc12b 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/States/ProtoBotStateSodi.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/States/ProtoBotStateSodi.java
@@ -1,4 +1,4 @@
-package org.timecrafters.CenterStage.States;
+package org.timecrafters.CenterStage.TeleOp.States;
 
 import dev.cyberarm.engine.V2.CyberarmState;
 import org.timecrafters.CenterStage.Common.ProtoBotSodi;
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/States/PrototypeRobotDrivetrainState.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/States/PrototypeRobotDrivetrainState.java
similarity index 97%
rename from TeamCode/src/main/java/org/timecrafters/CenterStage/States/PrototypeRobotDrivetrainState.java
rename to TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/States/PrototypeRobotDrivetrainState.java
index 0a0cc00..a2c420d 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/States/PrototypeRobotDrivetrainState.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/States/PrototypeRobotDrivetrainState.java
@@ -1,4 +1,4 @@
-package org.timecrafters.CenterStage.States;
+package org.timecrafters.CenterStage.TeleOp.States;
 
 import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit;
 import org.timecrafters.CenterStage.Common.PrototypeRobot;
@@ -22,7 +22,6 @@ public class PrototypeRobotDrivetrainState extends CyberarmState {
 
         if (engine.gamepad2.a){
         // setting Servo Positions to do time Math
-        robot.currentSetPosShoulder = robot.SHOULDER_COLL
         robot.depositorShoulder.setPosition(robot.currentSetPosShoulder);
         // running math function to determine time
         robot.ShoulderServoWaitTime();
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/TestingState/TestingStateSample.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/TestingState/TestingStateSample.java
new file mode 100644
index 0000000..180e7b0
--- /dev/null
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/TestingState/TestingStateSample.java
@@ -0,0 +1,4 @@
+package org.timecrafters.CenterStage.TeleOp.TestingState;
+
+public class TestingStateSample {
+}