diff --git a/wpilibNewCommands/.styleguide b/commandsv2/.styleguide
similarity index 100%
rename from wpilibNewCommands/.styleguide
rename to commandsv2/.styleguide
diff --git a/wpilibNewCommands/BUILD.bazel b/commandsv2/BUILD.bazel
similarity index 100%
rename from wpilibNewCommands/BUILD.bazel
rename to commandsv2/BUILD.bazel
diff --git a/wpilibNewCommands/CMakeLists.txt b/commandsv2/CMakeLists.txt
similarity index 100%
rename from wpilibNewCommands/CMakeLists.txt
rename to commandsv2/CMakeLists.txt
diff --git a/wpilibNewCommands/WPILibNewCommands.json b/commandsv2/WPILibNewCommands.json
similarity index 100%
rename from wpilibNewCommands/WPILibNewCommands.json
rename to commandsv2/WPILibNewCommands.json
diff --git a/wpilibNewCommands/build.gradle b/commandsv2/build.gradle
similarity index 100%
rename from wpilibNewCommands/build.gradle
rename to commandsv2/build.gradle
diff --git a/wpilibNewCommands/generate.bzl b/commandsv2/generate.bzl
similarity index 100%
rename from wpilibNewCommands/generate.bzl
rename to commandsv2/generate.bzl
diff --git a/wpilibNewCommands/generate_hids.py b/commandsv2/generate_hids.py
similarity index 100%
rename from wpilibNewCommands/generate_hids.py
rename to commandsv2/generate_hids.py
diff --git a/wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java b/commandsv2/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java
similarity index 100%
rename from wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java
rename to commandsv2/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java
diff --git a/wpilibNewCommands/src/dev/native/cpp/main.cpp b/commandsv2/src/dev/native/cpp/main.cpp
similarity index 100%
rename from wpilibNewCommands/src/dev/native/cpp/main.cpp
rename to commandsv2/src/dev/native/cpp/main.cpp
diff --git a/wpilibNewCommands/src/generate/main/java/commandhid.java.jinja b/commandsv2/src/generate/main/java/commandhid.java.jinja
similarity index 100%
rename from wpilibNewCommands/src/generate/main/java/commandhid.java.jinja
rename to commandsv2/src/generate/main/java/commandhid.java.jinja
diff --git a/wpilibNewCommands/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja b/commandsv2/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja
similarity index 100%
rename from wpilibNewCommands/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja
rename to commandsv2/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja
diff --git a/wpilibNewCommands/src/generate/main/native/include/frc2/command/button/commandhid.h.jinja b/commandsv2/src/generate/main/native/include/frc2/command/button/commandhid.h.jinja
similarity index 100%
rename from wpilibNewCommands/src/generate/main/native/include/frc2/command/button/commandhid.h.jinja
rename to commandsv2/src/generate/main/native/include/frc2/command/button/commandhid.h.jinja
diff --git a/wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java b/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java
similarity index 100%
rename from wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java
rename to commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java
diff --git a/wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS5Controller.java b/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS5Controller.java
similarity index 100%
rename from wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS5Controller.java
rename to commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS5Controller.java
diff --git a/wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandStadiaController.java b/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandStadiaController.java
similarity index 100%
rename from wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandStadiaController.java
rename to commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandStadiaController.java
diff --git a/wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java b/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
similarity index 100%
rename from wpilibNewCommands/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
rename to commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
diff --git a/wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandPS4Controller.cpp b/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS4Controller.cpp
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandPS4Controller.cpp
rename to commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS4Controller.cpp
diff --git a/wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandPS5Controller.cpp b/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS5Controller.cpp
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandPS5Controller.cpp
rename to commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS5Controller.cpp
diff --git a/wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandStadiaController.cpp b/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandStadiaController.cpp
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandStadiaController.cpp
rename to commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandStadiaController.cpp
diff --git a/wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandXboxController.cpp b/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandXboxController.cpp
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/cpp/frc2/command/button/CommandXboxController.cpp
rename to commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandXboxController.cpp
diff --git a/wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandPS4Controller.h b/commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS4Controller.h
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandPS4Controller.h
rename to commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS4Controller.h
diff --git a/wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandPS5Controller.h b/commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS5Controller.h
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandPS5Controller.h
rename to commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS5Controller.h
diff --git a/wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandStadiaController.h b/commandsv2/src/generated/main/native/include/frc2/command/button/CommandStadiaController.h
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandStadiaController.h
rename to commandsv2/src/generated/main/native/include/frc2/command/button/CommandStadiaController.h
diff --git a/wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandXboxController.h b/commandsv2/src/generated/main/native/include/frc2/command/button/CommandXboxController.h
similarity index 100%
rename from wpilibNewCommands/src/generated/main/native/include/frc2/command/button/CommandXboxController.h
rename to commandsv2/src/generated/main/native/include/frc2/command/button/CommandXboxController.h
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Command.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Command.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/DeferredCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/DeferredCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/DeferredCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/DeferredCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGamepad.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGamepad.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGamepad.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGamepad.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGenericHID.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGenericHID.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGenericHID.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGenericHID.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggers.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggers.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggers.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggers.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutine.java b/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutine.java
similarity index 100%
rename from wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutine.java
rename to commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutine.java
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp b/commandsv2/src/main/native/cpp/frc2/command/Command.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/Command.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandPtr.cpp b/commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/CommandPtr.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Commands.cpp b/commandsv2/src/main/native/cpp/frc2/command/Commands.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/Commands.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/Commands.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/DeferredCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/DeferredCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/InstantCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/InstantCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/NotifierCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/NotifierCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp b/commandsv2/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp b/commandsv2/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp b/commandsv2/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/PrintCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/PrintCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/RepeatCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/RepeatCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/RepeatCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/RepeatCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/RunCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/RunCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ScheduleCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/ScheduleCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/ScheduleCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/ScheduleCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp b/commandsv2/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/StartEndCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/StartEndCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp b/commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp b/commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/WaitCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/WrapperCommand.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/WrapperCommand.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/NetworkButton.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp b/commandsv2/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp
similarity index 100%
rename from wpilibNewCommands/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp
rename to commandsv2/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/Command.h b/commandsv2/src/main/native/include/frc2/command/Command.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/Command.h
rename to commandsv2/src/main/native/include/frc2/command/Command.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/CommandHelper.h b/commandsv2/src/main/native/include/frc2/command/CommandHelper.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/CommandHelper.h
rename to commandsv2/src/main/native/include/frc2/command/CommandHelper.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h b/commandsv2/src/main/native/include/frc2/command/CommandPtr.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h
rename to commandsv2/src/main/native/include/frc2/command/CommandPtr.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/CommandScheduler.h b/commandsv2/src/main/native/include/frc2/command/CommandScheduler.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/CommandScheduler.h
rename to commandsv2/src/main/native/include/frc2/command/CommandScheduler.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/Commands.h b/commandsv2/src/main/native/include/frc2/command/Commands.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/Commands.h
rename to commandsv2/src/main/native/include/frc2/command/Commands.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ConditionalCommand.h b/commandsv2/src/main/native/include/frc2/command/ConditionalCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/ConditionalCommand.h
rename to commandsv2/src/main/native/include/frc2/command/ConditionalCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/DeferredCommand.h b/commandsv2/src/main/native/include/frc2/command/DeferredCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/DeferredCommand.h
rename to commandsv2/src/main/native/include/frc2/command/DeferredCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/FunctionalCommand.h b/commandsv2/src/main/native/include/frc2/command/FunctionalCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/FunctionalCommand.h
rename to commandsv2/src/main/native/include/frc2/command/FunctionalCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/InstantCommand.h b/commandsv2/src/main/native/include/frc2/command/InstantCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/InstantCommand.h
rename to commandsv2/src/main/native/include/frc2/command/InstantCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/NotifierCommand.h b/commandsv2/src/main/native/include/frc2/command/NotifierCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/NotifierCommand.h
rename to commandsv2/src/main/native/include/frc2/command/NotifierCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h b/commandsv2/src/main/native/include/frc2/command/ParallelCommandGroup.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h
rename to commandsv2/src/main/native/include/frc2/command/ParallelCommandGroup.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h b/commandsv2/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
rename to commandsv2/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h b/commandsv2/src/main/native/include/frc2/command/ParallelRaceGroup.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h
rename to commandsv2/src/main/native/include/frc2/command/ParallelRaceGroup.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/PrintCommand.h b/commandsv2/src/main/native/include/frc2/command/PrintCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/PrintCommand.h
rename to commandsv2/src/main/native/include/frc2/command/PrintCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ProxyCommand.h b/commandsv2/src/main/native/include/frc2/command/ProxyCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/ProxyCommand.h
rename to commandsv2/src/main/native/include/frc2/command/ProxyCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/RepeatCommand.h b/commandsv2/src/main/native/include/frc2/command/RepeatCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/RepeatCommand.h
rename to commandsv2/src/main/native/include/frc2/command/RepeatCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/Requirements.h b/commandsv2/src/main/native/include/frc2/command/Requirements.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/Requirements.h
rename to commandsv2/src/main/native/include/frc2/command/Requirements.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/RunCommand.h b/commandsv2/src/main/native/include/frc2/command/RunCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/RunCommand.h
rename to commandsv2/src/main/native/include/frc2/command/RunCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ScheduleCommand.h b/commandsv2/src/main/native/include/frc2/command/ScheduleCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/ScheduleCommand.h
rename to commandsv2/src/main/native/include/frc2/command/ScheduleCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/SelectCommand.h b/commandsv2/src/main/native/include/frc2/command/SelectCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/SelectCommand.h
rename to commandsv2/src/main/native/include/frc2/command/SelectCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h b/commandsv2/src/main/native/include/frc2/command/SequentialCommandGroup.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h
rename to commandsv2/src/main/native/include/frc2/command/SequentialCommandGroup.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/StartEndCommand.h b/commandsv2/src/main/native/include/frc2/command/StartEndCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/StartEndCommand.h
rename to commandsv2/src/main/native/include/frc2/command/StartEndCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/Subsystem.h b/commandsv2/src/main/native/include/frc2/command/Subsystem.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/Subsystem.h
rename to commandsv2/src/main/native/include/frc2/command/Subsystem.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/SubsystemBase.h b/commandsv2/src/main/native/include/frc2/command/SubsystemBase.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/SubsystemBase.h
rename to commandsv2/src/main/native/include/frc2/command/SubsystemBase.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/WaitCommand.h b/commandsv2/src/main/native/include/frc2/command/WaitCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/WaitCommand.h
rename to commandsv2/src/main/native/include/frc2/command/WaitCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/WaitUntilCommand.h b/commandsv2/src/main/native/include/frc2/command/WaitUntilCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/WaitUntilCommand.h
rename to commandsv2/src/main/native/include/frc2/command/WaitUntilCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h b/commandsv2/src/main/native/include/frc2/command/WrapperCommand.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h
rename to commandsv2/src/main/native/include/frc2/command/WrapperCommand.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandGamepad.h b/commandsv2/src/main/native/include/frc2/command/button/CommandGamepad.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/CommandGamepad.h
rename to commandsv2/src/main/native/include/frc2/command/button/CommandGamepad.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandGenericHID.h b/commandsv2/src/main/native/include/frc2/command/button/CommandGenericHID.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/CommandGenericHID.h
rename to commandsv2/src/main/native/include/frc2/command/button/CommandGenericHID.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandJoystick.h b/commandsv2/src/main/native/include/frc2/command/button/CommandJoystick.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/CommandJoystick.h
rename to commandsv2/src/main/native/include/frc2/command/button/CommandJoystick.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/JoystickButton.h b/commandsv2/src/main/native/include/frc2/command/button/JoystickButton.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/JoystickButton.h
rename to commandsv2/src/main/native/include/frc2/command/button/JoystickButton.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/NetworkButton.h b/commandsv2/src/main/native/include/frc2/command/button/NetworkButton.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/NetworkButton.h
rename to commandsv2/src/main/native/include/frc2/command/button/NetworkButton.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/POVButton.h b/commandsv2/src/main/native/include/frc2/command/button/POVButton.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/POVButton.h
rename to commandsv2/src/main/native/include/frc2/command/button/POVButton.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/RobotModeTriggers.h b/commandsv2/src/main/native/include/frc2/command/button/RobotModeTriggers.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/RobotModeTriggers.h
rename to commandsv2/src/main/native/include/frc2/command/button/RobotModeTriggers.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/Trigger.h b/commandsv2/src/main/native/include/frc2/command/button/Trigger.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/button/Trigger.h
rename to commandsv2/src/main/native/include/frc2/command/button/Trigger.h
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/sysid/SysIdRoutine.h b/commandsv2/src/main/native/include/frc2/command/sysid/SysIdRoutine.h
similarity index 100%
rename from wpilibNewCommands/src/main/native/include/frc2/command/sysid/SysIdRoutine.h
rename to commandsv2/src/main/native/include/frc2/command/sysid/SysIdRoutine.h
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandSchedulerTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSchedulerTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandSchedulerTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSchedulerTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/DeferredCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DeferredCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/DeferredCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DeferredCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/MultiCompositionTestBase.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/MultiCompositionTestBase.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/MultiCompositionTestBase.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/MultiCompositionTestBase.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RepeatCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RepeatCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RepeatCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RepeatCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SchedulingRecursionTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SchedulingRecursionTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SchedulingRecursionTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SchedulingRecursionTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggersTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggersTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggersTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggersTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutineTest.java b/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutineTest.java
similarity index 100%
rename from wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutineTest.java
rename to commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutineTest.java
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/AddRequirementsTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/AddRequirementsTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/AddRequirementsTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/AddRequirementsTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandPtrTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.cpp b/commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h b/commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.h
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h
rename to commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.h
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CompositionTestBase.h b/commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.h
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/CompositionTestBase.h
rename to commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.h
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/DeferredCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/DeferredCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/DeferredCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/DeferredCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/InstantCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/InstantCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/InstantCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/InstantCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/POVButtonTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/POVButtonTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/PrintCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/PrintCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/PrintCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/PrintCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ProxyCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/ProxyCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/ProxyCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/ProxyCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/RepeatCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/RepeatCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/RepeatCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/RepeatCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/RunCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/RunCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/RunCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/RunCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulerTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/SchedulerTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulerTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/SchedulerTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/WaitCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/WaitCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/WaitCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/WaitCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/button/RobotModeTriggersTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/button/RobotModeTriggersTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/button/RobotModeTriggersTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/button/RobotModeTriggersTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/make_vector.h b/commandsv2/src/test/native/cpp/frc2/command/make_vector.h
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/make_vector.h
rename to commandsv2/src/test/native/cpp/frc2/command/make_vector.h
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp b/commandsv2/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
rename to commandsv2/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
diff --git a/wpilibNewCommands/src/test/native/cpp/main.cpp b/commandsv2/src/test/native/cpp/main.cpp
similarity index 100%
rename from wpilibNewCommands/src/test/native/cpp/main.cpp
rename to commandsv2/src/test/native/cpp/main.cpp
diff --git a/wpilibNewCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/commandsv2/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from wpilibNewCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to commandsv2/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/wpilibNewCommands/wpilibnewcommands-config.cmake.in b/commandsv2/wpilibnewcommands-config.cmake.in
similarity index 100%
rename from wpilibNewCommands/wpilibnewcommands-config.cmake.in
rename to commandsv2/wpilibnewcommands-config.cmake.in
diff --git a/fieldImages/BUILD.bazel b/fields/BUILD.bazel
similarity index 100%
rename from fieldImages/BUILD.bazel
rename to fields/BUILD.bazel
diff --git a/fieldImages/CMakeLists.txt b/fields/CMakeLists.txt
similarity index 100%
rename from fieldImages/CMakeLists.txt
rename to fields/CMakeLists.txt
diff --git a/fieldImages/build.gradle b/fields/build.gradle
similarity index 100%
rename from fieldImages/build.gradle
rename to fields/build.gradle
diff --git a/fieldImages/fieldimages-config.cmake.in b/fields/fieldimages-config.cmake.in
similarity index 100%
rename from fieldImages/fieldimages-config.cmake.in
rename to fields/fieldimages-config.cmake.in
diff --git a/fieldImages/publish.gradle b/fields/publish.gradle
similarity index 100%
rename from fieldImages/publish.gradle
rename to fields/publish.gradle
diff --git a/fieldImages/src/main/java/edu/wpi/first/fields/FieldConfig.java b/fields/src/main/java/edu/wpi/first/fields/FieldConfig.java
similarity index 100%
rename from fieldImages/src/main/java/edu/wpi/first/fields/FieldConfig.java
rename to fields/src/main/java/edu/wpi/first/fields/FieldConfig.java
diff --git a/fieldImages/src/main/java/edu/wpi/first/fields/Fields.java b/fields/src/main/java/edu/wpi/first/fields/Fields.java
similarity index 100%
rename from fieldImages/src/main/java/edu/wpi/first/fields/Fields.java
rename to fields/src/main/java/edu/wpi/first/fields/Fields.java
diff --git a/fieldImages/src/main/native/cpp/fields.cpp b/fields/src/main/native/cpp/fields.cpp
similarity index 100%
rename from fieldImages/src/main/native/cpp/fields.cpp
rename to fields/src/main/native/cpp/fields.cpp
diff --git a/fieldImages/src/main/native/include/fields/2018-powerup.h b/fields/src/main/native/include/fields/2018-powerup.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2018-powerup.h
rename to fields/src/main/native/include/fields/2018-powerup.h
diff --git a/fieldImages/src/main/native/include/fields/2019-deepspace.h b/fields/src/main/native/include/fields/2019-deepspace.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2019-deepspace.h
rename to fields/src/main/native/include/fields/2019-deepspace.h
diff --git a/fieldImages/src/main/native/include/fields/2020-infiniterecharge.h b/fields/src/main/native/include/fields/2020-infiniterecharge.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2020-infiniterecharge.h
rename to fields/src/main/native/include/fields/2020-infiniterecharge.h
diff --git a/fieldImages/src/main/native/include/fields/2021-barrel.h b/fields/src/main/native/include/fields/2021-barrel.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2021-barrel.h
rename to fields/src/main/native/include/fields/2021-barrel.h
diff --git a/fieldImages/src/main/native/include/fields/2021-bounce.h b/fields/src/main/native/include/fields/2021-bounce.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2021-bounce.h
rename to fields/src/main/native/include/fields/2021-bounce.h
diff --git a/fieldImages/src/main/native/include/fields/2021-galacticsearcha.h b/fields/src/main/native/include/fields/2021-galacticsearcha.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2021-galacticsearcha.h
rename to fields/src/main/native/include/fields/2021-galacticsearcha.h
diff --git a/fieldImages/src/main/native/include/fields/2021-galacticsearchb.h b/fields/src/main/native/include/fields/2021-galacticsearchb.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2021-galacticsearchb.h
rename to fields/src/main/native/include/fields/2021-galacticsearchb.h
diff --git a/fieldImages/src/main/native/include/fields/2021-infiniterecharge.h b/fields/src/main/native/include/fields/2021-infiniterecharge.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2021-infiniterecharge.h
rename to fields/src/main/native/include/fields/2021-infiniterecharge.h
diff --git a/fieldImages/src/main/native/include/fields/2021-slalom.h b/fields/src/main/native/include/fields/2021-slalom.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2021-slalom.h
rename to fields/src/main/native/include/fields/2021-slalom.h
diff --git a/fieldImages/src/main/native/include/fields/2022-rapidreact.h b/fields/src/main/native/include/fields/2022-rapidreact.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2022-rapidreact.h
rename to fields/src/main/native/include/fields/2022-rapidreact.h
diff --git a/fieldImages/src/main/native/include/fields/2023-chargedup.h b/fields/src/main/native/include/fields/2023-chargedup.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2023-chargedup.h
rename to fields/src/main/native/include/fields/2023-chargedup.h
diff --git a/fieldImages/src/main/native/include/fields/2024-crescendo.h b/fields/src/main/native/include/fields/2024-crescendo.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2024-crescendo.h
rename to fields/src/main/native/include/fields/2024-crescendo.h
diff --git a/fieldImages/src/main/native/include/fields/2025-reefscape.h b/fields/src/main/native/include/fields/2025-reefscape.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/2025-reefscape.h
rename to fields/src/main/native/include/fields/2025-reefscape.h
diff --git a/fieldImages/src/main/native/include/fields/fields.h b/fields/src/main/native/include/fields/fields.h
similarity index 100%
rename from fieldImages/src/main/native/include/fields/fields.h
rename to fields/src/main/native/include/fields/fields.h
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-field.jpg b/fields/src/main/native/resources/edu/wpi/first/fields/2018-field.jpg
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-field.jpg
rename to fields/src/main/native/resources/edu/wpi/first/fields/2018-field.jpg
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json b/fields/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json b/fields/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-field.jpg b/fields/src/main/native/resources/edu/wpi/first/fields/2019-field.jpg
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-field.jpg
rename to fields/src/main/native/resources/edu/wpi/first/fields/2019-field.jpg
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-field.png b/fields/src/main/native/resources/edu/wpi/first/fields/2020-field.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-field.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2020-field.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json b/fields/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrel.png b/fields/src/main/native/resources/edu/wpi/first/fields/2021-barrel.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrel.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-barrel.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json b/fields/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bounce.png b/fields/src/main/native/resources/edu/wpi/first/fields/2021-bounce.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bounce.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-bounce.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json b/fields/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-field.png b/fields/src/main/native/resources/edu/wpi/first/fields/2021-field.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-field.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-field.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json b/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.png b/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json b/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.png b/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json b/fields/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalom.png b/fields/src/main/native/resources/edu/wpi/first/fields/2021-slalom.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalom.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-slalom.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json b/fields/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-field.png b/fields/src/main/native/resources/edu/wpi/first/fields/2022-field.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-field.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2022-field.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json b/fields/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json b/fields/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-field.png b/fields/src/main/native/resources/edu/wpi/first/fields/2023-field.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-field.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2023-field.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json b/fields/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-field.png b/fields/src/main/native/resources/edu/wpi/first/fields/2024-field.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2024-field.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2024-field.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2025-field.png b/fields/src/main/native/resources/edu/wpi/first/fields/2025-field.png
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2025-field.png
rename to fields/src/main/native/resources/edu/wpi/first/fields/2025-field.png
diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2025-reefscape.json b/fields/src/main/native/resources/edu/wpi/first/fields/2025-reefscape.json
similarity index 100%
rename from fieldImages/src/main/native/resources/edu/wpi/first/fields/2025-reefscape.json
rename to fields/src/main/native/resources/edu/wpi/first/fields/2025-reefscape.json
diff --git a/fieldImages/src/test/java/edu/wpi/first/fields/LoadConfigTest.java b/fields/src/test/java/edu/wpi/first/fields/LoadConfigTest.java
similarity index 100%
rename from fieldImages/src/test/java/edu/wpi/first/fields/LoadConfigTest.java
rename to fields/src/test/java/edu/wpi/first/fields/LoadConfigTest.java
diff --git a/datalogtool/.styleguide b/tools/datalogtool/.styleguide
similarity index 100%
rename from datalogtool/.styleguide
rename to tools/datalogtool/.styleguide
diff --git a/datalogtool/BUILD.bazel b/tools/datalogtool/BUILD.bazel
similarity index 100%
rename from datalogtool/BUILD.bazel
rename to tools/datalogtool/BUILD.bazel
diff --git a/datalogtool/CMakeLists.txt b/tools/datalogtool/CMakeLists.txt
similarity index 100%
rename from datalogtool/CMakeLists.txt
rename to tools/datalogtool/CMakeLists.txt
diff --git a/datalogtool/Info.plist b/tools/datalogtool/Info.plist
similarity index 100%
rename from datalogtool/Info.plist
rename to tools/datalogtool/Info.plist
diff --git a/datalogtool/build.gradle b/tools/datalogtool/build.gradle
similarity index 100%
rename from datalogtool/build.gradle
rename to tools/datalogtool/build.gradle
diff --git a/datalogtool/publish.gradle b/tools/datalogtool/publish.gradle
similarity index 100%
rename from datalogtool/publish.gradle
rename to tools/datalogtool/publish.gradle
diff --git a/datalogtool/src/main/generate/WPILibVersion.cpp.in b/tools/datalogtool/src/main/generate/WPILibVersion.cpp.in
similarity index 100%
rename from datalogtool/src/main/generate/WPILibVersion.cpp.in
rename to tools/datalogtool/src/main/generate/WPILibVersion.cpp.in
diff --git a/datalogtool/src/main/native/cpp/App.cpp b/tools/datalogtool/src/main/native/cpp/App.cpp
similarity index 100%
rename from datalogtool/src/main/native/cpp/App.cpp
rename to tools/datalogtool/src/main/native/cpp/App.cpp
diff --git a/datalogtool/src/main/native/cpp/App.h b/tools/datalogtool/src/main/native/cpp/App.h
similarity index 100%
rename from datalogtool/src/main/native/cpp/App.h
rename to tools/datalogtool/src/main/native/cpp/App.h
diff --git a/datalogtool/src/main/native/cpp/Downloader.cpp b/tools/datalogtool/src/main/native/cpp/Downloader.cpp
similarity index 100%
rename from datalogtool/src/main/native/cpp/Downloader.cpp
rename to tools/datalogtool/src/main/native/cpp/Downloader.cpp
diff --git a/datalogtool/src/main/native/cpp/Downloader.h b/tools/datalogtool/src/main/native/cpp/Downloader.h
similarity index 100%
rename from datalogtool/src/main/native/cpp/Downloader.h
rename to tools/datalogtool/src/main/native/cpp/Downloader.h
diff --git a/datalogtool/src/main/native/cpp/Exporter.cpp b/tools/datalogtool/src/main/native/cpp/Exporter.cpp
similarity index 100%
rename from datalogtool/src/main/native/cpp/Exporter.cpp
rename to tools/datalogtool/src/main/native/cpp/Exporter.cpp
diff --git a/datalogtool/src/main/native/cpp/Exporter.h b/tools/datalogtool/src/main/native/cpp/Exporter.h
similarity index 100%
rename from datalogtool/src/main/native/cpp/Exporter.h
rename to tools/datalogtool/src/main/native/cpp/Exporter.h
diff --git a/datalogtool/src/main/native/cpp/Sftp.cpp b/tools/datalogtool/src/main/native/cpp/Sftp.cpp
similarity index 100%
rename from datalogtool/src/main/native/cpp/Sftp.cpp
rename to tools/datalogtool/src/main/native/cpp/Sftp.cpp
diff --git a/datalogtool/src/main/native/cpp/Sftp.h b/tools/datalogtool/src/main/native/cpp/Sftp.h
similarity index 100%
rename from datalogtool/src/main/native/cpp/Sftp.h
rename to tools/datalogtool/src/main/native/cpp/Sftp.h
diff --git a/datalogtool/src/main/native/cpp/main.cpp b/tools/datalogtool/src/main/native/cpp/main.cpp
similarity index 100%
rename from datalogtool/src/main/native/cpp/main.cpp
rename to tools/datalogtool/src/main/native/cpp/main.cpp
diff --git a/datalogtool/src/main/native/mac/datalogtool.icns b/tools/datalogtool/src/main/native/mac/datalogtool.icns
similarity index 100%
rename from datalogtool/src/main/native/mac/datalogtool.icns
rename to tools/datalogtool/src/main/native/mac/datalogtool.icns
diff --git a/datalogtool/src/main/native/resources/dlt-128.png b/tools/datalogtool/src/main/native/resources/dlt-128.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-128.png
rename to tools/datalogtool/src/main/native/resources/dlt-128.png
diff --git a/datalogtool/src/main/native/resources/dlt-16.png b/tools/datalogtool/src/main/native/resources/dlt-16.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-16.png
rename to tools/datalogtool/src/main/native/resources/dlt-16.png
diff --git a/datalogtool/src/main/native/resources/dlt-256.png b/tools/datalogtool/src/main/native/resources/dlt-256.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-256.png
rename to tools/datalogtool/src/main/native/resources/dlt-256.png
diff --git a/datalogtool/src/main/native/resources/dlt-32.png b/tools/datalogtool/src/main/native/resources/dlt-32.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-32.png
rename to tools/datalogtool/src/main/native/resources/dlt-32.png
diff --git a/datalogtool/src/main/native/resources/dlt-48.png b/tools/datalogtool/src/main/native/resources/dlt-48.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-48.png
rename to tools/datalogtool/src/main/native/resources/dlt-48.png
diff --git a/datalogtool/src/main/native/resources/dlt-512.png b/tools/datalogtool/src/main/native/resources/dlt-512.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-512.png
rename to tools/datalogtool/src/main/native/resources/dlt-512.png
diff --git a/datalogtool/src/main/native/resources/dlt-64.png b/tools/datalogtool/src/main/native/resources/dlt-64.png
similarity index 100%
rename from datalogtool/src/main/native/resources/dlt-64.png
rename to tools/datalogtool/src/main/native/resources/dlt-64.png
diff --git a/datalogtool/src/main/native/win/datalogtool.ico b/tools/datalogtool/src/main/native/win/datalogtool.ico
similarity index 100%
rename from datalogtool/src/main/native/win/datalogtool.ico
rename to tools/datalogtool/src/main/native/win/datalogtool.ico
diff --git a/datalogtool/src/main/native/win/datalogtool.rc b/tools/datalogtool/src/main/native/win/datalogtool.rc
similarity index 100%
rename from datalogtool/src/main/native/win/datalogtool.rc
rename to tools/datalogtool/src/main/native/win/datalogtool.rc
diff --git a/outlineviewer/.styleguide b/tools/outlineviewer/.styleguide
similarity index 100%
rename from outlineviewer/.styleguide
rename to tools/outlineviewer/.styleguide
diff --git a/outlineviewer/BUILD.bazel b/tools/outlineviewer/BUILD.bazel
similarity index 100%
rename from outlineviewer/BUILD.bazel
rename to tools/outlineviewer/BUILD.bazel
diff --git a/outlineviewer/CMakeLists.txt b/tools/outlineviewer/CMakeLists.txt
similarity index 100%
rename from outlineviewer/CMakeLists.txt
rename to tools/outlineviewer/CMakeLists.txt
diff --git a/outlineviewer/Info.plist b/tools/outlineviewer/Info.plist
similarity index 100%
rename from outlineviewer/Info.plist
rename to tools/outlineviewer/Info.plist
diff --git a/outlineviewer/build.gradle b/tools/outlineviewer/build.gradle
similarity index 100%
rename from outlineviewer/build.gradle
rename to tools/outlineviewer/build.gradle
diff --git a/outlineviewer/publish.gradle b/tools/outlineviewer/publish.gradle
similarity index 100%
rename from outlineviewer/publish.gradle
rename to tools/outlineviewer/publish.gradle
diff --git a/outlineviewer/src/main/generate/WPILibVersion.cpp.in b/tools/outlineviewer/src/main/generate/WPILibVersion.cpp.in
similarity index 100%
rename from outlineviewer/src/main/generate/WPILibVersion.cpp.in
rename to tools/outlineviewer/src/main/generate/WPILibVersion.cpp.in
diff --git a/outlineviewer/src/main/native/cpp/main.cpp b/tools/outlineviewer/src/main/native/cpp/main.cpp
similarity index 100%
rename from outlineviewer/src/main/native/cpp/main.cpp
rename to tools/outlineviewer/src/main/native/cpp/main.cpp
diff --git a/outlineviewer/src/main/native/mac/ov.icns b/tools/outlineviewer/src/main/native/mac/ov.icns
similarity index 100%
rename from outlineviewer/src/main/native/mac/ov.icns
rename to tools/outlineviewer/src/main/native/mac/ov.icns
diff --git a/outlineviewer/src/main/native/resources/ov-128.png b/tools/outlineviewer/src/main/native/resources/ov-128.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-128.png
rename to tools/outlineviewer/src/main/native/resources/ov-128.png
diff --git a/outlineviewer/src/main/native/resources/ov-16.png b/tools/outlineviewer/src/main/native/resources/ov-16.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-16.png
rename to tools/outlineviewer/src/main/native/resources/ov-16.png
diff --git a/outlineviewer/src/main/native/resources/ov-256.png b/tools/outlineviewer/src/main/native/resources/ov-256.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-256.png
rename to tools/outlineviewer/src/main/native/resources/ov-256.png
diff --git a/outlineviewer/src/main/native/resources/ov-32.png b/tools/outlineviewer/src/main/native/resources/ov-32.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-32.png
rename to tools/outlineviewer/src/main/native/resources/ov-32.png
diff --git a/outlineviewer/src/main/native/resources/ov-48.png b/tools/outlineviewer/src/main/native/resources/ov-48.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-48.png
rename to tools/outlineviewer/src/main/native/resources/ov-48.png
diff --git a/outlineviewer/src/main/native/resources/ov-512.png b/tools/outlineviewer/src/main/native/resources/ov-512.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-512.png
rename to tools/outlineviewer/src/main/native/resources/ov-512.png
diff --git a/outlineviewer/src/main/native/resources/ov-64.png b/tools/outlineviewer/src/main/native/resources/ov-64.png
similarity index 100%
rename from outlineviewer/src/main/native/resources/ov-64.png
rename to tools/outlineviewer/src/main/native/resources/ov-64.png
diff --git a/outlineviewer/src/main/native/win/outlineviewer.ico b/tools/outlineviewer/src/main/native/win/outlineviewer.ico
similarity index 100%
rename from outlineviewer/src/main/native/win/outlineviewer.ico
rename to tools/outlineviewer/src/main/native/win/outlineviewer.ico
diff --git a/outlineviewer/src/main/native/win/outlineviewer.rc b/tools/outlineviewer/src/main/native/win/outlineviewer.rc
similarity index 100%
rename from outlineviewer/src/main/native/win/outlineviewer.rc
rename to tools/outlineviewer/src/main/native/win/outlineviewer.rc
diff --git a/processstarter/BUILD.bazel b/tools/processstarter/BUILD.bazel
similarity index 100%
rename from processstarter/BUILD.bazel
rename to tools/processstarter/BUILD.bazel
diff --git a/processstarter/build.gradle b/tools/processstarter/build.gradle
similarity index 100%
rename from processstarter/build.gradle
rename to tools/processstarter/build.gradle
diff --git a/processstarter/publish.gradle b/tools/processstarter/publish.gradle
similarity index 100%
rename from processstarter/publish.gradle
rename to tools/processstarter/publish.gradle
diff --git a/processstarter/src/main/native/linux/main.cpp b/tools/processstarter/src/main/native/linux/main.cpp
similarity index 100%
rename from processstarter/src/main/native/linux/main.cpp
rename to tools/processstarter/src/main/native/linux/main.cpp
diff --git a/processstarter/src/main/native/linux/main.h b/tools/processstarter/src/main/native/linux/main.h
similarity index 100%
rename from processstarter/src/main/native/linux/main.h
rename to tools/processstarter/src/main/native/linux/main.h
diff --git a/processstarter/src/main/native/osx/main.h b/tools/processstarter/src/main/native/osx/main.h
similarity index 100%
rename from processstarter/src/main/native/osx/main.h
rename to tools/processstarter/src/main/native/osx/main.h
diff --git a/processstarter/src/main/native/osx/main.mm b/tools/processstarter/src/main/native/osx/main.mm
similarity index 100%
rename from processstarter/src/main/native/osx/main.mm
rename to tools/processstarter/src/main/native/osx/main.mm
diff --git a/processstarter/src/main/native/windows/main.cpp b/tools/processstarter/src/main/native/windows/main.cpp
similarity index 100%
rename from processstarter/src/main/native/windows/main.cpp
rename to tools/processstarter/src/main/native/windows/main.cpp
diff --git a/processstarter/src/main/native/windows/main.h b/tools/processstarter/src/main/native/windows/main.h
similarity index 100%
rename from processstarter/src/main/native/windows/main.h
rename to tools/processstarter/src/main/native/windows/main.h
diff --git a/sysid/.styleguide b/tools/sysid/.styleguide
similarity index 100%
rename from sysid/.styleguide
rename to tools/sysid/.styleguide
diff --git a/sysid/BUILD.bazel b/tools/sysid/BUILD.bazel
similarity index 100%
rename from sysid/BUILD.bazel
rename to tools/sysid/BUILD.bazel
diff --git a/sysid/CMakeLists.txt b/tools/sysid/CMakeLists.txt
similarity index 100%
rename from sysid/CMakeLists.txt
rename to tools/sysid/CMakeLists.txt
diff --git a/sysid/Info.plist b/tools/sysid/Info.plist
similarity index 100%
rename from sysid/Info.plist
rename to tools/sysid/Info.plist
diff --git a/sysid/README.md b/tools/sysid/README.md
similarity index 100%
rename from sysid/README.md
rename to tools/sysid/README.md
diff --git a/sysid/build.gradle b/tools/sysid/build.gradle
similarity index 100%
rename from sysid/build.gradle
rename to tools/sysid/build.gradle
diff --git a/sysid/docs/data-collection.md b/tools/sysid/docs/data-collection.md
similarity index 100%
rename from sysid/docs/data-collection.md
rename to tools/sysid/docs/data-collection.md
diff --git a/sysid/docs/ols-derivations.md b/tools/sysid/docs/ols-derivations.md
similarity index 100%
rename from sysid/docs/ols-derivations.md
rename to tools/sysid/docs/ols-derivations.md
diff --git a/sysid/publish.gradle b/tools/sysid/publish.gradle
similarity index 100%
rename from sysid/publish.gradle
rename to tools/sysid/publish.gradle
diff --git a/sysid/src/main/generate/WPILibVersion.cpp.in b/tools/sysid/src/main/generate/WPILibVersion.cpp.in
similarity index 100%
rename from sysid/src/main/generate/WPILibVersion.cpp.in
rename to tools/sysid/src/main/generate/WPILibVersion.cpp.in
diff --git a/sysid/src/main/native/cpp/App.cpp b/tools/sysid/src/main/native/cpp/App.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/App.cpp
rename to tools/sysid/src/main/native/cpp/App.cpp
diff --git a/sysid/src/main/native/cpp/Main.cpp b/tools/sysid/src/main/native/cpp/Main.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/Main.cpp
rename to tools/sysid/src/main/native/cpp/Main.cpp
diff --git a/sysid/src/main/native/cpp/Util.cpp b/tools/sysid/src/main/native/cpp/Util.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/Util.cpp
rename to tools/sysid/src/main/native/cpp/Util.cpp
diff --git a/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp b/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
rename to tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
diff --git a/sysid/src/main/native/cpp/analysis/ArmSim.cpp b/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/ArmSim.cpp
rename to tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp
diff --git a/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp b/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/ElevatorSim.cpp
rename to tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp
diff --git a/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp b/tools/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp
rename to tools/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp
diff --git a/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp b/tools/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
rename to tools/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
diff --git a/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp b/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
rename to tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
diff --git a/sysid/src/main/native/cpp/analysis/OLS.cpp b/tools/sysid/src/main/native/cpp/analysis/OLS.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/OLS.cpp
rename to tools/sysid/src/main/native/cpp/analysis/OLS.cpp
diff --git a/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp b/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp
rename to tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp
diff --git a/sysid/src/main/native/cpp/view/Analyzer.cpp b/tools/sysid/src/main/native/cpp/view/Analyzer.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/view/Analyzer.cpp
rename to tools/sysid/src/main/native/cpp/view/Analyzer.cpp
diff --git a/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp b/tools/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
rename to tools/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
diff --git a/sysid/src/main/native/cpp/view/DataSelector.cpp b/tools/sysid/src/main/native/cpp/view/DataSelector.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/view/DataSelector.cpp
rename to tools/sysid/src/main/native/cpp/view/DataSelector.cpp
diff --git a/sysid/src/main/native/cpp/view/LogLoader.cpp b/tools/sysid/src/main/native/cpp/view/LogLoader.cpp
similarity index 100%
rename from sysid/src/main/native/cpp/view/LogLoader.cpp
rename to tools/sysid/src/main/native/cpp/view/LogLoader.cpp
diff --git a/sysid/src/main/native/include/sysid/Util.h b/tools/sysid/src/main/native/include/sysid/Util.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/Util.h
rename to tools/sysid/src/main/native/include/sysid/Util.h
diff --git a/sysid/src/main/native/include/sysid/analysis/AnalysisManager.h b/tools/sysid/src/main/native/include/sysid/analysis/AnalysisManager.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/AnalysisManager.h
rename to tools/sysid/src/main/native/include/sysid/analysis/AnalysisManager.h
diff --git a/sysid/src/main/native/include/sysid/analysis/AnalysisType.h b/tools/sysid/src/main/native/include/sysid/analysis/AnalysisType.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/AnalysisType.h
rename to tools/sysid/src/main/native/include/sysid/analysis/AnalysisType.h
diff --git a/sysid/src/main/native/include/sysid/analysis/ArmSim.h b/tools/sysid/src/main/native/include/sysid/analysis/ArmSim.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/ArmSim.h
rename to tools/sysid/src/main/native/include/sysid/analysis/ArmSim.h
diff --git a/sysid/src/main/native/include/sysid/analysis/ElevatorSim.h b/tools/sysid/src/main/native/include/sysid/analysis/ElevatorSim.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/ElevatorSim.h
rename to tools/sysid/src/main/native/include/sysid/analysis/ElevatorSim.h
diff --git a/sysid/src/main/native/include/sysid/analysis/FeedbackAnalysis.h b/tools/sysid/src/main/native/include/sysid/analysis/FeedbackAnalysis.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/FeedbackAnalysis.h
rename to tools/sysid/src/main/native/include/sysid/analysis/FeedbackAnalysis.h
diff --git a/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h b/tools/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h
rename to tools/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h
diff --git a/sysid/src/main/native/include/sysid/analysis/FeedforwardAnalysis.h b/tools/sysid/src/main/native/include/sysid/analysis/FeedforwardAnalysis.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/FeedforwardAnalysis.h
rename to tools/sysid/src/main/native/include/sysid/analysis/FeedforwardAnalysis.h
diff --git a/sysid/src/main/native/include/sysid/analysis/FilteringUtils.h b/tools/sysid/src/main/native/include/sysid/analysis/FilteringUtils.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/FilteringUtils.h
rename to tools/sysid/src/main/native/include/sysid/analysis/FilteringUtils.h
diff --git a/sysid/src/main/native/include/sysid/analysis/OLS.h b/tools/sysid/src/main/native/include/sysid/analysis/OLS.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/OLS.h
rename to tools/sysid/src/main/native/include/sysid/analysis/OLS.h
diff --git a/sysid/src/main/native/include/sysid/analysis/SimpleMotorSim.h b/tools/sysid/src/main/native/include/sysid/analysis/SimpleMotorSim.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/SimpleMotorSim.h
rename to tools/sysid/src/main/native/include/sysid/analysis/SimpleMotorSim.h
diff --git a/sysid/src/main/native/include/sysid/analysis/Storage.h b/tools/sysid/src/main/native/include/sysid/analysis/Storage.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/Storage.h
rename to tools/sysid/src/main/native/include/sysid/analysis/Storage.h
diff --git a/sysid/src/main/native/include/sysid/analysis/TrackwidthAnalysis.h b/tools/sysid/src/main/native/include/sysid/analysis/TrackwidthAnalysis.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/analysis/TrackwidthAnalysis.h
rename to tools/sysid/src/main/native/include/sysid/analysis/TrackwidthAnalysis.h
diff --git a/sysid/src/main/native/include/sysid/view/Analyzer.h b/tools/sysid/src/main/native/include/sysid/view/Analyzer.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/view/Analyzer.h
rename to tools/sysid/src/main/native/include/sysid/view/Analyzer.h
diff --git a/sysid/src/main/native/include/sysid/view/AnalyzerPlot.h b/tools/sysid/src/main/native/include/sysid/view/AnalyzerPlot.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/view/AnalyzerPlot.h
rename to tools/sysid/src/main/native/include/sysid/view/AnalyzerPlot.h
diff --git a/sysid/src/main/native/include/sysid/view/DataSelector.h b/tools/sysid/src/main/native/include/sysid/view/DataSelector.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/view/DataSelector.h
rename to tools/sysid/src/main/native/include/sysid/view/DataSelector.h
diff --git a/sysid/src/main/native/include/sysid/view/LogLoader.h b/tools/sysid/src/main/native/include/sysid/view/LogLoader.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/view/LogLoader.h
rename to tools/sysid/src/main/native/include/sysid/view/LogLoader.h
diff --git a/sysid/src/main/native/include/sysid/view/UILayout.h b/tools/sysid/src/main/native/include/sysid/view/UILayout.h
similarity index 100%
rename from sysid/src/main/native/include/sysid/view/UILayout.h
rename to tools/sysid/src/main/native/include/sysid/view/UILayout.h
diff --git a/sysid/src/main/native/mac/sysid.icns b/tools/sysid/src/main/native/mac/sysid.icns
similarity index 100%
rename from sysid/src/main/native/mac/sysid.icns
rename to tools/sysid/src/main/native/mac/sysid.icns
diff --git a/sysid/src/main/native/resources/sysid-128.png b/tools/sysid/src/main/native/resources/sysid-128.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-128.png
rename to tools/sysid/src/main/native/resources/sysid-128.png
diff --git a/sysid/src/main/native/resources/sysid-16.png b/tools/sysid/src/main/native/resources/sysid-16.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-16.png
rename to tools/sysid/src/main/native/resources/sysid-16.png
diff --git a/sysid/src/main/native/resources/sysid-256.png b/tools/sysid/src/main/native/resources/sysid-256.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-256.png
rename to tools/sysid/src/main/native/resources/sysid-256.png
diff --git a/sysid/src/main/native/resources/sysid-32.png b/tools/sysid/src/main/native/resources/sysid-32.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-32.png
rename to tools/sysid/src/main/native/resources/sysid-32.png
diff --git a/sysid/src/main/native/resources/sysid-48.png b/tools/sysid/src/main/native/resources/sysid-48.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-48.png
rename to tools/sysid/src/main/native/resources/sysid-48.png
diff --git a/sysid/src/main/native/resources/sysid-512.png b/tools/sysid/src/main/native/resources/sysid-512.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-512.png
rename to tools/sysid/src/main/native/resources/sysid-512.png
diff --git a/sysid/src/main/native/resources/sysid-64.png b/tools/sysid/src/main/native/resources/sysid-64.png
similarity index 100%
rename from sysid/src/main/native/resources/sysid-64.png
rename to tools/sysid/src/main/native/resources/sysid-64.png
diff --git a/sysid/src/main/native/win/sysid.ico b/tools/sysid/src/main/native/win/sysid.ico
similarity index 100%
rename from sysid/src/main/native/win/sysid.ico
rename to tools/sysid/src/main/native/win/sysid.ico
diff --git a/sysid/src/main/native/win/sysid.rc b/tools/sysid/src/main/native/win/sysid.rc
similarity index 100%
rename from sysid/src/main/native/win/sysid.rc
rename to tools/sysid/src/main/native/win/sysid.rc
diff --git a/sysid/src/test/native/cpp/Main.cpp b/tools/sysid/src/test/native/cpp/Main.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/Main.cpp
rename to tools/sysid/src/test/native/cpp/Main.cpp
diff --git a/sysid/src/test/native/cpp/analysis/AnalysisTypeTest.cpp b/tools/sysid/src/test/native/cpp/analysis/AnalysisTypeTest.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/analysis/AnalysisTypeTest.cpp
rename to tools/sysid/src/test/native/cpp/analysis/AnalysisTypeTest.cpp
diff --git a/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp b/tools/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp
rename to tools/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp
diff --git a/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp b/tools/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp
rename to tools/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp
diff --git a/sysid/src/test/native/cpp/analysis/FilterTest.cpp b/tools/sysid/src/test/native/cpp/analysis/FilterTest.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/analysis/FilterTest.cpp
rename to tools/sysid/src/test/native/cpp/analysis/FilterTest.cpp
diff --git a/sysid/src/test/native/cpp/analysis/OLSTest.cpp b/tools/sysid/src/test/native/cpp/analysis/OLSTest.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/analysis/OLSTest.cpp
rename to tools/sysid/src/test/native/cpp/analysis/OLSTest.cpp
diff --git a/sysid/src/test/native/cpp/analysis/TrackwidthAnalysisTest.cpp b/tools/sysid/src/test/native/cpp/analysis/TrackwidthAnalysisTest.cpp
similarity index 100%
rename from sysid/src/test/native/cpp/analysis/TrackwidthAnalysisTest.cpp
rename to tools/sysid/src/test/native/cpp/analysis/TrackwidthAnalysisTest.cpp
diff --git a/wpical/.styleguide b/tools/wpical/.styleguide
similarity index 100%
rename from wpical/.styleguide
rename to tools/wpical/.styleguide
diff --git a/wpical/BUILD.bazel b/tools/wpical/BUILD.bazel
similarity index 100%
rename from wpical/BUILD.bazel
rename to tools/wpical/BUILD.bazel
diff --git a/wpical/CMakeLists.txt b/tools/wpical/CMakeLists.txt
similarity index 100%
rename from wpical/CMakeLists.txt
rename to tools/wpical/CMakeLists.txt
diff --git a/wpical/Info.plist b/tools/wpical/Info.plist
similarity index 100%
rename from wpical/Info.plist
rename to tools/wpical/Info.plist
diff --git a/wpical/WPICalThirdPartyNotices.txt b/tools/wpical/WPICalThirdPartyNotices.txt
similarity index 100%
rename from wpical/WPICalThirdPartyNotices.txt
rename to tools/wpical/WPICalThirdPartyNotices.txt
diff --git a/wpical/build.gradle b/tools/wpical/build.gradle
similarity index 100%
rename from wpical/build.gradle
rename to tools/wpical/build.gradle
diff --git a/wpical/generate_mrcal.py b/tools/wpical/generate_mrcal.py
similarity index 100%
rename from wpical/generate_mrcal.py
rename to tools/wpical/generate_mrcal.py
diff --git a/wpical/publish.gradle b/tools/wpical/publish.gradle
similarity index 100%
rename from wpical/publish.gradle
rename to tools/wpical/publish.gradle
diff --git a/wpical/src/main/generate/WPILibVersion.cpp.in b/tools/wpical/src/main/generate/WPILibVersion.cpp.in
similarity index 100%
rename from wpical/src/main/generate/WPILibVersion.cpp.in
rename to tools/wpical/src/main/generate/WPILibVersion.cpp.in
diff --git a/wpical/src/main/native/assets/2024-crescendo.json b/tools/wpical/src/main/native/assets/2024-crescendo.json
similarity index 100%
rename from wpical/src/main/native/assets/2024-crescendo.json
rename to tools/wpical/src/main/native/assets/2024-crescendo.json
diff --git a/wpical/src/main/native/assets/altfieldvideo/long.avi b/tools/wpical/src/main/native/assets/altfieldvideo/long.avi
similarity index 100%
rename from wpical/src/main/native/assets/altfieldvideo/long.avi
rename to tools/wpical/src/main/native/assets/altfieldvideo/long.avi
diff --git a/wpical/src/main/native/assets/altfieldvideo/short.avi b/tools/wpical/src/main/native/assets/altfieldvideo/short.avi
similarity index 100%
rename from wpical/src/main/native/assets/altfieldvideo/short.avi
rename to tools/wpical/src/main/native/assets/altfieldvideo/short.avi
diff --git a/wpical/src/main/native/assets/fieldvideo/long.mp4 b/tools/wpical/src/main/native/assets/fieldvideo/long.mp4
similarity index 100%
rename from wpical/src/main/native/assets/fieldvideo/long.mp4
rename to tools/wpical/src/main/native/assets/fieldvideo/long.mp4
diff --git a/wpical/src/main/native/assets/fieldvideo/short.mp4 b/tools/wpical/src/main/native/assets/fieldvideo/short.mp4
similarity index 100%
rename from wpical/src/main/native/assets/fieldvideo/short.mp4
rename to tools/wpical/src/main/native/assets/fieldvideo/short.mp4
diff --git a/wpical/src/main/native/assets/lifecam_1280p_10x10.vnl b/tools/wpical/src/main/native/assets/lifecam_1280p_10x10.vnl
similarity index 100%
rename from wpical/src/main/native/assets/lifecam_1280p_10x10.vnl
rename to tools/wpical/src/main/native/assets/lifecam_1280p_10x10.vnl
diff --git a/wpical/src/main/native/assets/testcalibration.avi b/tools/wpical/src/main/native/assets/testcalibration.avi
similarity index 100%
rename from wpical/src/main/native/assets/testcalibration.avi
rename to tools/wpical/src/main/native/assets/testcalibration.avi
diff --git a/wpical/src/main/native/assets/testcalibration.mp4 b/tools/wpical/src/main/native/assets/testcalibration.mp4
similarity index 100%
rename from wpical/src/main/native/assets/testcalibration.mp4
rename to tools/wpical/src/main/native/assets/testcalibration.mp4
diff --git a/wpical/src/main/native/cpp/WPIcal.cpp b/tools/wpical/src/main/native/cpp/WPIcal.cpp
similarity index 100%
rename from wpical/src/main/native/cpp/WPIcal.cpp
rename to tools/wpical/src/main/native/cpp/WPIcal.cpp
diff --git a/wpical/src/main/native/cpp/cameracalibration.cpp b/tools/wpical/src/main/native/cpp/cameracalibration.cpp
similarity index 100%
rename from wpical/src/main/native/cpp/cameracalibration.cpp
rename to tools/wpical/src/main/native/cpp/cameracalibration.cpp
diff --git a/wpical/src/main/native/cpp/fieldcalibration.cpp b/tools/wpical/src/main/native/cpp/fieldcalibration.cpp
similarity index 100%
rename from wpical/src/main/native/cpp/fieldcalibration.cpp
rename to tools/wpical/src/main/native/cpp/fieldcalibration.cpp
diff --git a/wpical/src/main/native/cpp/fmap.cpp b/tools/wpical/src/main/native/cpp/fmap.cpp
similarity index 100%
rename from wpical/src/main/native/cpp/fmap.cpp
rename to tools/wpical/src/main/native/cpp/fmap.cpp
diff --git a/wpical/src/main/native/cpp/tagpose.cpp b/tools/wpical/src/main/native/cpp/tagpose.cpp
similarity index 100%
rename from wpical/src/main/native/cpp/tagpose.cpp
rename to tools/wpical/src/main/native/cpp/tagpose.cpp
diff --git a/wpical/src/main/native/include/cameracalibration.h b/tools/wpical/src/main/native/include/cameracalibration.h
similarity index 100%
rename from wpical/src/main/native/include/cameracalibration.h
rename to tools/wpical/src/main/native/include/cameracalibration.h
diff --git a/wpical/src/main/native/include/fieldcalibration.h b/tools/wpical/src/main/native/include/fieldcalibration.h
similarity index 100%
rename from wpical/src/main/native/include/fieldcalibration.h
rename to tools/wpical/src/main/native/include/fieldcalibration.h
diff --git a/wpical/src/main/native/include/fieldmap.h b/tools/wpical/src/main/native/include/fieldmap.h
similarity index 100%
rename from wpical/src/main/native/include/fieldmap.h
rename to tools/wpical/src/main/native/include/fieldmap.h
diff --git a/wpical/src/main/native/include/fmap.h b/tools/wpical/src/main/native/include/fmap.h
similarity index 100%
rename from wpical/src/main/native/include/fmap.h
rename to tools/wpical/src/main/native/include/fmap.h
diff --git a/wpical/src/main/native/include/tagpose.h b/tools/wpical/src/main/native/include/tagpose.h
similarity index 100%
rename from wpical/src/main/native/include/tagpose.h
rename to tools/wpical/src/main/native/include/tagpose.h
diff --git a/wpical/src/main/native/mac/wpical.icns b/tools/wpical/src/main/native/mac/wpical.icns
similarity index 100%
rename from wpical/src/main/native/mac/wpical.icns
rename to tools/wpical/src/main/native/mac/wpical.icns
diff --git a/wpical/src/main/native/resources/wpical-128.png b/tools/wpical/src/main/native/resources/wpical-128.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-128.png
rename to tools/wpical/src/main/native/resources/wpical-128.png
diff --git a/wpical/src/main/native/resources/wpical-16.png b/tools/wpical/src/main/native/resources/wpical-16.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-16.png
rename to tools/wpical/src/main/native/resources/wpical-16.png
diff --git a/wpical/src/main/native/resources/wpical-256.png b/tools/wpical/src/main/native/resources/wpical-256.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-256.png
rename to tools/wpical/src/main/native/resources/wpical-256.png
diff --git a/wpical/src/main/native/resources/wpical-32.png b/tools/wpical/src/main/native/resources/wpical-32.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-32.png
rename to tools/wpical/src/main/native/resources/wpical-32.png
diff --git a/wpical/src/main/native/resources/wpical-48.png b/tools/wpical/src/main/native/resources/wpical-48.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-48.png
rename to tools/wpical/src/main/native/resources/wpical-48.png
diff --git a/wpical/src/main/native/resources/wpical-512.png b/tools/wpical/src/main/native/resources/wpical-512.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-512.png
rename to tools/wpical/src/main/native/resources/wpical-512.png
diff --git a/wpical/src/main/native/resources/wpical-64.png b/tools/wpical/src/main/native/resources/wpical-64.png
similarity index 100%
rename from wpical/src/main/native/resources/wpical-64.png
rename to tools/wpical/src/main/native/resources/wpical-64.png
diff --git a/wpical/src/main/native/thirdparty/libdogleg/include/dogleg.h b/tools/wpical/src/main/native/thirdparty/libdogleg/include/dogleg.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/libdogleg/include/dogleg.h
rename to tools/wpical/src/main/native/thirdparty/libdogleg/include/dogleg.h
diff --git a/wpical/src/main/native/thirdparty/libdogleg/src/dogleg.cpp b/tools/wpical/src/main/native/thirdparty/libdogleg/src/dogleg.cpp
similarity index 100%
rename from wpical/src/main/native/thirdparty/libdogleg/src/dogleg.cpp
rename to tools/wpical/src/main/native/thirdparty/libdogleg/src/dogleg.cpp
diff --git a/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h b/tools/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/autodiff.hh b/tools/wpical/src/main/native/thirdparty/mrcal/include/autodiff.hh
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/autodiff.hh
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/autodiff.hh
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/basic-geometry.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/basic-geometry.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/basic-geometry.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/basic-geometry.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/cahvore.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/cahvore.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/cahvore.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/cahvore.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath-extra.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath-extra.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath-extra.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath-extra.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/minimath/minimath.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-image.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal-image.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/mrcal-image.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal-image.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal-internal.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal-types.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/mrcal.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/mrcal.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/mrcal.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/poseutils.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/poseutils.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/poseutils.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/poseutils.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/scales.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/scales.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/scales.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/scales.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/stereo.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/stereo.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/stereo.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/stereo.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/strides.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/strides.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/strides.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/strides.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/triangulation.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/triangulation.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/triangulation.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/triangulation.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/include/util.h b/tools/wpical/src/main/native/thirdparty/mrcal/include/util.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/include/util.h
rename to tools/wpical/src/main/native/thirdparty/mrcal/include/util.h
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/cahvore.cpp b/tools/wpical/src/main/native/thirdparty/mrcal/src/cahvore.cpp
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/cahvore.cpp
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/cahvore.cpp
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/minimath/minimath_generate.pl b/tools/wpical/src/main/native/thirdparty/mrcal/src/minimath/minimath_generate.pl
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/minimath/minimath_generate.pl
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/minimath/minimath_generate.pl
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/mrcal.cpp b/tools/wpical/src/main/native/thirdparty/mrcal/src/mrcal.cpp
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/mrcal.cpp
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/mrcal.cpp
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/opencv.c b/tools/wpical/src/main/native/thirdparty/mrcal/src/opencv.c
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/opencv.c
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/opencv.c
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/poseutils-opencv.c b/tools/wpical/src/main/native/thirdparty/mrcal/src/poseutils-opencv.c
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/poseutils-opencv.c
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/poseutils-opencv.c
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/poseutils-uses-autodiff.cpp b/tools/wpical/src/main/native/thirdparty/mrcal/src/poseutils-uses-autodiff.cpp
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/poseutils-uses-autodiff.cpp
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/poseutils-uses-autodiff.cpp
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/poseutils.c b/tools/wpical/src/main/native/thirdparty/mrcal/src/poseutils.c
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/poseutils.c
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/poseutils.c
diff --git a/wpical/src/main/native/thirdparty/mrcal/src/triangulation.cpp b/tools/wpical/src/main/native/thirdparty/mrcal/src/triangulation.cpp
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal/src/triangulation.cpp
rename to tools/wpical/src/main/native/thirdparty/mrcal/src/triangulation.cpp
diff --git a/wpical/src/main/native/thirdparty/mrcal_java/include/mrcal_wrapper.h b/tools/wpical/src/main/native/thirdparty/mrcal_java/include/mrcal_wrapper.h
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal_java/include/mrcal_wrapper.h
rename to tools/wpical/src/main/native/thirdparty/mrcal_java/include/mrcal_wrapper.h
diff --git a/wpical/src/main/native/thirdparty/mrcal_java/src/mrcal_wrapper.cpp b/tools/wpical/src/main/native/thirdparty/mrcal_java/src/mrcal_wrapper.cpp
similarity index 100%
rename from wpical/src/main/native/thirdparty/mrcal_java/src/mrcal_wrapper.cpp
rename to tools/wpical/src/main/native/thirdparty/mrcal_java/src/mrcal_wrapper.cpp
diff --git a/wpical/src/main/native/win/wpical.ico b/tools/wpical/src/main/native/win/wpical.ico
similarity index 100%
rename from wpical/src/main/native/win/wpical.ico
rename to tools/wpical/src/main/native/win/wpical.ico
diff --git a/wpical/src/main/native/win/wpical.rc b/tools/wpical/src/main/native/win/wpical.rc
similarity index 100%
rename from wpical/src/main/native/win/wpical.rc
rename to tools/wpical/src/main/native/win/wpical.rc
diff --git a/wpical/src/test/native/cpp/bazel_path_lookup.cpp b/tools/wpical/src/test/native/cpp/bazel_path_lookup.cpp
similarity index 100%
rename from wpical/src/test/native/cpp/bazel_path_lookup.cpp
rename to tools/wpical/src/test/native/cpp/bazel_path_lookup.cpp
diff --git a/wpical/src/test/native/cpp/main.cpp b/tools/wpical/src/test/native/cpp/main.cpp
similarity index 100%
rename from wpical/src/test/native/cpp/main.cpp
rename to tools/wpical/src/test/native/cpp/main.cpp
diff --git a/wpical/src/test/native/cpp/path_lookup.h b/tools/wpical/src/test/native/cpp/path_lookup.h
similarity index 100%
rename from wpical/src/test/native/cpp/path_lookup.h
rename to tools/wpical/src/test/native/cpp/path_lookup.h
diff --git a/wpical/src/test/native/cpp/test_calibrate.cpp b/tools/wpical/src/test/native/cpp/test_calibrate.cpp
similarity index 100%
rename from wpical/src/test/native/cpp/test_calibrate.cpp
rename to tools/wpical/src/test/native/cpp/test_calibrate.cpp
diff --git a/wpical/src/test/native/cpp/test_result_is_exact.cpp b/tools/wpical/src/test/native/cpp/test_result_is_exact.cpp
similarity index 100%
rename from wpical/src/test/native/cpp/test_result_is_exact.cpp
rename to tools/wpical/src/test/native/cpp/test_result_is_exact.cpp