diff --git a/src/main/java/frc/robot/commands/ElevatorSetAutoCommand.java b/src/main/java/frc/robot/commands/elevator/ElevatorSetAutoCommand.java
similarity index 85%
rename from src/main/java/frc/robot/commands/ElevatorSetAutoCommand.java
rename to src/main/java/frc/robot/commands/elevator/ElevatorSetAutoCommand.java
index 48f1f02c..5b2ad74b 100644
--- a/src/main/java/frc/robot/commands/ElevatorSetAutoCommand.java
+++ b/src/main/java/frc/robot/commands/elevator/ElevatorSetAutoCommand.java
@@ -1,7 +1,7 @@
-package frc.robot.commands;
+package frc.robot.commands.elevator;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.subsystems.Elevator.ElevatorSubsystem;
+import frc.robot.subsystems.elevator.ElevatorSubsystem;
 
 public class ElevatorSetAutoCommand extends Command{
     private ElevatorSubsystem elevatorSubsystem;
diff --git a/src/main/java/frc/robot/commands/ElevatorSetManualCommand.java b/src/main/java/frc/robot/commands/elevator/ElevatorSetManualCommand.java
similarity index 85%
rename from src/main/java/frc/robot/commands/ElevatorSetManualCommand.java
rename to src/main/java/frc/robot/commands/elevator/ElevatorSetManualCommand.java
index 6efe6505..b5ea4819 100644
--- a/src/main/java/frc/robot/commands/ElevatorSetManualCommand.java
+++ b/src/main/java/frc/robot/commands/elevator/ElevatorSetManualCommand.java
@@ -1,7 +1,7 @@
-package frc.robot.commands;
+package frc.robot.commands.elevator;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.subsystems.Elevator.ElevatorSubsystem;
+import frc.robot.subsystems.elevator.ElevatorSubsystem;
 
 public class ElevatorSetManualCommand extends Command{
     private ElevatorSubsystem elevatorSubsystem;
diff --git a/src/main/java/frc/robot/commands/ElevatorToAMPCommand.java b/src/main/java/frc/robot/commands/elevator/ElevatorToAMPCommand.java
similarity index 82%
rename from src/main/java/frc/robot/commands/ElevatorToAMPCommand.java
rename to src/main/java/frc/robot/commands/elevator/ElevatorToAMPCommand.java
index f1146d0e..b762881b 100644
--- a/src/main/java/frc/robot/commands/ElevatorToAMPCommand.java
+++ b/src/main/java/frc/robot/commands/elevator/ElevatorToAMPCommand.java
@@ -1,8 +1,8 @@
-package frc.robot.commands;
+package frc.robot.commands.elevator;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.subsystems.Elevator.ElevatorSubsystem;
-import frc.robot.subsystems.Elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorSubsystem;
 
 public class ElevatorToAMPCommand extends Command{
     private ElevatorSubsystem elevatorSubsystem;
diff --git a/src/main/java/frc/robot/commands/ElevatorToChuteCommand.java b/src/main/java/frc/robot/commands/elevator/ElevatorToChuteCommand.java
similarity index 83%
rename from src/main/java/frc/robot/commands/ElevatorToChuteCommand.java
rename to src/main/java/frc/robot/commands/elevator/ElevatorToChuteCommand.java
index 37879618..d6349e1b 100644
--- a/src/main/java/frc/robot/commands/ElevatorToChuteCommand.java
+++ b/src/main/java/frc/robot/commands/elevator/ElevatorToChuteCommand.java
@@ -1,8 +1,8 @@
-package frc.robot.commands;
+package frc.robot.commands.elevator;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.subsystems.Elevator.ElevatorSubsystem;
-import frc.robot.subsystems.Elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorSubsystem;
 
 public class ElevatorToChuteCommand extends Command{
     private ElevatorSubsystem elevatorSubsystem;
diff --git a/src/main/java/frc/robot/commands/ElevatorToGroundCommand.java b/src/main/java/frc/robot/commands/elevator/ElevatorToGroundCommand.java
similarity index 83%
rename from src/main/java/frc/robot/commands/ElevatorToGroundCommand.java
rename to src/main/java/frc/robot/commands/elevator/ElevatorToGroundCommand.java
index de13bab5..c2a47e17 100644
--- a/src/main/java/frc/robot/commands/ElevatorToGroundCommand.java
+++ b/src/main/java/frc/robot/commands/elevator/ElevatorToGroundCommand.java
@@ -1,8 +1,8 @@
-package frc.robot.commands;
+package frc.robot.commands.elevator;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.subsystems.Elevator.ElevatorSubsystem;
-import frc.robot.subsystems.Elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorSubsystem;
 
 public class ElevatorToGroundCommand extends Command{
     private ElevatorSubsystem elevatorSubsystem;
diff --git a/src/main/java/frc/robot/commands/ElevatorToSpeakerCommand.java b/src/main/java/frc/robot/commands/elevator/ElevatorToSpeakerCommand.java
similarity index 83%
rename from src/main/java/frc/robot/commands/ElevatorToSpeakerCommand.java
rename to src/main/java/frc/robot/commands/elevator/ElevatorToSpeakerCommand.java
index 180a145e..c87f0aab 100644
--- a/src/main/java/frc/robot/commands/ElevatorToSpeakerCommand.java
+++ b/src/main/java/frc/robot/commands/elevator/ElevatorToSpeakerCommand.java
@@ -1,8 +1,8 @@
-package frc.robot.commands;
+package frc.robot.commands.elevator;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.subsystems.Elevator.ElevatorSubsystem;
-import frc.robot.subsystems.Elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorState;
+import frc.robot.subsystems.elevator.ElevatorSubsystem;
 
 public class ElevatorToSpeakerCommand extends Command{
     private ElevatorSubsystem elevatorSubsystem;
diff --git a/src/main/java/frc/robot/subsystems/Elevator/ElevatorState.java b/src/main/java/frc/robot/subsystems/Elevator/ElevatorState.java
index c307c2fb..6c70dcff 100644
--- a/src/main/java/frc/robot/subsystems/Elevator/ElevatorState.java
+++ b/src/main/java/frc/robot/subsystems/Elevator/ElevatorState.java
@@ -1,4 +1,4 @@
-package frc.robot.subsystems.Elevator;
+package frc.robot.subsystems.elevator;
 
 import edu.wpi.first.math.util.Units;
 
diff --git a/src/main/java/frc/robot/subsystems/Elevator/ElevatorSubsystem.java b/src/main/java/frc/robot/subsystems/Elevator/ElevatorSubsystem.java
index af280245..97953664 100644
--- a/src/main/java/frc/robot/subsystems/Elevator/ElevatorSubsystem.java
+++ b/src/main/java/frc/robot/subsystems/Elevator/ElevatorSubsystem.java
@@ -1,4 +1,4 @@
-package frc.robot.subsystems.Elevator;
+package frc.robot.subsystems.elevator;
 
 import java.util.EnumSet;