diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2022-rapidreact.json b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2022-rapidreact.json
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2022-rapidreact.json
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2022-rapidreact.json
diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2023-chargedup.json b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2023-chargedup.json
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2023-chargedup.json
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2023-chargedup.json
diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2024-crescendo.json b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2024-crescendo.json
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2024-crescendo.json
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2024-crescendo.json
diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-andymark.csv b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-andymark.csv
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-andymark.csv
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-andymark.csv
diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-andymark.json b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-andymark.json
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-andymark.json
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-andymark.json
diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-welded.csv b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-welded.csv
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-welded.csv
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-welded.csv
diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-welded.json b/apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-welded.json
similarity index 100%
rename from apriltag/src/main/native/resources/edu/wpi/first/apriltag/2025-reefscape-welded.json
rename to apriltag/src/main/native/resources/org/wpilib/vision/apriltag/2025-reefscape-welded.json
diff --git a/apriltag/src/test/resources/edu/wpi/first/apriltag/tag1_640_480.jpg b/apriltag/src/test/resources/org/wpilib/vision/apriltag/tag1_640_480.jpg
similarity index 100%
rename from apriltag/src/test/resources/edu/wpi/first/apriltag/tag1_640_480.jpg
rename to apriltag/src/test/resources/org/wpilib/vision/apriltag/tag1_640_480.jpg
diff --git a/apriltag/src/test/resources/edu/wpi/first/apriltag/tag2_16h5_straight.png b/apriltag/src/test/resources/org/wpilib/vision/apriltag/tag2_16h5_straight.png
similarity index 100%
rename from apriltag/src/test/resources/edu/wpi/first/apriltag/tag2_16h5_straight.png
rename to apriltag/src/test/resources/org/wpilib/vision/apriltag/tag2_16h5_straight.png
diff --git a/apriltag/src/test/resources/edu/wpi/first/apriltag/tag2_45deg_X.png b/apriltag/src/test/resources/org/wpilib/vision/apriltag/tag2_45deg_X.png
similarity index 100%
rename from apriltag/src/test/resources/edu/wpi/first/apriltag/tag2_45deg_X.png
rename to apriltag/src/test/resources/org/wpilib/vision/apriltag/tag2_45deg_X.png
diff --git a/apriltag/src/test/resources/edu/wpi/first/apriltag/tag2_45deg_y.png b/apriltag/src/test/resources/org/wpilib/vision/apriltag/tag2_45deg_y.png
similarity index 100%
rename from apriltag/src/test/resources/edu/wpi/first/apriltag/tag2_45deg_y.png
rename to apriltag/src/test/resources/org/wpilib/vision/apriltag/tag2_45deg_y.png
diff --git a/commandsv2/wpilibnewcommands-config.cmake.in b/commandsv2/commandsv2-config.cmake.in
similarity index 100%
rename from commandsv2/wpilibnewcommands-config.cmake.in
rename to commandsv2/commandsv2-config.cmake.in
diff --git a/commandsv2/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja b/commandsv2/src/generate/main/native/cpp/wpi/commands2/button/commandhid.cpp.jinja
similarity index 100%
rename from commandsv2/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja
rename to commandsv2/src/generate/main/native/cpp/wpi/commands2/button/commandhid.cpp.jinja
diff --git a/commandsv2/src/generate/main/native/include/frc2/command/button/commandhid.h.jinja b/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja
similarity index 100%
rename from commandsv2/src/generate/main/native/include/frc2/command/button/commandhid.h.jinja
rename to commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja
diff --git a/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS4Controller.cpp b/commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS4Controller.cpp
similarity index 100%
rename from commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS4Controller.cpp
rename to commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS4Controller.cpp
diff --git a/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS5Controller.cpp b/commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS5Controller.cpp
similarity index 100%
rename from commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandPS5Controller.cpp
rename to commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS5Controller.cpp
diff --git a/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandStadiaController.cpp b/commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandStadiaController.cpp
similarity index 100%
rename from commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandStadiaController.cpp
rename to commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandStadiaController.cpp
diff --git a/commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandXboxController.cpp b/commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandXboxController.cpp
similarity index 100%
rename from commandsv2/src/generated/main/native/cpp/frc2/command/button/CommandXboxController.cpp
rename to commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandXboxController.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/AddRequirementsTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/AddRequirementsTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandPtrTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.hpp b/commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.hpp
rename to commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.hpp b/commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.hpp
rename to commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ConditionalCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/ConditionalCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/DefaultCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/DefaultCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/DeferredCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/DeferredCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/DeferredCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/DeferredCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/FunctionalCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/FunctionalCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/InstantCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/InstantCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/InstantCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/InstantCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/POVButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/POVButtonTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ParallelDeadlineGroupTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/ParallelDeadlineGroupTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/PrintCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/PrintCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/ProxyCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/ProxyCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/RepeatCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/RepeatCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/RepeatCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/RepeatCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/RobotDisabledCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/RobotDisabledCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/RunCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/RunCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ScheduleCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/ScheduleCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/SchedulerTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/SchedulerTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/SelectCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SelectCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/SelectCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/WaitCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/WaitCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/button/RobotModeTriggersTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/button/RobotModeTriggersTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/button/TriggerTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/make_vector.hpp b/commandsv2/src/test/native/cpp/wpi/command/make_vector.hpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/make_vector.hpp
rename to commandsv2/src/test/native/cpp/wpi/command/make_vector.hpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
rename to commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp
diff --git a/fields/fieldimages-config.cmake.in b/fields/fields-config.cmake.in
similarity index 100%
rename from fields/fieldimages-config.cmake.in
rename to fields/fields-config.cmake.in
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2018-field.jpg b/fields/src/main/native/resources/org/wpilib/fields/2018-field.jpg
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2018-field.jpg
rename to fields/src/main/native/resources/org/wpilib/fields/2018-field.jpg
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json b/fields/src/main/native/resources/org/wpilib/fields/2018-powerup.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json
rename to fields/src/main/native/resources/org/wpilib/fields/2018-powerup.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json b/fields/src/main/native/resources/org/wpilib/fields/2019-deepspace.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json
rename to fields/src/main/native/resources/org/wpilib/fields/2019-deepspace.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2019-field.jpg b/fields/src/main/native/resources/org/wpilib/fields/2019-field.jpg
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2019-field.jpg
rename to fields/src/main/native/resources/org/wpilib/fields/2019-field.jpg
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2020-field.png b/fields/src/main/native/resources/org/wpilib/fields/2020-field.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2020-field.png
rename to fields/src/main/native/resources/org/wpilib/fields/2020-field.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json b/fields/src/main/native/resources/org/wpilib/fields/2020-infiniterecharge.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json
rename to fields/src/main/native/resources/org/wpilib/fields/2020-infiniterecharge.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-barrel.png b/fields/src/main/native/resources/org/wpilib/fields/2021-barrel.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-barrel.png
rename to fields/src/main/native/resources/org/wpilib/fields/2021-barrel.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json b/fields/src/main/native/resources/org/wpilib/fields/2021-barrelracingpath.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json
rename to fields/src/main/native/resources/org/wpilib/fields/2021-barrelracingpath.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-bounce.png b/fields/src/main/native/resources/org/wpilib/fields/2021-bounce.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-bounce.png
rename to fields/src/main/native/resources/org/wpilib/fields/2021-bounce.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json b/fields/src/main/native/resources/org/wpilib/fields/2021-bouncepath.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json
rename to fields/src/main/native/resources/org/wpilib/fields/2021-bouncepath.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-field.png b/fields/src/main/native/resources/org/wpilib/fields/2021-field.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-field.png
rename to fields/src/main/native/resources/org/wpilib/fields/2021-field.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json b/fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearcha.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json
rename to fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearcha.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.png b/fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearcha.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.png
rename to fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearcha.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json b/fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearchb.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json
rename to fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearchb.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.png b/fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearchb.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.png
rename to fields/src/main/native/resources/org/wpilib/fields/2021-galacticsearchb.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json b/fields/src/main/native/resources/org/wpilib/fields/2021-infiniterecharge.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json
rename to fields/src/main/native/resources/org/wpilib/fields/2021-infiniterecharge.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-slalom.png b/fields/src/main/native/resources/org/wpilib/fields/2021-slalom.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-slalom.png
rename to fields/src/main/native/resources/org/wpilib/fields/2021-slalom.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json b/fields/src/main/native/resources/org/wpilib/fields/2021-slalompath.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json
rename to fields/src/main/native/resources/org/wpilib/fields/2021-slalompath.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2022-field.png b/fields/src/main/native/resources/org/wpilib/fields/2022-field.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2022-field.png
rename to fields/src/main/native/resources/org/wpilib/fields/2022-field.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json b/fields/src/main/native/resources/org/wpilib/fields/2022-rapidreact.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json
rename to fields/src/main/native/resources/org/wpilib/fields/2022-rapidreact.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json b/fields/src/main/native/resources/org/wpilib/fields/2023-chargedup.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json
rename to fields/src/main/native/resources/org/wpilib/fields/2023-chargedup.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2023-field.png b/fields/src/main/native/resources/org/wpilib/fields/2023-field.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2023-field.png
rename to fields/src/main/native/resources/org/wpilib/fields/2023-field.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json b/fields/src/main/native/resources/org/wpilib/fields/2024-crescendo.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2024-crescendo.json
rename to fields/src/main/native/resources/org/wpilib/fields/2024-crescendo.json
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2024-field.png b/fields/src/main/native/resources/org/wpilib/fields/2024-field.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2024-field.png
rename to fields/src/main/native/resources/org/wpilib/fields/2024-field.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2025-field.png b/fields/src/main/native/resources/org/wpilib/fields/2025-field.png
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2025-field.png
rename to fields/src/main/native/resources/org/wpilib/fields/2025-field.png
diff --git a/fields/src/main/native/resources/edu/wpi/first/fields/2025-reefscape.json b/fields/src/main/native/resources/org/wpilib/fields/2025-reefscape.json
similarity index 100%
rename from fields/src/main/native/resources/edu/wpi/first/fields/2025-reefscape.json
rename to fields/src/main/native/resources/org/wpilib/fields/2025-reefscape.json
diff --git a/ntcore/src/generate/main/native/include/ntcore_cpp_types.h.jinja b/ntcore/src/generate/main/native/include/ntcore_cpp_types.hpp.jinja
similarity index 100%
rename from ntcore/src/generate/main/native/include/ntcore_cpp_types.h.jinja
rename to ntcore/src/generate/main/native/include/ntcore_cpp_types.hpp.jinja
diff --git a/ntcore/src/generate/main/native/include/networktables/Topic.h.jinja b/ntcore/src/generate/main/native/include/wpi/nt/Topic.hpp.jinja
similarity index 100%
rename from ntcore/src/generate/main/native/include/networktables/Topic.h.jinja
rename to ntcore/src/generate/main/native/include/wpi/nt/Topic.hpp.jinja
diff --git a/wpilibc/src/generate/main/native/include/frc/hid.h.jinja b/wpilibc/src/generate/main/native/include/wpi/driverstation/hid.hpp.jinja
similarity index 100%
rename from wpilibc/src/generate/main/native/include/frc/hid.h.jinja
rename to wpilibc/src/generate/main/native/include/wpi/driverstation/hid.hpp.jinja
diff --git a/wpilibc/src/generate/main/native/include/frc/motorcontroller/pwm_motor_controller.h.jinja b/wpilibc/src/generate/main/native/include/wpi/hardware/motor/pwm_motor_controller.hpp.jinja
similarity index 100%
rename from wpilibc/src/generate/main/native/include/frc/motorcontroller/pwm_motor_controller.h.jinja
rename to wpilibc/src/generate/main/native/include/wpi/hardware/motor/pwm_motor_controller.hpp.jinja
diff --git a/wpilibc/src/generate/main/native/include/frc/simulation/hidsim.h.jinja b/wpilibc/src/generate/main/native/include/wpi/simulation/hidsim.hpp.jinja
similarity index 100%
rename from wpilibc/src/generate/main/native/include/frc/simulation/hidsim.h.jinja
rename to wpilibc/src/generate/main/native/include/wpi/simulation/hidsim.hpp.jinja
diff --git a/wpilibj/src/test/resources/edu/wpi/first/wpilibj/PreferencesTestDefault.json b/wpilibj/src/test/resources/org/wpilib/util/PreferencesTestDefault.json
similarity index 100%
rename from wpilibj/src/test/resources/edu/wpi/first/wpilibj/PreferencesTestDefault.json
rename to wpilibj/src/test/resources/org/wpilib/util/PreferencesTestDefault.json