diff --git a/commandsv2/src/main/native/cpp/frc2/command/Command.cpp b/commandsv2/src/main/native/cpp/Command.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/Command.cpp
rename to commandsv2/src/main/native/cpp/Command.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp b/commandsv2/src/main/native/cpp/CommandPtr.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp
rename to commandsv2/src/main/native/cpp/CommandPtr.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/commandsv2/src/main/native/cpp/CommandScheduler.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp
rename to commandsv2/src/main/native/cpp/CommandScheduler.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/Commands.cpp b/commandsv2/src/main/native/cpp/Commands.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/Commands.cpp
rename to commandsv2/src/main/native/cpp/Commands.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ConditionalCommand.cpp b/commandsv2/src/main/native/cpp/ConditionalCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
rename to commandsv2/src/main/native/cpp/ConditionalCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp b/commandsv2/src/main/native/cpp/DeferredCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp
rename to commandsv2/src/main/native/cpp/DeferredCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/FunctionalCommand.cpp b/commandsv2/src/main/native/cpp/FunctionalCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
rename to commandsv2/src/main/native/cpp/FunctionalCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/InstantCommand.cpp b/commandsv2/src/main/native/cpp/InstantCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/InstantCommand.cpp
rename to commandsv2/src/main/native/cpp/InstantCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/NotifierCommand.cpp b/commandsv2/src/main/native/cpp/NotifierCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/NotifierCommand.cpp
rename to commandsv2/src/main/native/cpp/NotifierCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp b/commandsv2/src/main/native/cpp/ParallelCommandGroup.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
rename to commandsv2/src/main/native/cpp/ParallelCommandGroup.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp b/commandsv2/src/main/native/cpp/ParallelDeadlineGroup.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
rename to commandsv2/src/main/native/cpp/ParallelDeadlineGroup.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp b/commandsv2/src/main/native/cpp/ParallelRaceGroup.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
rename to commandsv2/src/main/native/cpp/ParallelRaceGroup.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/PrintCommand.cpp b/commandsv2/src/main/native/cpp/PrintCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/PrintCommand.cpp
rename to commandsv2/src/main/native/cpp/PrintCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp b/commandsv2/src/main/native/cpp/ProxyCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp
rename to commandsv2/src/main/native/cpp/ProxyCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/RepeatCommand.cpp b/commandsv2/src/main/native/cpp/RepeatCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/RepeatCommand.cpp
rename to commandsv2/src/main/native/cpp/RepeatCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/RunCommand.cpp b/commandsv2/src/main/native/cpp/RunCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/RunCommand.cpp
rename to commandsv2/src/main/native/cpp/RunCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ScheduleCommand.cpp b/commandsv2/src/main/native/cpp/ScheduleCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/ScheduleCommand.cpp
rename to commandsv2/src/main/native/cpp/ScheduleCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp b/commandsv2/src/main/native/cpp/SequentialCommandGroup.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
rename to commandsv2/src/main/native/cpp/SequentialCommandGroup.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/StartEndCommand.cpp b/commandsv2/src/main/native/cpp/StartEndCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/StartEndCommand.cpp
rename to commandsv2/src/main/native/cpp/StartEndCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp b/commandsv2/src/main/native/cpp/Subsystem.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp
rename to commandsv2/src/main/native/cpp/Subsystem.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp b/commandsv2/src/main/native/cpp/SubsystemBase.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp
rename to commandsv2/src/main/native/cpp/SubsystemBase.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp b/commandsv2/src/main/native/cpp/WaitCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp
rename to commandsv2/src/main/native/cpp/WaitCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp b/commandsv2/src/main/native/cpp/WaitUntilCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
rename to commandsv2/src/main/native/cpp/WaitUntilCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/WrapperCommand.cpp b/commandsv2/src/main/native/cpp/WrapperCommand.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/WrapperCommand.cpp
rename to commandsv2/src/main/native/cpp/WrapperCommand.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp b/commandsv2/src/main/native/cpp/button/CommandGamepad.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp
rename to commandsv2/src/main/native/cpp/button/CommandGamepad.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp b/commandsv2/src/main/native/cpp/button/CommandGenericHID.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp
rename to commandsv2/src/main/native/cpp/button/CommandGenericHID.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp b/commandsv2/src/main/native/cpp/button/CommandJoystick.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp
rename to commandsv2/src/main/native/cpp/button/CommandJoystick.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/NetworkButton.cpp b/commandsv2/src/main/native/cpp/button/NetworkButton.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
rename to commandsv2/src/main/native/cpp/button/NetworkButton.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp b/commandsv2/src/main/native/cpp/button/RobotModeTriggers.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp
rename to commandsv2/src/main/native/cpp/button/RobotModeTriggers.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp b/commandsv2/src/main/native/cpp/button/Trigger.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp
rename to commandsv2/src/main/native/cpp/button/Trigger.cpp
diff --git a/commandsv2/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp b/commandsv2/src/main/native/cpp/sysid/SysIdRoutine.cpp
similarity index 100%
rename from commandsv2/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp
rename to commandsv2/src/main/native/cpp/sysid/SysIdRoutine.cpp