diff --git a/apriltag/src/dev/java/edu/wpi/first/apriltag/DevMain.java b/apriltag/src/dev/java/org/wpilib/vision/apriltag/DevMain.java
similarity index 100%
rename from apriltag/src/dev/java/edu/wpi/first/apriltag/DevMain.java
rename to apriltag/src/dev/java/org/wpilib/vision/apriltag/DevMain.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTag.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTag.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTag.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTag.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagDetection.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetection.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagDetection.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetection.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagDetector.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetector.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagDetector.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetector.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagFieldLayout.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFieldLayout.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagFieldLayout.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFieldLayout.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagFields.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFields.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagFields.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFields.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagPoseEstimate.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimate.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagPoseEstimate.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimate.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagPoseEstimator.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimator.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/AprilTagPoseEstimator.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimator.java
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/jni/AprilTagJNI.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/jni/AprilTagJNI.java
similarity index 100%
rename from apriltag/src/main/java/edu/wpi/first/apriltag/jni/AprilTagJNI.java
rename to apriltag/src/main/java/org/wpilib/vision/apriltag/jni/AprilTagJNI.java
diff --git a/apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagDetectorTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagDetectorTest.java
similarity index 100%
rename from apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagDetectorTest.java
rename to apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagDetectorTest.java
diff --git a/apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagGenerationTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagGenerationTest.java
similarity index 100%
rename from apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagGenerationTest.java
rename to apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagGenerationTest.java
diff --git a/apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagPoseSetOriginTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagPoseSetOriginTest.java
similarity index 100%
rename from apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagPoseSetOriginTest.java
rename to apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagPoseSetOriginTest.java
diff --git a/apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagSerializationTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagSerializationTest.java
similarity index 100%
rename from apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagSerializationTest.java
rename to apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagSerializationTest.java
diff --git a/apriltag/src/test/java/edu/wpi/first/apriltag/LoadConfigTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/LoadConfigTest.java
similarity index 100%
rename from apriltag/src/test/java/edu/wpi/first/apriltag/LoadConfigTest.java
rename to apriltag/src/test/java/org/wpilib/vision/apriltag/LoadConfigTest.java
diff --git a/cameraserver/src/dev/java/edu/wpi/first/cameraserver/DevMain.java b/cameraserver/src/dev/java/org/wpilib/vision/stream/DevMain.java
similarity index 100%
rename from cameraserver/src/dev/java/edu/wpi/first/cameraserver/DevMain.java
rename to cameraserver/src/dev/java/org/wpilib/vision/stream/DevMain.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/VisionPipeline.java b/cameraserver/src/main/java/org/wpilib/vision/process/VisionPipeline.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/vision/VisionPipeline.java
rename to cameraserver/src/main/java/org/wpilib/vision/process/VisionPipeline.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/VisionRunner.java b/cameraserver/src/main/java/org/wpilib/vision/process/VisionRunner.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/vision/VisionRunner.java
rename to cameraserver/src/main/java/org/wpilib/vision/process/VisionRunner.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/VisionThread.java b/cameraserver/src/main/java/org/wpilib/vision/process/VisionThread.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/vision/VisionThread.java
rename to cameraserver/src/main/java/org/wpilib/vision/process/VisionThread.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/package-info.java b/cameraserver/src/main/java/org/wpilib/vision/process/package-info.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/vision/package-info.java
rename to cameraserver/src/main/java/org/wpilib/vision/process/package-info.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServer.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
rename to cameraserver/src/main/java/org/wpilib/vision/stream/CameraServer.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServerShared.java b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerShared.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServerShared.java
rename to cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerShared.java
diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServerSharedStore.java b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerSharedStore.java
similarity index 100%
rename from cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServerSharedStore.java
rename to cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerSharedStore.java
diff --git a/commandsv2/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java b/commandsv2/src/dev/java/org/wpilib/commands2/DevMain.java
similarity index 100%
rename from commandsv2/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java
rename to commandsv2/src/dev/java/org/wpilib/commands2/DevMain.java
diff --git a/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS4Controller.java
similarity index 100%
rename from commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS4Controller.java
rename to commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS4Controller.java
diff --git a/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS5Controller.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS5Controller.java
similarity index 100%
rename from commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandPS5Controller.java
rename to commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS5Controller.java
diff --git a/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandStadiaController.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandStadiaController.java
similarity index 100%
rename from commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandStadiaController.java
rename to commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandStadiaController.java
diff --git a/commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandXboxController.java
similarity index 100%
rename from commandsv2/src/generated/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
rename to commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandXboxController.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Command.java b/commandsv2/src/main/java/org/wpilib/command2/Command.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Command.java
rename to commandsv2/src/main/java/org/wpilib/command2/Command.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java b/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java
rename to commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java b/commandsv2/src/main/java/org/wpilib/command2/Commands.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java
rename to commandsv2/src/main/java/org/wpilib/command2/Commands.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java b/commandsv2/src/main/java/org/wpilib/command2/ConditionalCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/ConditionalCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/DeferredCommand.java b/commandsv2/src/main/java/org/wpilib/command2/DeferredCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/DeferredCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/DeferredCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java b/commandsv2/src/main/java/org/wpilib/command2/FunctionalCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/FunctionalCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java b/commandsv2/src/main/java/org/wpilib/command2/InstantCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/InstantCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java b/commandsv2/src/main/java/org/wpilib/command2/NotifierCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/NotifierCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java b/commandsv2/src/main/java/org/wpilib/command2/ParallelCommandGroup.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java
rename to commandsv2/src/main/java/org/wpilib/command2/ParallelCommandGroup.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java b/commandsv2/src/main/java/org/wpilib/command2/ParallelDeadlineGroup.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java
rename to commandsv2/src/main/java/org/wpilib/command2/ParallelDeadlineGroup.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java b/commandsv2/src/main/java/org/wpilib/command2/ParallelRaceGroup.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java
rename to commandsv2/src/main/java/org/wpilib/command2/ParallelRaceGroup.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java b/commandsv2/src/main/java/org/wpilib/command2/PrintCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/PrintCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java b/commandsv2/src/main/java/org/wpilib/command2/ProxyCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/ProxyCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java b/commandsv2/src/main/java/org/wpilib/command2/RepeatCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RepeatCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/RepeatCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java b/commandsv2/src/main/java/org/wpilib/command2/RunCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/RunCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java b/commandsv2/src/main/java/org/wpilib/command2/ScheduleCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/ScheduleCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java b/commandsv2/src/main/java/org/wpilib/command2/SelectCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/SelectCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java b/commandsv2/src/main/java/org/wpilib/command2/SequentialCommandGroup.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java
rename to commandsv2/src/main/java/org/wpilib/command2/SequentialCommandGroup.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java b/commandsv2/src/main/java/org/wpilib/command2/StartEndCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/StartEndCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java b/commandsv2/src/main/java/org/wpilib/command2/Subsystem.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java
rename to commandsv2/src/main/java/org/wpilib/command2/Subsystem.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java b/commandsv2/src/main/java/org/wpilib/command2/SubsystemBase.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java
rename to commandsv2/src/main/java/org/wpilib/command2/SubsystemBase.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java b/commandsv2/src/main/java/org/wpilib/command2/WaitCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/WaitCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java b/commandsv2/src/main/java/org/wpilib/command2/WaitUntilCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/WaitUntilCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java b/commandsv2/src/main/java/org/wpilib/command2/WrapperCommand.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
rename to commandsv2/src/main/java/org/wpilib/command2/WrapperCommand.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGamepad.java b/commandsv2/src/main/java/org/wpilib/command2/button/CommandGamepad.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGamepad.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/CommandGamepad.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGenericHID.java b/commandsv2/src/main/java/org/wpilib/command2/button/CommandGenericHID.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandGenericHID.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/CommandGenericHID.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java b/commandsv2/src/main/java/org/wpilib/command2/button/CommandJoystick.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/CommandJoystick.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/InternalButton.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/InternalButton.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/JoystickButton.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/JoystickButton.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/NetworkButton.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/NetworkButton.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/NetworkButton.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/POVButton.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/POVButton.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggers.java b/commandsv2/src/main/java/org/wpilib/command2/button/RobotModeTriggers.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggers.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/RobotModeTriggers.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java b/commandsv2/src/main/java/org/wpilib/command2/button/Trigger.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java
rename to commandsv2/src/main/java/org/wpilib/command2/button/Trigger.java
diff --git a/commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutine.java b/commandsv2/src/main/java/org/wpilib/command2/sysid/SysIdRoutine.java
similarity index 100%
rename from commandsv2/src/main/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutine.java
rename to commandsv2/src/main/java/org/wpilib/command2/sysid/SysIdRoutine.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java b/commandsv2/src/test/java/org/wpilib/MockHardwareExtension.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java
rename to commandsv2/src/test/java/org/wpilib/MockHardwareExtension.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandDecoratorTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/CommandDecoratorTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandRequirementsTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/CommandRequirementsTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandScheduleTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/CommandScheduleTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSchedulerTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandSchedulerTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSchedulerTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/CommandSchedulerTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandSendableButtonTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/CommandSendableButtonTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java b/commandsv2/src/test/java/org/wpilib/command2/CommandTestBase.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java
rename to commandsv2/src/test/java/org/wpilib/command2/CommandTestBase.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/ConditionalCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/ConditionalCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/DefaultCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/DefaultCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DeferredCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/DeferredCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/DeferredCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/DeferredCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/FunctionalCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/FunctionalCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/InstantCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/InstantCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/MultiCompositionTestBase.java b/commandsv2/src/test/java/org/wpilib/command2/MultiCompositionTestBase.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/MultiCompositionTestBase.java
rename to commandsv2/src/test/java/org/wpilib/command2/MultiCompositionTestBase.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/NotifierCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/NotifierCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/ParallelCommandGroupTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/ParallelCommandGroupTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/ParallelDeadlineGroupTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/ParallelDeadlineGroupTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/ParallelRaceGroupTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/ParallelRaceGroupTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/PrintCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/PrintCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/ProxyCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/ProxyCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RepeatCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/RepeatCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RepeatCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/RepeatCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/RobotDisabledCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/RobotDisabledCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/RunCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/RunCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/ScheduleCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/ScheduleCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SchedulingRecursionTest.java b/commandsv2/src/test/java/org/wpilib/command2/SchedulingRecursionTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SchedulingRecursionTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/SchedulingRecursionTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/SelectCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/SelectCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/SequentialCommandGroupTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/SequentialCommandGroupTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java b/commandsv2/src/test/java/org/wpilib/command2/SingleCompositionTestBase.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/SingleCompositionTestBase.java
rename to commandsv2/src/test/java/org/wpilib/command2/SingleCompositionTestBase.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/StartEndCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/StartEndCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/WaitCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/WaitCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/WaitUntilCommandTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/WaitUntilCommandTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java b/commandsv2/src/test/java/org/wpilib/command2/button/NetworkButtonTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/button/NetworkButtonTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggersTest.java b/commandsv2/src/test/java/org/wpilib/command2/button/RobotModeTriggersTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/RobotModeTriggersTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/button/RobotModeTriggersTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java b/commandsv2/src/test/java/org/wpilib/command2/button/TriggerTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/button/TriggerTest.java
diff --git a/commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutineTest.java b/commandsv2/src/test/java/org/wpilib/command2/sysid/SysIdRoutineTest.java
similarity index 100%
rename from commandsv2/src/test/java/edu/wpi/first/wpilibj2/command/sysid/SysIdRoutineTest.java
rename to commandsv2/src/test/java/org/wpilib/command2/sysid/SysIdRoutineTest.java
diff --git a/commandsv3/src/dev/java/org/wpilib/commands3/DevMain.java b/commandsv3/src/dev/java/org/wpilib/command3/DevMain.java
similarity index 100%
rename from commandsv3/src/dev/java/org/wpilib/commands3/DevMain.java
rename to commandsv3/src/dev/java/org/wpilib/command3/DevMain.java
diff --git a/commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandPS4Controller.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java
similarity index 100%
rename from commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandPS4Controller.java
rename to commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java
diff --git a/commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandPS5Controller.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java
similarity index 100%
rename from commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandPS5Controller.java
rename to commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java
diff --git a/commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandStadiaController.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java
similarity index 100%
rename from commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandStadiaController.java
rename to commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java
diff --git a/commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandXboxController.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java
similarity index 100%
rename from commandsv3/src/generated/main/java/org/wpilib/commands3/button/CommandXboxController.java
rename to commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java
diff --git a/commandsv3/src/generated/main/java/org/wpilib/commands3/proto/ProtobufCommands.java b/commandsv3/src/generated/main/java/org/wpilib/command3/proto/ProtobufCommands.java
similarity index 100%
rename from commandsv3/src/generated/main/java/org/wpilib/commands3/proto/ProtobufCommands.java
rename to commandsv3/src/generated/main/java/org/wpilib/command3/proto/ProtobufCommands.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Binding.java b/commandsv3/src/main/java/org/wpilib/command3/Binding.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Binding.java
rename to commandsv3/src/main/java/org/wpilib/command3/Binding.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/BindingScope.java b/commandsv3/src/main/java/org/wpilib/command3/BindingScope.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/BindingScope.java
rename to commandsv3/src/main/java/org/wpilib/command3/BindingScope.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/BindingType.java b/commandsv3/src/main/java/org/wpilib/command3/BindingType.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/BindingType.java
rename to commandsv3/src/main/java/org/wpilib/command3/BindingType.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Command.java b/commandsv3/src/main/java/org/wpilib/command3/Command.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Command.java
rename to commandsv3/src/main/java/org/wpilib/command3/Command.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/CommandState.java b/commandsv3/src/main/java/org/wpilib/command3/CommandState.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/CommandState.java
rename to commandsv3/src/main/java/org/wpilib/command3/CommandState.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/CommandTraceHelper.java b/commandsv3/src/main/java/org/wpilib/command3/CommandTraceHelper.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/CommandTraceHelper.java
rename to commandsv3/src/main/java/org/wpilib/command3/CommandTraceHelper.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/ConflictDetector.java b/commandsv3/src/main/java/org/wpilib/command3/ConflictDetector.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/ConflictDetector.java
rename to commandsv3/src/main/java/org/wpilib/command3/ConflictDetector.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Continuation.java b/commandsv3/src/main/java/org/wpilib/command3/Continuation.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Continuation.java
rename to commandsv3/src/main/java/org/wpilib/command3/Continuation.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/ContinuationScope.java b/commandsv3/src/main/java/org/wpilib/command3/ContinuationScope.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/ContinuationScope.java
rename to commandsv3/src/main/java/org/wpilib/command3/ContinuationScope.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Coroutine.java b/commandsv3/src/main/java/org/wpilib/command3/Coroutine.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Coroutine.java
rename to commandsv3/src/main/java/org/wpilib/command3/Coroutine.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Mechanism.java b/commandsv3/src/main/java/org/wpilib/command3/Mechanism.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Mechanism.java
rename to commandsv3/src/main/java/org/wpilib/command3/Mechanism.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/NeedsExecutionBuilderStage.java b/commandsv3/src/main/java/org/wpilib/command3/NeedsExecutionBuilderStage.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/NeedsExecutionBuilderStage.java
rename to commandsv3/src/main/java/org/wpilib/command3/NeedsExecutionBuilderStage.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/NeedsNameBuilderStage.java b/commandsv3/src/main/java/org/wpilib/command3/NeedsNameBuilderStage.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/NeedsNameBuilderStage.java
rename to commandsv3/src/main/java/org/wpilib/command3/NeedsNameBuilderStage.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/ParallelGroup.java b/commandsv3/src/main/java/org/wpilib/command3/ParallelGroup.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/ParallelGroup.java
rename to commandsv3/src/main/java/org/wpilib/command3/ParallelGroup.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/ParallelGroupBuilder.java b/commandsv3/src/main/java/org/wpilib/command3/ParallelGroupBuilder.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/ParallelGroupBuilder.java
rename to commandsv3/src/main/java/org/wpilib/command3/ParallelGroupBuilder.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Scheduler.java b/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Scheduler.java
rename to commandsv3/src/main/java/org/wpilib/command3/Scheduler.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/SchedulerEvent.java b/commandsv3/src/main/java/org/wpilib/command3/SchedulerEvent.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/SchedulerEvent.java
rename to commandsv3/src/main/java/org/wpilib/command3/SchedulerEvent.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/SequentialGroup.java b/commandsv3/src/main/java/org/wpilib/command3/SequentialGroup.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/SequentialGroup.java
rename to commandsv3/src/main/java/org/wpilib/command3/SequentialGroup.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/SequentialGroupBuilder.java b/commandsv3/src/main/java/org/wpilib/command3/SequentialGroupBuilder.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/SequentialGroupBuilder.java
rename to commandsv3/src/main/java/org/wpilib/command3/SequentialGroupBuilder.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/StagedCommandBuilder.java b/commandsv3/src/main/java/org/wpilib/command3/StagedCommandBuilder.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/StagedCommandBuilder.java
rename to commandsv3/src/main/java/org/wpilib/command3/StagedCommandBuilder.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/Trigger.java b/commandsv3/src/main/java/org/wpilib/command3/Trigger.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/Trigger.java
rename to commandsv3/src/main/java/org/wpilib/command3/Trigger.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/CommandGamepad.java b/commandsv3/src/main/java/org/wpilib/command3/button/CommandGamepad.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/CommandGamepad.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/CommandGamepad.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/CommandGenericHID.java b/commandsv3/src/main/java/org/wpilib/command3/button/CommandGenericHID.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/CommandGenericHID.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/CommandGenericHID.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/CommandJoystick.java b/commandsv3/src/main/java/org/wpilib/command3/button/CommandJoystick.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/CommandJoystick.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/CommandJoystick.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/InternalButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/InternalButton.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/InternalButton.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/InternalButton.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/JoystickButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/JoystickButton.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/JoystickButton.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/JoystickButton.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/NetworkButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/NetworkButton.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/NetworkButton.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/NetworkButton.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/POVButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/POVButton.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/POVButton.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/POVButton.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/button/RobotModeTriggers.java b/commandsv3/src/main/java/org/wpilib/command3/button/RobotModeTriggers.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/button/RobotModeTriggers.java
rename to commandsv3/src/main/java/org/wpilib/command3/button/RobotModeTriggers.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/proto/CommandProto.java b/commandsv3/src/main/java/org/wpilib/command3/proto/CommandProto.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/proto/CommandProto.java
rename to commandsv3/src/main/java/org/wpilib/command3/proto/CommandProto.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/proto/MechanismProto.java b/commandsv3/src/main/java/org/wpilib/command3/proto/MechanismProto.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/proto/MechanismProto.java
rename to commandsv3/src/main/java/org/wpilib/command3/proto/MechanismProto.java
diff --git a/commandsv3/src/main/java/org/wpilib/commands3/proto/SchedulerProto.java b/commandsv3/src/main/java/org/wpilib/command3/proto/SchedulerProto.java
similarity index 100%
rename from commandsv3/src/main/java/org/wpilib/commands3/proto/SchedulerProto.java
rename to commandsv3/src/main/java/org/wpilib/command3/proto/SchedulerProto.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/CommandTestBase.java b/commandsv3/src/test/java/org/wpilib/command3/CommandTestBase.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/CommandTestBase.java
rename to commandsv3/src/test/java/org/wpilib/command3/CommandTestBase.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/ConflictDetectorTest.java b/commandsv3/src/test/java/org/wpilib/command3/ConflictDetectorTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/ConflictDetectorTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/ConflictDetectorTest.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/CoroutineTest.java b/commandsv3/src/test/java/org/wpilib/command3/CoroutineTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/CoroutineTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/CoroutineTest.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/NullCommand.java b/commandsv3/src/test/java/org/wpilib/command3/NullCommand.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/NullCommand.java
rename to commandsv3/src/test/java/org/wpilib/command3/NullCommand.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/ParallelGroupTest.java b/commandsv3/src/test/java/org/wpilib/command3/ParallelGroupTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/ParallelGroupTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/ParallelGroupTest.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/PriorityCommand.java b/commandsv3/src/test/java/org/wpilib/command3/PriorityCommand.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/PriorityCommand.java
rename to commandsv3/src/test/java/org/wpilib/command3/PriorityCommand.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerCancellationTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerCancellationTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerCancellationTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerCancellationTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerConflictTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerConflictTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerConflictTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerConflictTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerErrorHandlingTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerErrorHandlingTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerErrorHandlingTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerErrorHandlingTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerPriorityLevelTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerPriorityLevelTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerPriorityLevelTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerPriorityLevelTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerSideloadFunctionTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerSideloadFunctionTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerSideloadFunctionTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerSideloadFunctionTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerTelemetryTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTelemetryTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerTelemetryTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerTelemetryTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerTest.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerTest.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SchedulerTimingTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTimingTests.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SchedulerTimingTests.java
rename to commandsv3/src/test/java/org/wpilib/command3/SchedulerTimingTests.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/SequentialGroupTest.java b/commandsv3/src/test/java/org/wpilib/command3/SequentialGroupTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/SequentialGroupTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/SequentialGroupTest.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/StagedCommandBuilderTest.java b/commandsv3/src/test/java/org/wpilib/command3/StagedCommandBuilderTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/StagedCommandBuilderTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/StagedCommandBuilderTest.java
diff --git a/commandsv3/src/test/java/org/wpilib/commands3/TriggerTest.java b/commandsv3/src/test/java/org/wpilib/command3/TriggerTest.java
similarity index 100%
rename from commandsv3/src/test/java/org/wpilib/commands3/TriggerTest.java
rename to commandsv3/src/test/java/org/wpilib/command3/TriggerTest.java
diff --git a/cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java b/cscore/src/dev/java/org/wpilib/vision/camera/DevMain.java
similarity index 100%
rename from cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java
rename to cscore/src/dev/java/org/wpilib/vision/camera/DevMain.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/AxisCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/AxisCamera.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/AxisCamera.java
rename to cscore/src/main/java/org/wpilib/vision/camera/AxisCamera.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java b/cscore/src/main/java/org/wpilib/vision/camera/CameraServerJNI.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java
rename to cscore/src/main/java/org/wpilib/vision/camera/CameraServerJNI.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/CvSink.java b/cscore/src/main/java/org/wpilib/vision/camera/CvSink.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/CvSink.java
rename to cscore/src/main/java/org/wpilib/vision/camera/CvSink.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/CvSource.java b/cscore/src/main/java/org/wpilib/vision/camera/CvSource.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/CvSource.java
rename to cscore/src/main/java/org/wpilib/vision/camera/CvSource.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/HttpCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/HttpCamera.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/HttpCamera.java
rename to cscore/src/main/java/org/wpilib/vision/camera/HttpCamera.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/ImageSink.java b/cscore/src/main/java/org/wpilib/vision/camera/ImageSink.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/ImageSink.java
rename to cscore/src/main/java/org/wpilib/vision/camera/ImageSink.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/ImageSource.java b/cscore/src/main/java/org/wpilib/vision/camera/ImageSource.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/ImageSource.java
rename to cscore/src/main/java/org/wpilib/vision/camera/ImageSource.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/MjpegServer.java b/cscore/src/main/java/org/wpilib/vision/camera/MjpegServer.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/MjpegServer.java
rename to cscore/src/main/java/org/wpilib/vision/camera/MjpegServer.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/OpenCvLoader.java b/cscore/src/main/java/org/wpilib/vision/camera/OpenCvLoader.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/OpenCvLoader.java
rename to cscore/src/main/java/org/wpilib/vision/camera/OpenCvLoader.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/UsbCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/UsbCamera.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/UsbCamera.java
rename to cscore/src/main/java/org/wpilib/vision/camera/UsbCamera.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/UsbCameraInfo.java b/cscore/src/main/java/org/wpilib/vision/camera/UsbCameraInfo.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/UsbCameraInfo.java
rename to cscore/src/main/java/org/wpilib/vision/camera/UsbCameraInfo.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoCamera.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoCamera.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoCamera.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoEvent.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoEvent.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoEvent.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoEvent.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoException.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoException.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoException.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoException.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoListener.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoListener.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoListener.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoListener.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoMode.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoMode.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoMode.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoMode.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoProperty.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoProperty.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoProperty.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoProperty.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoSink.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoSink.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoSink.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoSink.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/VideoSource.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoSource.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/VideoSource.java
rename to cscore/src/main/java/org/wpilib/vision/camera/VideoSource.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/raw/RawSink.java b/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSink.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/raw/RawSink.java
rename to cscore/src/main/java/org/wpilib/vision/camera/raw/RawSink.java
diff --git a/cscore/src/main/java/edu/wpi/first/cscore/raw/RawSource.java b/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSource.java
similarity index 100%
rename from cscore/src/main/java/edu/wpi/first/cscore/raw/RawSource.java
rename to cscore/src/main/java/org/wpilib/vision/camera/raw/RawSource.java
diff --git a/cscore/src/test/java/edu/wpi/first/cscore/JNITest.java b/cscore/src/test/java/org/wpilib/vision/camera/JNITest.java
similarity index 100%
rename from cscore/src/test/java/edu/wpi/first/cscore/JNITest.java
rename to cscore/src/test/java/org/wpilib/vision/camera/JNITest.java
diff --git a/cscore/src/test/java/edu/wpi/first/cscore/UsbCameraTest.java b/cscore/src/test/java/org/wpilib/vision/camera/UsbCameraTest.java
similarity index 100%
rename from cscore/src/test/java/edu/wpi/first/cscore/UsbCameraTest.java
rename to cscore/src/test/java/org/wpilib/vision/camera/UsbCameraTest.java
diff --git a/cscore/src/test/java/edu/wpi/first/cscore/VideoModeTest.java b/cscore/src/test/java/org/wpilib/vision/camera/VideoModeTest.java
similarity index 100%
rename from cscore/src/test/java/edu/wpi/first/cscore/VideoModeTest.java
rename to cscore/src/test/java/org/wpilib/vision/camera/VideoModeTest.java
diff --git a/datalog/src/dev/java/edu/wpi/first/datalog/DevMain.java b/datalog/src/dev/java/org/wpilib/datalog/DevMain.java
similarity index 100%
rename from datalog/src/dev/java/edu/wpi/first/datalog/DevMain.java
rename to datalog/src/dev/java/org/wpilib/datalog/DevMain.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/BooleanArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/BooleanArrayLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/BooleanArrayLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/BooleanArrayLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/BooleanLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/BooleanLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/BooleanLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/BooleanLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLog.java b/datalog/src/main/java/org/wpilib/datalog/DataLog.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLog.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLog.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogBackgroundWriter.java b/datalog/src/main/java/org/wpilib/datalog/DataLogBackgroundWriter.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogBackgroundWriter.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogBackgroundWriter.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/DataLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogIterator.java b/datalog/src/main/java/org/wpilib/datalog/DataLogIterator.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogIterator.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogIterator.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogJNI.java b/datalog/src/main/java/org/wpilib/datalog/DataLogJNI.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogJNI.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogJNI.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogReader.java b/datalog/src/main/java/org/wpilib/datalog/DataLogReader.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogReader.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogReader.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogRecord.java b/datalog/src/main/java/org/wpilib/datalog/DataLogRecord.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogRecord.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogRecord.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DataLogWriter.java b/datalog/src/main/java/org/wpilib/datalog/DataLogWriter.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DataLogWriter.java
rename to datalog/src/main/java/org/wpilib/datalog/DataLogWriter.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DoubleArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/DoubleArrayLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DoubleArrayLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/DoubleArrayLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/DoubleLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/DoubleLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/DoubleLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/DoubleLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/FileLogger.java b/datalog/src/main/java/org/wpilib/datalog/FileLogger.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/FileLogger.java
rename to datalog/src/main/java/org/wpilib/datalog/FileLogger.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/FloatArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/FloatArrayLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/FloatArrayLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/FloatArrayLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/FloatLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/FloatLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/FloatLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/FloatLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/IntegerArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/IntegerArrayLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/IntegerArrayLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/IntegerArrayLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/IntegerLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/IntegerLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/IntegerLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/IntegerLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/ProtobufLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/ProtobufLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/ProtobufLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/ProtobufLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/RawLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/RawLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/RawLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/RawLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/StringArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StringArrayLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/StringArrayLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/StringArrayLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/StringLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StringLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/StringLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/StringLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/StructArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StructArrayLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/StructArrayLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/StructArrayLogEntry.java
diff --git a/datalog/src/main/java/edu/wpi/first/datalog/StructLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StructLogEntry.java
similarity index 100%
rename from datalog/src/main/java/edu/wpi/first/datalog/StructLogEntry.java
rename to datalog/src/main/java/org/wpilib/datalog/StructLogEntry.java
diff --git a/datalog/src/test/java/edu/wpi/first/datalog/DataLogTest.java b/datalog/src/test/java/org/wpilib/datalog/DataLogTest.java
similarity index 100%
rename from datalog/src/test/java/edu/wpi/first/datalog/DataLogTest.java
rename to datalog/src/test/java/org/wpilib/datalog/DataLogTest.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/AnnotationProcessor.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/AnnotationProcessor.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/AnnotationProcessor.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/AnnotationProcessor.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ArrayHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ArrayHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ArrayHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ArrayHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/CollectionHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/CollectionHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/CollectionHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/CollectionHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ConfiguredLoggerHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ConfiguredLoggerHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ConfiguredLoggerHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ConfiguredLoggerHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ElementHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ElementHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ElementHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ElementHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EnumHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EnumHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EnumHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EnumHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EpilogueGenerator.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EpilogueGenerator.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/LoggableHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggableHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/LoggableHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggableHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/LoggerGenerator.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggerGenerator.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/LoggerGenerator.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggerGenerator.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/MeasureHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/MeasureHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/MeasureHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/MeasureHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/PrimitiveHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/PrimitiveHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/PrimitiveHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/PrimitiveHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ProtobufHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ProtobufHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/ProtobufHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ProtobufHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/SendableHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SendableHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/SendableHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SendableHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/StringUtils.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/StringUtils.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/StructHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StructHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/StructHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StructHandler.java
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/SupplierHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SupplierHandler.java
similarity index 100%
rename from epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/SupplierHandler.java
rename to epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SupplierHandler.java
diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/AnnotationProcessorTest.java
similarity index 100%
rename from epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java
rename to epilogue-processor/src/test/java/org/wpilib/epilogue/processor/AnnotationProcessorTest.java
diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/CompileTestOptions.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/CompileTestOptions.java
similarity index 100%
rename from epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/CompileTestOptions.java
rename to epilogue-processor/src/test/java/org/wpilib/epilogue/processor/CompileTestOptions.java
diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/EpilogueGeneratorTest.java
similarity index 100%
rename from epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java
rename to epilogue-processor/src/test/java/org/wpilib/epilogue/processor/EpilogueGeneratorTest.java
diff --git a/epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/StringUtilsTest.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/StringUtilsTest.java
similarity index 100%
rename from epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/StringUtilsTest.java
rename to epilogue-processor/src/test/java/org/wpilib/epilogue/processor/StringUtilsTest.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/CustomLoggerFor.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/CustomLoggerFor.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/CustomLoggerFor.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/CustomLoggerFor.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/EpilogueConfiguration.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/EpilogueConfiguration.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/EpilogueConfiguration.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/EpilogueConfiguration.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/Logged.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/Logged.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/Logged.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/Logged.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/NotLogged.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/NotLogged.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/NotLogged.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/NotLogged.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/ClassSpecificLogger.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/ClassSpecificLogger.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/ClassSpecificLogger.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/ClassSpecificLogger.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/EpilogueBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/EpilogueBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/EpilogueBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/EpilogueBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/FileBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/FileBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/FileBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/FileBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/LazyBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LazyBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/LazyBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LazyBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/LogBackedSendableBuilder.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LogBackedSendableBuilder.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/LogBackedSendableBuilder.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LogBackedSendableBuilder.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/MultiBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/MultiBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/MultiBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/MultiBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/NTEpilogueBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NTEpilogueBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/NTEpilogueBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NTEpilogueBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/NestedBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NestedBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/NestedBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NestedBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/NullBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NullBackend.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/NullBackend.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NullBackend.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/CrashOnError.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/CrashOnError.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/CrashOnError.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/CrashOnError.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/ErrorHandler.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorHandler.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/ErrorHandler.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorHandler.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/ErrorPrinter.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorPrinter.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/ErrorPrinter.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorPrinter.java
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/LoggerDisabler.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/LoggerDisabler.java
similarity index 100%
rename from epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/errors/LoggerDisabler.java
rename to epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/LoggerDisabler.java
diff --git a/epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/ClassSpecificLoggerTest.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/ClassSpecificLoggerTest.java
similarity index 100%
rename from epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/ClassSpecificLoggerTest.java
rename to epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/ClassSpecificLoggerTest.java
diff --git a/epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/CustomStruct.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/CustomStruct.java
similarity index 100%
rename from epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/CustomStruct.java
rename to epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/CustomStruct.java
diff --git a/epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/LazyBackendTest.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/LazyBackendTest.java
similarity index 100%
rename from epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/LazyBackendTest.java
rename to epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/LazyBackendTest.java
diff --git a/epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/NestedBackendTest.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/NestedBackendTest.java
similarity index 100%
rename from epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/NestedBackendTest.java
rename to epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/NestedBackendTest.java
diff --git a/epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/TestBackend.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/TestBackend.java
similarity index 100%
rename from epilogue-runtime/src/test/java/edu/wpi/first/epilogue/logging/TestBackend.java
rename to epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/TestBackend.java
diff --git a/fields/src/main/java/edu/wpi/first/fields/FieldConfig.java b/fields/src/main/java/org/wpilib/fields/FieldConfig.java
similarity index 100%
rename from fields/src/main/java/edu/wpi/first/fields/FieldConfig.java
rename to fields/src/main/java/org/wpilib/fields/FieldConfig.java
diff --git a/fields/src/main/java/edu/wpi/first/fields/Fields.java b/fields/src/main/java/org/wpilib/fields/Fields.java
similarity index 100%
rename from fields/src/main/java/edu/wpi/first/fields/Fields.java
rename to fields/src/main/java/org/wpilib/fields/Fields.java
diff --git a/fields/src/test/java/edu/wpi/first/fields/LoadConfigTest.java b/fields/src/test/java/org/wpilib/fields/LoadConfigTest.java
similarity index 100%
rename from fields/src/test/java/edu/wpi/first/fields/LoadConfigTest.java
rename to fields/src/test/java/org/wpilib/fields/LoadConfigTest.java
diff --git a/hal/src/dev/java/edu/wpi/first/hal/DevMain.java b/hal/src/dev/java/org/wpilib/hardware/hal/DevMain.java
similarity index 100%
rename from hal/src/dev/java/edu/wpi/first/hal/DevMain.java
rename to hal/src/dev/java/org/wpilib/hardware/hal/DevMain.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/AddressableLEDJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/AddressableLEDJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/AllianceStationID.java b/hal/src/main/java/org/wpilib/hardware/hal/AllianceStationID.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/AllianceStationID.java
rename to hal/src/main/java/org/wpilib/hardware/hal/AllianceStationID.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/AnalogJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/AnalogJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/CANAPIJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/CANAPIJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/CANAPIJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/CANAPIJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java b/hal/src/main/java/org/wpilib/hardware/hal/CANAPITypes.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/CANAPITypes.java
rename to hal/src/main/java/org/wpilib/hardware/hal/CANAPITypes.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/CTREPCMJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/CTREPCMJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/CTREPCMJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/CTREPCMJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/ConstantsJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/ConstantsJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/ConstantsJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/ConstantsJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/ControlWord.java b/hal/src/main/java/org/wpilib/hardware/hal/ControlWord.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/ControlWord.java
rename to hal/src/main/java/org/wpilib/hardware/hal/ControlWord.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/CounterJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/CounterJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/CounterJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/CounterJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/DIOJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/DIOJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/DIOJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/DIOJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/DriverStationJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/DriverStationJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/DriverStationJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/DriverStationJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/DutyCycleJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/DutyCycleJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/DutyCycleJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/DutyCycleJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/EncoderJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/EncoderJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/EncoderJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/EncoderJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/HAL.java b/hal/src/main/java/org/wpilib/hardware/hal/HAL.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/HAL.java
rename to hal/src/main/java/org/wpilib/hardware/hal/HAL.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/HALUtil.java b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/HALUtil.java
rename to hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/HALValue.java b/hal/src/main/java/org/wpilib/hardware/hal/HALValue.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/HALValue.java
rename to hal/src/main/java/org/wpilib/hardware/hal/HALValue.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/I2CJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/I2CJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/I2CJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/I2CJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/IMUJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/IMUJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/IMUJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/IMUJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java b/hal/src/main/java/org/wpilib/hardware/hal/JNIWrapper.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java
rename to hal/src/main/java/org/wpilib/hardware/hal/JNIWrapper.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/MatchInfoData.java b/hal/src/main/java/org/wpilib/hardware/hal/MatchInfoData.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/MatchInfoData.java
rename to hal/src/main/java/org/wpilib/hardware/hal/MatchInfoData.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/NotifierJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/NotifierJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/NotifierJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/NotifierJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PWMJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PWMJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PWMJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PWMJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PortsJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PortsJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PortsJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PowerDistributionFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionFaults.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PowerDistributionFaults.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionFaults.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PowerDistributionJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PowerDistributionJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PowerDistributionStickyFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionStickyFaults.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PowerDistributionStickyFaults.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionStickyFaults.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PowerDistributionVersion.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionVersion.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PowerDistributionVersion.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionVersion.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/PowerJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/PowerJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/PowerJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/REVPHFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHFaults.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/REVPHFaults.java
rename to hal/src/main/java/org/wpilib/hardware/hal/REVPHFaults.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/REVPHJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/REVPHJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/REVPHJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/REVPHStickyFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHStickyFaults.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/REVPHStickyFaults.java
rename to hal/src/main/java/org/wpilib/hardware/hal/REVPHStickyFaults.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/REVPHVersion.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHVersion.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/REVPHVersion.java
rename to hal/src/main/java/org/wpilib/hardware/hal/REVPHVersion.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SerialPortJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/SerialPortJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SerialPortJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SerialPortJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimBoolean.java b/hal/src/main/java/org/wpilib/hardware/hal/SimBoolean.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimBoolean.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimBoolean.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimDevice.java b/hal/src/main/java/org/wpilib/hardware/hal/SimDevice.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimDevice.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimDevice.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimDeviceJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/SimDeviceJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimDeviceJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimDeviceJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimDouble.java b/hal/src/main/java/org/wpilib/hardware/hal/SimDouble.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimDouble.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimDouble.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimEnum.java b/hal/src/main/java/org/wpilib/hardware/hal/SimEnum.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimEnum.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimEnum.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimInt.java b/hal/src/main/java/org/wpilib/hardware/hal/SimInt.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimInt.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimInt.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimLong.java b/hal/src/main/java/org/wpilib/hardware/hal/SimLong.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimLong.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimLong.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SimValue.java b/hal/src/main/java/org/wpilib/hardware/hal/SimValue.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SimValue.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SimValue.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/SystemServerJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/SystemServerJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/SystemServerJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/SystemServerJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/ThreadsJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/ThreadsJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/ThreadsJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/ThreadsJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/UsageReportingJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/UsageReportingJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/UsageReportingJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/UsageReportingJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/can/CANJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/can/CANJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/can/CANJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/can/CANReceiveMessage.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANReceiveMessage.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/can/CANReceiveMessage.java
rename to hal/src/main/java/org/wpilib/hardware/hal/can/CANReceiveMessage.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/can/CANStatus.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStatus.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/can/CANStatus.java
rename to hal/src/main/java/org/wpilib/hardware/hal/can/CANStatus.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/can/CANStreamMessage.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamMessage.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/can/CANStreamMessage.java
rename to hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamMessage.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/can/CANStreamOverflowException.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamOverflowException.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/can/CANStreamOverflowException.java
rename to hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamOverflowException.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/communication/NIRioStatus.java b/hal/src/main/java/org/wpilib/hardware/hal/communication/NIRioStatus.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/communication/NIRioStatus.java
rename to hal/src/main/java/org/wpilib/hardware/hal/communication/NIRioStatus.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/AddressableLEDDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/AddressableLEDDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/AddressableLEDDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/AddressableLEDDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/AnalogInDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/AnalogInDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/AnalogInDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/AnalogInDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/BufferCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/BufferCallback.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/BufferCallback.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/BufferCallback.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/CTREPCMDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/CTREPCMDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/CTREPCMDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/CTREPCMDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/ConstBufferCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/ConstBufferCallback.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/ConstBufferCallback.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/ConstBufferCallback.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/DIODataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DIODataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/DIODataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/DIODataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/DigitalPWMDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DigitalPWMDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/DigitalPWMDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/DigitalPWMDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/DriverStationDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DriverStationDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/DriverStationDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/DriverStationDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/DutyCycleDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DutyCycleDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/DutyCycleDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/DutyCycleDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/EncoderDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/EncoderDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/EncoderDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/EncoderDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/I2CDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/I2CDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/I2CDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/I2CDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/NotifierDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifierDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/NotifierDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifierDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/NotifyCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifyCallback.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/NotifyCallback.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifyCallback.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/PWMDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/PWMDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/PWMDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/PWMDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/PowerDistributionDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/PowerDistributionDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/PowerDistributionDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/PowerDistributionDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/REVPHDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/REVPHDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/REVPHDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/REVPHDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/RoboRioDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/RoboRioDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/RoboRioDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/RoboRioDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceCallback.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceCallback.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceCallback.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceDataJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/SimDeviceDataJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceDataJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/SimValueCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimValueCallback.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/SimValueCallback.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/SimValueCallback.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimulatorJNI.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java
rename to hal/src/main/java/org/wpilib/hardware/hal/simulation/SimulatorJNI.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/util/AllocationException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/AllocationException.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/util/AllocationException.java
rename to hal/src/main/java/org/wpilib/hardware/hal/util/AllocationException.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/util/BoundaryException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/BoundaryException.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/util/BoundaryException.java
rename to hal/src/main/java/org/wpilib/hardware/hal/util/BoundaryException.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/util/CheckedAllocationException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/CheckedAllocationException.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/util/CheckedAllocationException.java
rename to hal/src/main/java/org/wpilib/hardware/hal/util/CheckedAllocationException.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/util/HalHandleException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/HalHandleException.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/util/HalHandleException.java
rename to hal/src/main/java/org/wpilib/hardware/hal/util/HalHandleException.java
diff --git a/hal/src/main/java/edu/wpi/first/hal/util/UncleanStatusException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/UncleanStatusException.java
similarity index 100%
rename from hal/src/main/java/edu/wpi/first/hal/util/UncleanStatusException.java
rename to hal/src/main/java/org/wpilib/hardware/hal/util/UncleanStatusException.java
diff --git a/hal/src/test/java/edu/wpi/first/hal/JNITest.java b/hal/src/test/java/org/wpilib/hardware/hal/JNITest.java
similarity index 100%
rename from hal/src/test/java/edu/wpi/first/hal/JNITest.java
rename to hal/src/test/java/org/wpilib/hardware/hal/JNITest.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArraySubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArraySubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArraySubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArraySubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanArrayTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanArrayTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/BooleanTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/BooleanTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/BooleanTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArraySubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArraySubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArraySubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArraySubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleArrayTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleArrayTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoublePublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoublePublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoublePublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoublePublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/DoubleTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/DoubleTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/DoubleTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArraySubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatArraySubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArraySubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatArraySubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatArrayTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatArrayTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/FloatTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/FloatTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/FloatTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/GenericEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/GenericEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/GenericEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/GenericEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/GenericPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/GenericPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/GenericPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/GenericPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/GenericSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/GenericSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/GenericSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/GenericSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArraySubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArraySubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArraySubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArraySubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerArrayTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerArrayTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/IntegerTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/IntegerTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/IntegerTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTableEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTableEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableInstance.java b/ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTableInstance.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableInstance.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTableInstance.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableValue.java b/ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTableValue.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableValue.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTableValue.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java b/ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTablesJNI.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/NetworkTablesJNI.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/RawEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/RawEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/RawEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/RawEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/RawEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/RawEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/RawEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/RawEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/RawPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/RawPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/RawPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/RawPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/RawSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/RawSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/RawSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/RawSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/RawTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/RawTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/RawTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/RawTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArraySubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringArraySubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArraySubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringArraySubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringArrayTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringArrayTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringEntry.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringEntry.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringEntry.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringEntry.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringEntryImpl.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringEntryImpl.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringEntryImpl.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringEntryImpl.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringPublisher.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringPublisher.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringPublisher.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringPublisher.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringSubscriber.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringSubscriber.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringSubscriber.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringSubscriber.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/StringTopic.java b/ntcore/src/generated/main/java/org/wpilib/networktables/StringTopic.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/StringTopic.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/StringTopic.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedBoolean.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedBoolean.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedBoolean.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedBoolean.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedBooleanArray.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedBooleanArray.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedBooleanArray.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedBooleanArray.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedDouble.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedDouble.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedDouble.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedDouble.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedDoubleArray.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedDoubleArray.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedDoubleArray.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedDoubleArray.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedFloat.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedFloat.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedFloat.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedFloat.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedFloatArray.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedFloatArray.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedFloatArray.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedFloatArray.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedInteger.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedInteger.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedInteger.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedInteger.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedIntegerArray.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedIntegerArray.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedIntegerArray.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedIntegerArray.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedRaw.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedRaw.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedRaw.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedRaw.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedString.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedString.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedString.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedString.java
diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedStringArray.java b/ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedStringArray.java
similarity index 100%
rename from ntcore/src/generated/main/java/edu/wpi/first/networktables/TimestampedStringArray.java
rename to ntcore/src/generated/main/java/org/wpilib/networktables/TimestampedStringArray.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ConnectionInfo.java b/ntcore/src/main/java/org/wpilib/networktables/ConnectionInfo.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ConnectionInfo.java
rename to ntcore/src/main/java/org/wpilib/networktables/ConnectionInfo.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/EntryBase.java b/ntcore/src/main/java/org/wpilib/networktables/EntryBase.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/EntryBase.java
rename to ntcore/src/main/java/org/wpilib/networktables/EntryBase.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/GenericEntry.java b/ntcore/src/main/java/org/wpilib/networktables/GenericEntry.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/GenericEntry.java
rename to ntcore/src/main/java/org/wpilib/networktables/GenericEntry.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/LogMessage.java b/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/LogMessage.java
rename to ntcore/src/main/java/org/wpilib/networktables/LogMessage.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/MultiSubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/MultiSubscriber.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/MultiSubscriber.java
rename to ntcore/src/main/java/org/wpilib/networktables/MultiSubscriber.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NTSendable.java b/ntcore/src/main/java/org/wpilib/networktables/NTSendable.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NTSendable.java
rename to ntcore/src/main/java/org/wpilib/networktables/NTSendable.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NTSendableBuilder.java b/ntcore/src/main/java/org/wpilib/networktables/NTSendableBuilder.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NTSendableBuilder.java
rename to ntcore/src/main/java/org/wpilib/networktables/NTSendableBuilder.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTable.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTable.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NetworkTable.java
rename to ntcore/src/main/java/org/wpilib/networktables/NetworkTable.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableEvent.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableEvent.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableEvent.java
rename to ntcore/src/main/java/org/wpilib/networktables/NetworkTableEvent.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableListener.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListener.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableListener.java
rename to ntcore/src/main/java/org/wpilib/networktables/NetworkTableListener.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableListenerPoller.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListenerPoller.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableListenerPoller.java
rename to ntcore/src/main/java/org/wpilib/networktables/NetworkTableListenerPoller.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableType.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableType.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableType.java
rename to ntcore/src/main/java/org/wpilib/networktables/NetworkTableType.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ProtobufEntry.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntry.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ProtobufEntry.java
rename to ntcore/src/main/java/org/wpilib/networktables/ProtobufEntry.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ProtobufEntryImpl.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntryImpl.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ProtobufEntryImpl.java
rename to ntcore/src/main/java/org/wpilib/networktables/ProtobufEntryImpl.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ProtobufPublisher.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufPublisher.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ProtobufPublisher.java
rename to ntcore/src/main/java/org/wpilib/networktables/ProtobufPublisher.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ProtobufSubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufSubscriber.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ProtobufSubscriber.java
rename to ntcore/src/main/java/org/wpilib/networktables/ProtobufSubscriber.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ProtobufTopic.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufTopic.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ProtobufTopic.java
rename to ntcore/src/main/java/org/wpilib/networktables/ProtobufTopic.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/PubSub.java b/ntcore/src/main/java/org/wpilib/networktables/PubSub.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/PubSub.java
rename to ntcore/src/main/java/org/wpilib/networktables/PubSub.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/PubSubOption.java b/ntcore/src/main/java/org/wpilib/networktables/PubSubOption.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/PubSubOption.java
rename to ntcore/src/main/java/org/wpilib/networktables/PubSubOption.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/PubSubOptions.java b/ntcore/src/main/java/org/wpilib/networktables/PubSubOptions.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/PubSubOptions.java
rename to ntcore/src/main/java/org/wpilib/networktables/PubSubOptions.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/Publisher.java b/ntcore/src/main/java/org/wpilib/networktables/Publisher.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/Publisher.java
rename to ntcore/src/main/java/org/wpilib/networktables/Publisher.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructArrayEntry.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntry.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructArrayEntry.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructArrayEntry.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructArrayEntryImpl.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntryImpl.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructArrayEntryImpl.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructArrayEntryImpl.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructArrayPublisher.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayPublisher.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructArrayPublisher.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructArrayPublisher.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructArraySubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/StructArraySubscriber.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructArraySubscriber.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructArraySubscriber.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructArrayTopic.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayTopic.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructArrayTopic.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructArrayTopic.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructEntry.java b/ntcore/src/main/java/org/wpilib/networktables/StructEntry.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructEntry.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructEntry.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructEntryImpl.java b/ntcore/src/main/java/org/wpilib/networktables/StructEntryImpl.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructEntryImpl.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructEntryImpl.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructPublisher.java b/ntcore/src/main/java/org/wpilib/networktables/StructPublisher.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructPublisher.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructPublisher.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructSubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/StructSubscriber.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructSubscriber.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructSubscriber.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/StructTopic.java b/ntcore/src/main/java/org/wpilib/networktables/StructTopic.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/StructTopic.java
rename to ntcore/src/main/java/org/wpilib/networktables/StructTopic.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/Subscriber.java b/ntcore/src/main/java/org/wpilib/networktables/Subscriber.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/Subscriber.java
rename to ntcore/src/main/java/org/wpilib/networktables/Subscriber.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/TableListener.java b/ntcore/src/main/java/org/wpilib/networktables/TableListener.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/TableListener.java
rename to ntcore/src/main/java/org/wpilib/networktables/TableListener.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/TimeSyncEventData.java b/ntcore/src/main/java/org/wpilib/networktables/TimeSyncEventData.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/TimeSyncEventData.java
rename to ntcore/src/main/java/org/wpilib/networktables/TimeSyncEventData.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/TimestampedObject.java b/ntcore/src/main/java/org/wpilib/networktables/TimestampedObject.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/TimestampedObject.java
rename to ntcore/src/main/java/org/wpilib/networktables/TimestampedObject.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/Topic.java b/ntcore/src/main/java/org/wpilib/networktables/Topic.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/Topic.java
rename to ntcore/src/main/java/org/wpilib/networktables/Topic.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/TopicInfo.java b/ntcore/src/main/java/org/wpilib/networktables/TopicInfo.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/TopicInfo.java
rename to ntcore/src/main/java/org/wpilib/networktables/TopicInfo.java
diff --git a/ntcore/src/main/java/edu/wpi/first/networktables/ValueEventData.java b/ntcore/src/main/java/org/wpilib/networktables/ValueEventData.java
similarity index 100%
rename from ntcore/src/main/java/edu/wpi/first/networktables/ValueEventData.java
rename to ntcore/src/main/java/org/wpilib/networktables/ValueEventData.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java b/ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/JNITest.java b/ntcore/src/test/java/org/wpilib/networktables/JNITest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/JNITest.java
rename to ntcore/src/test/java/org/wpilib/networktables/JNITest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/LoggerTest.java b/ntcore/src/test/java/org/wpilib/networktables/LoggerTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/LoggerTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/LoggerTest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/NetworkTableTest.java b/ntcore/src/test/java/org/wpilib/networktables/NetworkTableTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/NetworkTableTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/NetworkTableTest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/RawTest.java b/ntcore/src/test/java/org/wpilib/networktables/RawTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/RawTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/RawTest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/TableListenerTest.java b/ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/TableListenerTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/TimeSyncTest.java b/ntcore/src/test/java/org/wpilib/networktables/TimeSyncTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/TimeSyncTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/TimeSyncTest.java
diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/TopicListenerTest.java b/ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java
similarity index 100%
rename from ntcore/src/test/java/edu/wpi/first/networktables/TopicListenerTest.java
rename to ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java
diff --git a/romiVendordep/src/dev/java/edu/wpi/first/wpilibj/romi/DevMain.java b/romiVendordep/src/dev/java/org/wpilib/romi/DevMain.java
similarity index 100%
rename from romiVendordep/src/dev/java/edu/wpi/first/wpilibj/romi/DevMain.java
rename to romiVendordep/src/dev/java/org/wpilib/romi/DevMain.java
diff --git a/romiVendordep/src/main/java/edu/wpi/first/wpilibj/romi/OnBoardIO.java b/romiVendordep/src/main/java/org/wpilib/romi/OnBoardIO.java
similarity index 100%
rename from romiVendordep/src/main/java/edu/wpi/first/wpilibj/romi/OnBoardIO.java
rename to romiVendordep/src/main/java/org/wpilib/romi/OnBoardIO.java
diff --git a/romiVendordep/src/main/java/edu/wpi/first/wpilibj/romi/RomiGyro.java b/romiVendordep/src/main/java/org/wpilib/romi/RomiGyro.java
similarity index 100%
rename from romiVendordep/src/main/java/edu/wpi/first/wpilibj/romi/RomiGyro.java
rename to romiVendordep/src/main/java/org/wpilib/romi/RomiGyro.java
diff --git a/romiVendordep/src/main/java/edu/wpi/first/wpilibj/romi/RomiMotor.java b/romiVendordep/src/main/java/org/wpilib/romi/RomiMotor.java
similarity index 100%
rename from romiVendordep/src/main/java/edu/wpi/first/wpilibj/romi/RomiMotor.java
rename to romiVendordep/src/main/java/org/wpilib/romi/RomiMotor.java
diff --git a/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java b/wpilibj/src/dev/java/org/wpilib/DevMain.java
similarity index 100%
rename from wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java
rename to wpilibj/src/dev/java/org/wpilib/DevMain.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS4Controller.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS4Controller.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS4Controller.java
rename to wpilibj/src/generated/main/java/org/wpilib/driverstation/PS4Controller.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS5Controller.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS5Controller.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS5Controller.java
rename to wpilibj/src/generated/main/java/org/wpilib/driverstation/PS5Controller.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/StadiaController.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/StadiaController.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/StadiaController.java
rename to wpilibj/src/generated/main/java/org/wpilib/driverstation/StadiaController.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/XboxController.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/XboxController.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/XboxController.java
rename to wpilibj/src/generated/main/java/org/wpilib/driverstation/XboxController.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/Koors40.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Koors40.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/Koors40.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Koors40.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMSparkFlex.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkFlex.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMSparkFlex.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkFlex.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMSparkMax.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkMax.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMSparkMax.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkMax.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMTalonFX.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonFX.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMTalonFX.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonFX.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMTalonSRX.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonSRX.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMTalonSRX.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonSRX.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMVenom.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVenom.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMVenom.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVenom.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMVictorSPX.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVictorSPX.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMVictorSPX.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVictorSPX.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/Spark.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Spark.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/Spark.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Spark.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/SparkMini.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/SparkMini.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/SparkMini.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/SparkMini.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/Talon.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Talon.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/Talon.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Talon.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/VictorSP.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/VictorSP.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/motorcontrol/VictorSP.java
rename to wpilibj/src/generated/main/java/org/wpilib/hardware/motor/VictorSP.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS4ControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/PS4ControllerSim.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS4ControllerSim.java
rename to wpilibj/src/generated/main/java/org/wpilib/simulation/PS4ControllerSim.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS5ControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/PS5ControllerSim.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS5ControllerSim.java
rename to wpilibj/src/generated/main/java/org/wpilib/simulation/PS5ControllerSim.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/StadiaControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/StadiaControllerSim.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/StadiaControllerSim.java
rename to wpilibj/src/generated/main/java/org/wpilib/simulation/StadiaControllerSim.java
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/XboxControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/XboxControllerSim.java
similarity index 100%
rename from wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/XboxControllerSim.java
rename to wpilibj/src/generated/main/java/org/wpilib/simulation/XboxControllerSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHub.java b/wpilibj/src/main/java/org/wpilib/ExpansionHub.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHub.java
rename to wpilibj/src/main/java/org/wpilib/ExpansionHub.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHubMotor.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHubMotor.java
rename to wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHubPidConstants.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHubPidConstants.java
rename to wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHubServo.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/ExpansionHubServo.java
rename to wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/EdgeConfiguration.java b/wpilibj/src/main/java/org/wpilib/counter/EdgeConfiguration.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/EdgeConfiguration.java
rename to wpilibj/src/main/java/org/wpilib/counter/EdgeConfiguration.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/Tachometer.java b/wpilibj/src/main/java/org/wpilib/counter/Tachometer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/Tachometer.java
rename to wpilibj/src/main/java/org/wpilib/counter/Tachometer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/UpDownCounter.java b/wpilibj/src/main/java/org/wpilib/counter/UpDownCounter.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/counter/UpDownCounter.java
rename to wpilibj/src/main/java/org/wpilib/counter/UpDownCounter.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java b/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java
rename to wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java b/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java
rename to wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/RobotDriveBase.java b/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/RobotDriveBase.java
rename to wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DSControlWord.java b/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DSControlWord.java
rename to wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
rename to wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Gamepad.java b/wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Gamepad.java
rename to wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java b/wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java
rename to wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java b/wpilibj/src/main/java/org/wpilib/driverstation/Joystick.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java
rename to wpilibj/src/main/java/org/wpilib/driverstation/Joystick.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/BooleanEvent.java b/wpilibj/src/main/java/org/wpilib/event/BooleanEvent.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/event/BooleanEvent.java
rename to wpilibj/src/main/java/org/wpilib/event/BooleanEvent.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/EventLoop.java b/wpilibj/src/main/java/org/wpilib/event/EventLoop.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/event/EventLoop.java
rename to wpilibj/src/main/java/org/wpilib/event/EventLoop.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/event/NetworkBooleanEvent.java b/wpilibj/src/main/java/org/wpilib/event/NetworkBooleanEvent.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/event/NetworkBooleanEvent.java
rename to wpilibj/src/main/java/org/wpilib/event/NetworkBooleanEvent.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java
rename to wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java
rename to wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/CAN.java
rename to wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/I2C.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java
rename to wpilibj/src/main/java/org/wpilib/hardware/bus/I2C.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/SerialPort.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java
rename to wpilibj/src/main/java/org/wpilib/hardware/bus/SerialPort.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/AnalogInput.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java
rename to wpilibj/src/main/java/org/wpilib/hardware/discrete/AnalogInput.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java
rename to wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalInput.java
rename to wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java
rename to wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/PWM.java
rename to wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/OnboardIMU.java b/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/OnboardIMU.java
rename to wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLED.java b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLED.java
rename to wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBuffer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java
rename to wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBuffer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBufferView.java b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBufferView.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBufferView.java
rename to wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBufferView.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/LEDPattern.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/LEDPattern.java
rename to wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/LEDReader.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDReader.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/LEDReader.java
rename to wpilibj/src/main/java/org/wpilib/hardware/led/LEDReader.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/LEDWriter.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/LEDWriter.java
rename to wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorController.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorController.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorController.java
rename to wpilibj/src/main/java/org/wpilib/hardware/motor/MotorController.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorControllerGroup.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java
rename to wpilibj/src/main/java/org/wpilib/hardware/motor/MotorControllerGroup.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/MotorSafety.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/MotorSafety.java
rename to wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMMotorController.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/PWMMotorController.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/PWMMotorController.java
rename to wpilibj/src/main/java/org/wpilib/hardware/motor/PWMMotorController.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CompressorConfigType.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/CompressorConfigType.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/CompressorConfigType.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/CompressorConfigType.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/DoubleSolenoid.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/DoubleSolenoid.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticHub.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticHub.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticsBase.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticsBase.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticsControlModule.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticsControlModule.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticsModuleType.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/PneumaticsModuleType.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Solenoid.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java
rename to wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Solenoid.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistribution.java b/wpilibj/src/main/java/org/wpilib/hardware/power/PowerDistribution.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistribution.java
rename to wpilibj/src/main/java/org/wpilib/hardware/power/PowerDistribution.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SharpIR.java b/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/SharpIR.java
rename to wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogEncoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogEncoder.java
rename to wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
rename to wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DutyCycle.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycle.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DutyCycle.java
rename to wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycle.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DutyCycleEncoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycleEncoder.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DutyCycleEncoder.java
rename to wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycleEncoder.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Encoder.java
rename to wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java b/wpilibj/src/main/java/org/wpilib/internal/DriverStationModeThread.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java
rename to wpilibj/src/main/java/org/wpilib/internal/DriverStationModeThread.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java b/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java
rename to wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
rename to wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotState.java b/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotState.java
rename to wpilibj/src/main/java/org/wpilib/opmode/RobotState.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/TimedRobot.java b/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/TimedRobot.java
rename to wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/TimesliceRobot.java b/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/TimesliceRobot.java
rename to wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/package.html b/wpilibj/src/main/java/org/wpilib/package.html
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/package.html
rename to wpilibj/src/main/java/org/wpilib/package.html
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/ADXL345Sim.java b/wpilibj/src/main/java/org/wpilib/simulation/ADXL345Sim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/ADXL345Sim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/ADXL345Sim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java b/wpilibj/src/main/java/org/wpilib/simulation/AddressableLEDSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/AddressableLEDSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSim.java b/wpilibj/src/main/java/org/wpilib/simulation/AnalogEncoderSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/AnalogEncoderSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogInputSim.java b/wpilibj/src/main/java/org/wpilib/simulation/AnalogInputSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AnalogInputSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/AnalogInputSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/BatterySim.java b/wpilibj/src/main/java/org/wpilib/simulation/BatterySim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/BatterySim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/BatterySim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CTREPCMSim.java b/wpilibj/src/main/java/org/wpilib/simulation/CTREPCMSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CTREPCMSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/CTREPCMSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CallbackStore.java b/wpilibj/src/main/java/org/wpilib/simulation/CallbackStore.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/CallbackStore.java
rename to wpilibj/src/main/java/org/wpilib/simulation/CallbackStore.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DCMotorSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DCMotorSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DCMotorSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DCMotorSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DIOSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DIOSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DIOSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DIOSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DifferentialDrivetrainSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DifferentialDrivetrainSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DigitalPWMSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DigitalPWMSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DoubleSolenoidSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DoubleSolenoidSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DoubleSolenoidSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DoubleSolenoidSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DriverStationSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DriverStationSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleEncoderSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleEncoderSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleEncoderSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DutyCycleEncoderSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DutyCycleSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/DutyCycleSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/ElevatorSim.java b/wpilibj/src/main/java/org/wpilib/simulation/ElevatorSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/ElevatorSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/ElevatorSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/EncoderSim.java b/wpilibj/src/main/java/org/wpilib/simulation/EncoderSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/EncoderSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/EncoderSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/FlywheelSim.java b/wpilibj/src/main/java/org/wpilib/simulation/FlywheelSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/FlywheelSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/FlywheelSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/GamepadSim.java b/wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/GamepadSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/GenericHIDSim.java b/wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/GenericHIDSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/I2CSim.java b/wpilibj/src/main/java/org/wpilib/simulation/I2CSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/I2CSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/I2CSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/JoystickSim.java b/wpilibj/src/main/java/org/wpilib/simulation/JoystickSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/JoystickSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/JoystickSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/LinearSystemSim.java b/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/LinearSystemSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/NotifierSim.java b/wpilibj/src/main/java/org/wpilib/simulation/NotifierSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/NotifierSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/NotifierSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PDPSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PDPSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PDPSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/PDPSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMMotorControllerSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PWMMotorControllerSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMMotorControllerSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/PWMMotorControllerSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PWMSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PWMSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/PWMSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PneumaticsBaseSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/PneumaticsBaseSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/REVPHSim.java b/wpilibj/src/main/java/org/wpilib/simulation/REVPHSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/REVPHSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/REVPHSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RoboRioSim.java b/wpilibj/src/main/java/org/wpilib/simulation/RoboRioSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/RoboRioSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/RoboRioSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SendableChooserSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SendableChooserSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SharpIRSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SharpIRSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SharpIRSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/SharpIRSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SimDeviceSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/SimDeviceSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimHooks.java b/wpilibj/src/main/java/org/wpilib/simulation/SimHooks.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimHooks.java
rename to wpilibj/src/main/java/org/wpilib/simulation/SimHooks.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SingleJointedArmSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SingleJointedArmSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SingleJointedArmSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/SingleJointedArmSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SolenoidSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SolenoidSim.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SolenoidSim.java
rename to wpilibj/src/main/java/org/wpilib/simulation/SolenoidSim.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/Field2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/Field2d.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/FieldObject2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/FieldObject2d.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/ListenerExecutor.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/ListenerExecutor.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/ListenerExecutor.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/ListenerExecutor.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/Mechanism2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/Mechanism2d.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/MechanismLigament2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismLigament2d.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/MechanismLigament2d.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismLigament2d.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/MechanismObject2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/MechanismObject2d.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/MechanismRoot2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismRoot2d.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/MechanismRoot2d.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismRoot2d.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableBuilderImpl.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableBuilderImpl.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableBuilderImpl.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/SendableBuilderImpl.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableChooser.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/SendableChooser.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/SmartDashboard.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboard.java
rename to wpilibj/src/main/java/org/wpilib/smartdashboard/SmartDashboard.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/sysid/SysIdRoutineLog.java b/wpilibj/src/main/java/org/wpilib/sysid/SysIdRoutineLog.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/sysid/SysIdRoutineLog.java
rename to wpilibj/src/main/java/org/wpilib/sysid/SysIdRoutineLog.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java
rename to wpilibj/src/main/java/org/wpilib/system/DataLogManager.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Filesystem.java b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Filesystem.java
rename to wpilibj/src/main/java/org/wpilib/system/Filesystem.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java b/wpilibj/src/main/java/org/wpilib/system/Notifier.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java
rename to wpilibj/src/main/java/org/wpilib/system/Notifier.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Resource.java b/wpilibj/src/main/java/org/wpilib/system/Resource.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Resource.java
rename to wpilibj/src/main/java/org/wpilib/system/Resource.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotController.java b/wpilibj/src/main/java/org/wpilib/system/RobotController.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotController.java
rename to wpilibj/src/main/java/org/wpilib/system/RobotController.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RuntimeType.java b/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/RuntimeType.java
rename to wpilibj/src/main/java/org/wpilib/system/RuntimeType.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java b/wpilibj/src/main/java/org/wpilib/system/SensorUtil.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java
rename to wpilibj/src/main/java/org/wpilib/system/SensorUtil.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SystemServer.java b/wpilibj/src/main/java/org/wpilib/system/SystemServer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/SystemServer.java
rename to wpilibj/src/main/java/org/wpilib/system/SystemServer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Threads.java b/wpilibj/src/main/java/org/wpilib/system/Threads.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Threads.java
rename to wpilibj/src/main/java/org/wpilib/system/Threads.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java b/wpilibj/src/main/java/org/wpilib/system/Timer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java
rename to wpilibj/src/main/java/org/wpilib/system/Timer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Tracer.java b/wpilibj/src/main/java/org/wpilib/system/Tracer.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Tracer.java
rename to wpilibj/src/main/java/org/wpilib/system/Tracer.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Watchdog.java b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Watchdog.java
rename to wpilibj/src/main/java/org/wpilib/system/Watchdog.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Alert.java b/wpilibj/src/main/java/org/wpilib/util/Alert.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Alert.java
rename to wpilibj/src/main/java/org/wpilib/util/Alert.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/Color.java b/wpilibj/src/main/java/org/wpilib/util/Color.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/util/Color.java
rename to wpilibj/src/main/java/org/wpilib/util/Color.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/Color8Bit.java b/wpilibj/src/main/java/org/wpilib/util/Color8Bit.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/util/Color8Bit.java
rename to wpilibj/src/main/java/org/wpilib/util/Color8Bit.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java b/wpilibj/src/main/java/org/wpilib/util/Preferences.java
similarity index 100%
rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java
rename to wpilibj/src/main/java/org/wpilib/util/Preferences.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java b/wpilibj/src/test/java/org/wpilib/MockHardwareExtension.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java
rename to wpilibj/src/test/java/org/wpilib/MockHardwareExtension.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/UtilityClassTest.java b/wpilibj/src/test/java/org/wpilib/UtilityClassTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/UtilityClassTest.java
rename to wpilibj/src/test/java/org/wpilib/UtilityClassTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/can/CANStatusTest.java b/wpilibj/src/test/java/org/wpilib/can/CANStatusTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/can/CANStatusTest.java
rename to wpilibj/src/test/java/org/wpilib/can/CANStatusTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/drive/DifferentialDriveTest.java b/wpilibj/src/test/java/org/wpilib/drive/DifferentialDriveTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/drive/DifferentialDriveTest.java
rename to wpilibj/src/test/java/org/wpilib/drive/DifferentialDriveTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/drive/MecanumDriveTest.java b/wpilibj/src/test/java/org/wpilib/drive/MecanumDriveTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/drive/MecanumDriveTest.java
rename to wpilibj/src/test/java/org/wpilib/drive/MecanumDriveTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/DriverStationTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/DriverStationTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/DriverStationTest.java
rename to wpilibj/src/test/java/org/wpilib/driverstation/DriverStationTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/GenericHIDTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/GenericHIDTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/GenericHIDTest.java
rename to wpilibj/src/test/java/org/wpilib/driverstation/GenericHIDTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/JoystickTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/JoystickTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/JoystickTest.java
rename to wpilibj/src/test/java/org/wpilib/driverstation/JoystickTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/PS4ControllerTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/PS4ControllerTest.java
rename to wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/PS5ControllerTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/PS5ControllerTest.java
rename to wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/XboxControllerTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/XboxControllerTest.java
rename to wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/event/BooleanEventTest.java b/wpilibj/src/test/java/org/wpilib/event/BooleanEventTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/event/BooleanEventTest.java
rename to wpilibj/src/test/java/org/wpilib/event/BooleanEventTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/event/EventLoopTest.java b/wpilibj/src/test/java/org/wpilib/event/EventLoopTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/event/EventLoopTest.java
rename to wpilibj/src/test/java/org/wpilib/event/EventLoopTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/event/NetworkBooleanEventTest.java b/wpilibj/src/test/java/org/wpilib/event/NetworkBooleanEventTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/event/NetworkBooleanEventTest.java
rename to wpilibj/src/test/java/org/wpilib/event/NetworkBooleanEventTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/JNITest.java b/wpilibj/src/test/java/org/wpilib/hal/JNITest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/JNITest.java
rename to wpilibj/src/test/java/org/wpilib/hal/JNITest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/MatchInfoDataTest.java b/wpilibj/src/test/java/org/wpilib/hal/MatchInfoDataTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/hal/MatchInfoDataTest.java
rename to wpilibj/src/test/java/org/wpilib/hal/MatchInfoDataTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/DigitalOutputTest.java b/wpilibj/src/test/java/org/wpilib/hardware/discrete/DigitalOutputTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/DigitalOutputTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/discrete/DigitalOutputTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/AddressableLEDBufferTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/AddressableLEDBufferTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/AddressableLEDBufferViewTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferViewTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/AddressableLEDBufferViewTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferViewTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/LEDPatternTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/LEDPatternTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/motorcontrol/MockMotorController.java b/wpilibj/src/test/java/org/wpilib/hardware/motor/MockMotorController.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/motorcontrol/MockMotorController.java
rename to wpilibj/src/test/java/org/wpilib/hardware/motor/MockMotorController.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/motorcontrol/MockPWMMotorController.java b/wpilibj/src/test/java/org/wpilib/hardware/motor/MockPWMMotorController.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/motorcontrol/MockPWMMotorController.java
rename to wpilibj/src/test/java/org/wpilib/hardware/motor/MockPWMMotorController.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroupTest.java b/wpilibj/src/test/java/org/wpilib/hardware/motor/MotorControllerGroupTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroupTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/motor/MotorControllerGroupTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/DoubleSolenoidTestCTRE.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestCTRE.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/DoubleSolenoidTestCTRE.java
rename to wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestCTRE.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/DoubleSolenoidTestREV.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestREV.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/DoubleSolenoidTestREV.java
rename to wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestREV.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/SolenoidTestCTRE.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestCTRE.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/SolenoidTestCTRE.java
rename to wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestCTRE.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/SolenoidTestREV.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestREV.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/SolenoidTestREV.java
rename to wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestREV.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/PowerDistributionTest.java b/wpilibj/src/test/java/org/wpilib/hardware/power/PowerDistributionTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/PowerDistributionTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/power/PowerDistributionTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/SharpIRTest.java b/wpilibj/src/test/java/org/wpilib/hardware/range/SharpIRTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/SharpIRTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/range/SharpIRTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/AnalogPotentiometerTest.java b/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/AnalogPotentiometerTest.java
rename to wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/TimedRobotTest.java b/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/TimedRobotTest.java
rename to wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/TimesliceRobotTest.java b/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/TimesliceRobotTest.java
rename to wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/ADXL345SimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/ADXL345SimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/ADXL345SimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/ADXL345SimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/AddressableLEDSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/AddressableLEDSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/AnalogEncoderSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogEncoderSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/AnalogEncoderSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogInputSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/AnalogInputSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/AnalogInputSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/AnalogInputSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/CTREPCMSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/CTREPCMSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/CTREPCMSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/CTREPCMSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DCMotorSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DCMotorSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DCMotorSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DCMotorSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DIOSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DIOSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DIOSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DIOSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DifferentialDrivetrainSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DifferentialDrivetrainSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DigitalPWMSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DigitalPWMSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DigitalPWMSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DriverStationSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DriverStationSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DriverStationSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DriverStationSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DutyCycleEncoderSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleEncoderSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DutyCycleEncoderSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DutyCycleEncoderSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DutyCycleSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/DutyCycleSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/DutyCycleSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/ElevatorSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/ElevatorSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/ElevatorSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/ElevatorSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/EncoderSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/EncoderSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/EncoderSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/EncoderSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/PWMMotorControllerSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/PWMMotorControllerSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/PWMMotorControllerSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/PWMMotorControllerSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/PWMSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/PWMSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/PWMSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/PWMSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/REVPHSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/REVPHSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/REVPHSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/REVPHSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/RoboRioSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/RoboRioSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/RoboRioSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/RoboRioSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SimDeviceSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/SimDeviceSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SimDeviceSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/SimDeviceSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SingleJointedArmSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/SingleJointedArmSimTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/SingleJointedArmSimTest.java
rename to wpilibj/src/test/java/org/wpilib/simulation/SingleJointedArmSimTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/BooleanCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/BooleanCallback.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/BooleanCallback.java
rename to wpilibj/src/test/java/org/wpilib/simulation/testutils/BooleanCallback.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/BufferCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/BufferCallback.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/BufferCallback.java
rename to wpilibj/src/test/java/org/wpilib/simulation/testutils/BufferCallback.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/CallbackHelperBase.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/CallbackHelperBase.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/CallbackHelperBase.java
rename to wpilibj/src/test/java/org/wpilib/simulation/testutils/CallbackHelperBase.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/DoubleCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/DoubleCallback.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/DoubleCallback.java
rename to wpilibj/src/test/java/org/wpilib/simulation/testutils/DoubleCallback.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/EnumCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/EnumCallback.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/EnumCallback.java
rename to wpilibj/src/test/java/org/wpilib/simulation/testutils/EnumCallback.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/IntCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/IntCallback.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/simulation/testutils/IntCallback.java
rename to wpilibj/src/test/java/org/wpilib/simulation/testutils/IntCallback.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/Mechanism2dTest.java b/wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/Mechanism2dTest.java
rename to wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooserTest.java b/wpilibj/src/test/java/org/wpilib/smartdashboard/SendableChooserTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooserTest.java
rename to wpilibj/src/test/java/org/wpilib/smartdashboard/SendableChooserTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboardTest.java b/wpilibj/src/test/java/org/wpilib/smartdashboard/SmartDashboardTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboardTest.java
rename to wpilibj/src/test/java/org/wpilib/smartdashboard/SmartDashboardTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/NotifierTest.java b/wpilibj/src/test/java/org/wpilib/system/NotifierTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/NotifierTest.java
rename to wpilibj/src/test/java/org/wpilib/system/NotifierTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/RobotControllerTest.java b/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/RobotControllerTest.java
rename to wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/SensorUtilTest.java b/wpilibj/src/test/java/org/wpilib/system/SensorUtilTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/SensorUtilTest.java
rename to wpilibj/src/test/java/org/wpilib/system/SensorUtilTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/TimerTest.java b/wpilibj/src/test/java/org/wpilib/system/TimerTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/TimerTest.java
rename to wpilibj/src/test/java/org/wpilib/system/TimerTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java b/wpilibj/src/test/java/org/wpilib/system/WatchdogTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
rename to wpilibj/src/test/java/org/wpilib/system/WatchdogTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/AlertTest.java b/wpilibj/src/test/java/org/wpilib/util/AlertTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/AlertTest.java
rename to wpilibj/src/test/java/org/wpilib/util/AlertTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/util/Color8BitTest.java b/wpilibj/src/test/java/org/wpilib/util/Color8BitTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/util/Color8BitTest.java
rename to wpilibj/src/test/java/org/wpilib/util/Color8BitTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/util/ColorTest.java b/wpilibj/src/test/java/org/wpilib/util/ColorTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/util/ColorTest.java
rename to wpilibj/src/test/java/org/wpilib/util/ColorTest.java
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/PreferencesTest.java b/wpilibj/src/test/java/org/wpilib/util/PreferencesTest.java
similarity index 100%
rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/PreferencesTest.java
rename to wpilibj/src/test/java/org/wpilib/util/PreferencesTest.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/command2/ReplaceMeCommand.java b/wpilibjExamples/src/main/java/org/wpilib/commands/command2/ReplaceMeCommand.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/command2/ReplaceMeCommand.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/command2/ReplaceMeCommand.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json b/wpilibjExamples/src/main/java/org/wpilib/commands/commands.json
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json
rename to wpilibjExamples/src/main/java/org/wpilib/commands/commands.json
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/emptyclass/ReplaceMeEmptyClass.java b/wpilibjExamples/src/main/java/org/wpilib/commands/emptyclass/ReplaceMeEmptyClass.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/emptyclass/ReplaceMeEmptyClass.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/emptyclass/ReplaceMeEmptyClass.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/instantcommand/ReplaceMeInstantCommand.java b/wpilibjExamples/src/main/java/org/wpilib/commands/instantcommand/ReplaceMeInstantCommand.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/instantcommand/ReplaceMeInstantCommand.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/instantcommand/ReplaceMeInstantCommand.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/subsystem2/ReplaceMeSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/commands/subsystem2/ReplaceMeSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/subsystem2/ReplaceMeSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/commands/subsystem2/ReplaceMeSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/addressableled/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/addressableled/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/addressableled/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/addressableled/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/apriltagsvision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/apriltagsvision/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/apriltagsvision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/apriltagsvision/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrive/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrive/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrivexboxcontroller/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrivexboxcontroller/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrivexboxcontroller/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/arcadedrivexboxcontroller/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/subsystems/Arm.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/subsystems/Arm.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/armsimulation/subsystems/Arm.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/subsystems/Arm.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/canpdp/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/canpdp/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/canpdp/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/canpdp/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdrivebot/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdrivebot/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdrivebot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdrivebot/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdrivebot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdrivebot/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/differentialdriveposeestimator/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/digitalcommunication/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/digitalcommunication/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/digitalcommunication/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/digitalcommunication/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/ExampleSmartMotorController.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/ExampleSmartMotorController.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/ExampleSmartMotorController.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/ExampleSmartMotorController.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleencoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleencoder/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleencoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleencoder/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleinput/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleinput/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleinput/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/dutycycleinput/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialprofile/ExampleSmartMotorController.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/ExampleSmartMotorController.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialprofile/ExampleSmartMotorController.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/ExampleSmartMotorController.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialprofile/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialprofile/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialprofile/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialprofile/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/subsystems/Elevator.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/subsystems/Elevator.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorexponentialsimulation/subsystems/Elevator.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/subsystems/Elevator.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorprofiledpid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorprofiledpid/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorprofiledpid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorprofiledpid/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/subsystems/Elevator.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/subsystems/Elevator.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/subsystems/Elevator.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/subsystems/Elevator.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatortrapezoidprofile/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatortrapezoidprofile/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatortrapezoidprofile/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/elevatortrapezoidprofile/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/encoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/encoder/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/encoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/encoder/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/eventloop/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/eventloop/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/eventloop/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/eventloop/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json b/wpilibjExamples/src/main/java/org/wpilib/examples/examples.json
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json
rename to wpilibjExamples/src/main/java/org/wpilib/examples/examples.json
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/flywheelbangbangcontroller/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/flywheelbangbangcontroller/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/flywheelbangbangcontroller/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/flywheelbangbangcontroller/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gettingstarted/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gettingstarted/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gettingstarted/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gettingstarted/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyro/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyro/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyro/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyro/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyromecanum/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyromecanum/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyromecanum/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyromecanum/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/commands/Autos.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/commands/Autos.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/commands/Autos.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/commands/Autos.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/subsystems/DriveSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/DriveSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/subsystems/DriveSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/DriveSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/subsystems/HatchSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/HatchSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/subsystems/HatchSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/HatchSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/ComplexAuto.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ComplexAuto.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/ComplexAuto.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ComplexAuto.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/DefaultDrive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DefaultDrive.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/DefaultDrive.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DefaultDrive.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/DriveDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DriveDistance.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/DriveDistance.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DriveDistance.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/GrabHatch.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/GrabHatch.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/GrabHatch.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/GrabHatch.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/HalveDriveSpeed.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/HalveDriveSpeed.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/HalveDriveSpeed.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/HalveDriveSpeed.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/ReleaseHatch.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ReleaseHatch.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/commands/ReleaseHatch.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ReleaseHatch.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/subsystems/DriveSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/DriveSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/subsystems/DriveSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/DriveSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/subsystems/HatchSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/HatchSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/subsystems/HatchSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/HatchSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hidrumble/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hidrumble/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hidrumble/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hidrumble/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/httpcamera/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/httpcamera/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/httpcamera/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/httpcamera/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/i2ccommunication/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/i2ccommunication/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/i2ccommunication/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/i2ccommunication/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumbot/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumbot/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumbot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumbot/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumbot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumbot/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdrive/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdrive/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdriveposeestimator/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mechanism2d/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mechanism2d/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mechanism2d/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mechanism2d/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/motorcontrol/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/motorcontrol/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/motorcontrol/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/motorcontrol/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/potentiometerpid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/potentiometerpid/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/potentiometerpid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/potentiometerpid/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/quickvision/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/RapidReactCommandBot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/RapidReactCommandBot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/RapidReactCommandBot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/RapidReactCommandBot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Drive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Drive.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Drive.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Drive.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Intake.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Intake.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Intake.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Intake.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Pneumatics.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Pneumatics.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Pneumatics.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Pneumatics.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Shooter.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Shooter.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Shooter.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Shooter.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Storage.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Storage.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/rapidreactcommandbot/subsystems/Storage.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Storage.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/ArcadeDrive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/ArcadeDrive.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/ArcadeDrive.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/ArcadeDrive.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/AutonomousDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousDistance.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/AutonomousDistance.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousDistance.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/AutonomousTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousTime.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/AutonomousTime.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousTime.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/DriveDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveDistance.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/DriveDistance.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveDistance.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/DriveTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveTime.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/DriveTime.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveTime.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/TurnDegrees.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnDegrees.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/TurnDegrees.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnDegrees.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/TurnTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnTime.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/commands/TurnTime.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnTime.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/subsystems/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/subsystems/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/romireference/subsystems/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/romireference/subsystems/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/selectcommand/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/simpledifferentialdrivesimulation/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/simpledifferentialdrivesimulation/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/simpledifferentialdrivesimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/simpledifferentialdrivesimulation/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/simpledifferentialdrivesimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/simpledifferentialdrivesimulation/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/solenoid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/solenoid/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/solenoid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/solenoid/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespacearm/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespacearm/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespacearm/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespacearm/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceelevator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceelevator/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceelevator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceelevator/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheel/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheel/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheel/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheel/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheelsysid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheelsysid/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheelsysid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/statespaceflywheelsysid/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/SwerveModule.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/SwerveModule.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervebot/SwerveModule.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/SwerveModule.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/SwerveModule.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/SwerveModule.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/swervedriveposeestimator/SwerveModule.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/SwerveModule.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/SysIdRoutineBot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/SysIdRoutineBot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/SysIdRoutineBot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/SysIdRoutineBot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/subsystems/Drive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Drive.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/subsystems/Drive.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Drive.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/subsystems/Shooter.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Shooter.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/sysidroutine/subsystems/Shooter.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Shooter.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrive/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrive/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrivexboxcontroller/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrivexboxcontroller/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrivexboxcontroller/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrivexboxcontroller/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/subsystems/Intake.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/subsystems/Intake.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/unittest/subsystems/Intake.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/unittest/subsystems/Intake.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/ArcadeDrive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/ArcadeDrive.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/ArcadeDrive.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/ArcadeDrive.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/AutonomousDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousDistance.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/AutonomousDistance.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousDistance.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/AutonomousTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousTime.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/AutonomousTime.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousTime.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/DriveDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveDistance.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/DriveDistance.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveDistance.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/DriveTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveTime.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/DriveTime.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveTime.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/TurnDegrees.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnDegrees.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/TurnDegrees.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnDegrees.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/TurnTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnTime.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/commands/TurnTime.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnTime.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/subsystems/Arm.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Arm.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/subsystems/Arm.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Arm.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/subsystems/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Drivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/xrpreference/subsystems/Drivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Drivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometercollision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometercollision/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometercollision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometercollision/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometerfilter/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometerfilter/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometerfilter/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/accelerometerfilter/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/adxlaccelerometers/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/adxlaccelerometers/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/adxlaccelerometers/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/adxlaccelerometers/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogaccelerometer/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogaccelerometer/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogaccelerometer/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogaccelerometer/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogencoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogencoder/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogencoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogencoder/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analoginput/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analoginput/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analoginput/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analoginput/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogpotentiometer/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogpotentiometer/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogpotentiometer/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/analogpotentiometer/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/digitalinput/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/digitalinput/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/digitalinput/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/digitalinput/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/dutycycleencoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/dutycycleencoder/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/dutycycleencoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/dutycycleencoder/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoder/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoder/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderdrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderdrive/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderdrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderdrive/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderhoming/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderhoming/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderhoming/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/encoderhoming/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/limitswitch/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/limitswitch/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/limitswitch/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/limitswitch/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/onboardimu/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/onboardimu/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/onboardimu/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/onboardimu/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/profiledpidfeedforward/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/profiledpidfeedforward/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/profiledpidfeedforward/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/profiledpidfeedforward/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/snippets.json b/wpilibjExamples/src/main/java/org/wpilib/snippets/snippets.json
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/snippets.json
rename to wpilibjExamples/src/main/java/org/wpilib/snippets/snippets.json
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/commands/Autos.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/commands/Autos.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/commands/ExampleCommand.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/subsystems/ExampleSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/subsystems/ExampleSubsystem.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbasedskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbasedskeleton/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbasedskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbasedskeleton/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbasedskeleton/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbasedskeleton/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/EducationalRobot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/EducationalRobot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/educational/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/robotbaseskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/robotbaseskeleton/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/robotbaseskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/robotbaseskeleton/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/commands/ExampleCommand.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/subsystems/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romicommandbased/subsystems/RomiDrivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/EducationalRobot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/EducationalRobot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/RomiDrivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/RomiDrivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/RomiDrivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romitimed/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romitimed/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romitimed/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romitimed/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romitimed/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/RomiDrivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/romitimed/RomiDrivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/RomiDrivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json b/wpilibjExamples/src/main/java/org/wpilib/templates/templates.json
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json
rename to wpilibjExamples/src/main/java/org/wpilib/templates/templates.json
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timed/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timed/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timed/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timed/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timedskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timedskeleton/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timedskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timedskeleton/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timeslice/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timeslice/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timeslice/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timeslice/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timesliceskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timesliceskeleton/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timesliceskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timesliceskeleton/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/Constants.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/RobotContainer.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/commands/ExampleCommand.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/subsystems/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpcommandbased/subsystems/XRPDrivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/EducationalRobot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/EducationalRobot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/XRPDrivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/XRPDrivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/XRPDrivetrain.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrptimed/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrptimed/Main.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrptimed/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrptimed/Robot.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java
diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrptimed/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/XRPDrivetrain.java
similarity index 100%
rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/xrptimed/XRPDrivetrain.java
rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/XRPDrivetrain.java
diff --git a/wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/armsimulation/ArmSimulationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/armsimulation/ArmSimulationTest.java
similarity index 100%
rename from wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/armsimulation/ArmSimulationTest.java
rename to wpilibjExamples/src/test/java/org/wpilib/examples/armsimulation/ArmSimulationTest.java
diff --git a/wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/digitalcommunication/DigitalCommunicationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/digitalcommunication/DigitalCommunicationTest.java
similarity index 100%
rename from wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/digitalcommunication/DigitalCommunicationTest.java
rename to wpilibjExamples/src/test/java/org/wpilib/examples/digitalcommunication/DigitalCommunicationTest.java
diff --git a/wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/ElevatorSimulationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/elevatorsimulation/ElevatorSimulationTest.java
similarity index 100%
rename from wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/elevatorsimulation/ElevatorSimulationTest.java
rename to wpilibjExamples/src/test/java/org/wpilib/examples/elevatorsimulation/ElevatorSimulationTest.java
diff --git a/wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/i2ccommunication/I2CCommunicationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/i2ccommunication/I2CCommunicationTest.java
similarity index 100%
rename from wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/i2ccommunication/I2CCommunicationTest.java
rename to wpilibjExamples/src/test/java/org/wpilib/examples/i2ccommunication/I2CCommunicationTest.java
diff --git a/wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/potentiometerpid/PotentiometerPIDTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/potentiometerpid/PotentiometerPIDTest.java
similarity index 100%
rename from wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/potentiometerpid/PotentiometerPIDTest.java
rename to wpilibjExamples/src/test/java/org/wpilib/examples/potentiometerpid/PotentiometerPIDTest.java
diff --git a/wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/unittest/subsystems/IntakeTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/unittest/subsystems/IntakeTest.java
similarity index 100%
rename from wpilibjExamples/src/test/java/edu/wpi/first/wpilibj/examples/unittest/subsystems/IntakeTest.java
rename to wpilibjExamples/src/test/java/org/wpilib/examples/unittest/subsystems/IntakeTest.java
diff --git a/wpimath/src/dev/java/edu/wpi/first/math/DevMain.java b/wpimath/src/dev/java/org/wpilib/math/DevMain.java
similarity index 100%
rename from wpimath/src/dev/java/edu/wpi/first/math/DevMain.java
rename to wpimath/src/dev/java/org/wpilib/math/DevMain.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N0.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N0.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N0.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N0.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N1.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N1.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N1.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N1.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N10.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N10.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N10.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N10.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N11.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N11.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N11.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N11.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N12.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N12.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N12.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N12.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N13.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N13.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N13.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N13.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N14.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N14.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N14.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N14.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N15.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N15.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N15.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N15.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N16.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N16.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N16.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N16.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N17.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N17.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N17.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N17.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N18.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N18.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N18.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N18.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N19.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N19.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N19.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N19.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N2.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N2.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N2.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N2.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N20.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N20.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N20.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N20.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N3.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N3.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N3.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N3.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N4.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N4.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N4.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N4.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N5.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N5.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N5.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N5.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N6.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N6.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N6.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N6.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N7.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N7.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N7.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N7.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N8.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N8.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N8.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N8.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N9.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N9.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/numbers/N9.java
rename to wpimath/src/generated/main/java/org/wpilib/math/numbers/N9.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Controller.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Controller.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Controller.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Controller.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Geometry2D.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry2D.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Geometry2D.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry2D.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Geometry3D.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry3D.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Geometry3D.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry3D.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Kinematics.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Kinematics.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Kinematics.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Kinematics.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Plant.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Plant.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Plant.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Plant.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Spline.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Spline.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Spline.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Spline.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/System.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/System.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/System.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/System.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Trajectory.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Trajectory.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Trajectory.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Trajectory.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/proto/Wpimath.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Wpimath.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/proto/Wpimath.java
rename to wpimath/src/generated/main/java/org/wpilib/math/proto/Wpimath.java
diff --git a/wpimath/src/generated/main/java/edu/wpi/first/math/Nat.java b/wpimath/src/generated/main/java/org/wpilib/math/util/Nat.java
similarity index 100%
rename from wpimath/src/generated/main/java/edu/wpi/first/math/Nat.java
rename to wpimath/src/generated/main/java/org/wpilib/math/util/Nat.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/ArmFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/ArmFeedforward.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/ArmFeedforward.java
rename to wpimath/src/main/java/org/wpilib/math/controller/ArmFeedforward.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/BangBangController.java b/wpimath/src/main/java/org/wpilib/math/controller/BangBangController.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/BangBangController.java
rename to wpimath/src/main/java/org/wpilib/math/controller/BangBangController.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/ControlAffinePlantInversionFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforward.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/ControlAffinePlantInversionFeedforward.java
rename to wpimath/src/main/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforward.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/DifferentialDriveAccelerationLimiter.java b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/DifferentialDriveAccelerationLimiter.java
rename to wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/DifferentialDriveFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveFeedforward.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/DifferentialDriveFeedforward.java
rename to wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveFeedforward.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/DifferentialDriveWheelVoltages.java b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveWheelVoltages.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/DifferentialDriveWheelVoltages.java
rename to wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveWheelVoltages.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/ElevatorFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/ElevatorFeedforward.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/ElevatorFeedforward.java
rename to wpimath/src/main/java/org/wpilib/math/controller/ElevatorFeedforward.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/ImplicitModelFollower.java b/wpimath/src/main/java/org/wpilib/math/controller/ImplicitModelFollower.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/ImplicitModelFollower.java
rename to wpimath/src/main/java/org/wpilib/math/controller/ImplicitModelFollower.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/LTVDifferentialDriveController.java b/wpimath/src/main/java/org/wpilib/math/controller/LTVDifferentialDriveController.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/LTVDifferentialDriveController.java
rename to wpimath/src/main/java/org/wpilib/math/controller/LTVDifferentialDriveController.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/LTVUnicycleController.java b/wpimath/src/main/java/org/wpilib/math/controller/LTVUnicycleController.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/LTVUnicycleController.java
rename to wpimath/src/main/java/org/wpilib/math/controller/LTVUnicycleController.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/LinearPlantInversionFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/LinearPlantInversionFeedforward.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/LinearPlantInversionFeedforward.java
rename to wpimath/src/main/java/org/wpilib/math/controller/LinearPlantInversionFeedforward.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/LinearQuadraticRegulator.java b/wpimath/src/main/java/org/wpilib/math/controller/LinearQuadraticRegulator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/LinearQuadraticRegulator.java
rename to wpimath/src/main/java/org/wpilib/math/controller/LinearQuadraticRegulator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/PIDController.java b/wpimath/src/main/java/org/wpilib/math/controller/PIDController.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/PIDController.java
rename to wpimath/src/main/java/org/wpilib/math/controller/PIDController.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/ProfiledPIDController.java b/wpimath/src/main/java/org/wpilib/math/controller/ProfiledPIDController.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/ProfiledPIDController.java
rename to wpimath/src/main/java/org/wpilib/math/controller/ProfiledPIDController.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/SimpleMotorFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/SimpleMotorFeedforward.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/SimpleMotorFeedforward.java
rename to wpimath/src/main/java/org/wpilib/math/controller/SimpleMotorFeedforward.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/proto/ArmFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/ArmFeedforwardProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/proto/ArmFeedforwardProto.java
rename to wpimath/src/main/java/org/wpilib/math/controller/proto/ArmFeedforwardProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/proto/DifferentialDriveFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/proto/DifferentialDriveFeedforwardProto.java
rename to wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/proto/DifferentialDriveWheelVoltagesProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/proto/DifferentialDriveWheelVoltagesProto.java
rename to wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/proto/ElevatorFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/proto/ElevatorFeedforwardProto.java
rename to wpimath/src/main/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/proto/SimpleMotorFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/proto/SimpleMotorFeedforwardProto.java
rename to wpimath/src/main/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/struct/ArmFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/ArmFeedforwardStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/struct/ArmFeedforwardStruct.java
rename to wpimath/src/main/java/org/wpilib/math/controller/struct/ArmFeedforwardStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/struct/DifferentialDriveFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/struct/DifferentialDriveFeedforwardStruct.java
rename to wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java
rename to wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/struct/ElevatorFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/struct/ElevatorFeedforwardStruct.java
rename to wpimath/src/main/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/controller/struct/SimpleMotorFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/controller/struct/SimpleMotorFeedforwardStruct.java
rename to wpimath/src/main/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/AngleStatistics.java b/wpimath/src/main/java/org/wpilib/math/estimator/AngleStatistics.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/AngleStatistics.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/AngleStatistics.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimator.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimator3d.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/ExtendedKalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/ExtendedKalmanFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/ExtendedKalmanFilter.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/ExtendedKalmanFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/KalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/KalmanFilter.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/KalmanFilterLatencyCompensator.java b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilterLatencyCompensator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/KalmanFilterLatencyCompensator.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilterLatencyCompensator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/KalmanTypeFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanTypeFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/KalmanTypeFilter.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/KalmanTypeFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimator.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimator3d.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/MerweScaledSigmaPoints.java b/wpimath/src/main/java/org/wpilib/math/estimator/MerweScaledSigmaPoints.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/MerweScaledSigmaPoints.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/MerweScaledSigmaPoints.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/MerweUKF.java b/wpimath/src/main/java/org/wpilib/math/estimator/MerweUKF.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/MerweUKF.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/MerweUKF.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/PoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/PoseEstimator.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/PoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/PoseEstimator3d.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/S3SigmaPoints.java b/wpimath/src/main/java/org/wpilib/math/estimator/S3SigmaPoints.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/S3SigmaPoints.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/S3SigmaPoints.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/S3UKF.java b/wpimath/src/main/java/org/wpilib/math/estimator/S3UKF.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/S3UKF.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/S3UKF.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/SigmaPoints.java b/wpimath/src/main/java/org/wpilib/math/estimator/SigmaPoints.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/SigmaPoints.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/SigmaPoints.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/SteadyStateKalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/SteadyStateKalmanFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/SteadyStateKalmanFilter.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/SteadyStateKalmanFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimator.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimator3d.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/estimator/UnscentedKalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/UnscentedKalmanFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/estimator/UnscentedKalmanFilter.java
rename to wpimath/src/main/java/org/wpilib/math/estimator/UnscentedKalmanFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/filter/Debouncer.java b/wpimath/src/main/java/org/wpilib/math/filter/Debouncer.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/filter/Debouncer.java
rename to wpimath/src/main/java/org/wpilib/math/filter/Debouncer.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/filter/LinearFilter.java b/wpimath/src/main/java/org/wpilib/math/filter/LinearFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/filter/LinearFilter.java
rename to wpimath/src/main/java/org/wpilib/math/filter/LinearFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/filter/MedianFilter.java b/wpimath/src/main/java/org/wpilib/math/filter/MedianFilter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/filter/MedianFilter.java
rename to wpimath/src/main/java/org/wpilib/math/filter/MedianFilter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/filter/SlewRateLimiter.java b/wpimath/src/main/java/org/wpilib/math/filter/SlewRateLimiter.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/filter/SlewRateLimiter.java
rename to wpimath/src/main/java/org/wpilib/math/filter/SlewRateLimiter.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/CoordinateAxis.java b/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateAxis.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/CoordinateAxis.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/CoordinateAxis.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/CoordinateSystem.java b/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateSystem.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/CoordinateSystem.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/CoordinateSystem.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Ellipse2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Ellipse2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Ellipse2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Ellipse2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Pose2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Pose2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Pose2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Pose2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Pose3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Pose3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Pose3d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Pose3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Quaternion.java b/wpimath/src/main/java/org/wpilib/math/geometry/Quaternion.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Quaternion.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Quaternion.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Rectangle2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Rectangle2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Rectangle2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Rectangle2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Rotation2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Rotation2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Rotation2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Rotation2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Rotation3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Rotation3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Rotation3d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Rotation3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Transform2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Transform2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Transform2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Transform2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Transform3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Transform3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Transform3d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Transform3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Translation2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Translation2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Translation2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Translation2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Translation3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Translation3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Translation3d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Translation3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Twist2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Twist2d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Twist2d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Twist2d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/Twist3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Twist3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/Twist3d.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/Twist3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Ellipse2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Ellipse2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Ellipse2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Ellipse2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Pose2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Pose2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Pose3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose3dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Pose3dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose3dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/QuaternionProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/QuaternionProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/QuaternionProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/QuaternionProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Rectangle2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rectangle2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Rectangle2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Rectangle2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Rotation2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Rotation2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Rotation3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation3dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Rotation3dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation3dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Transform2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Transform2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Transform3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform3dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Transform3dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform3dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Translation2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Translation2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Translation3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation3dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Translation3dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation3dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Twist2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist2dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Twist2dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist2dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Twist3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist3dProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/proto/Twist3dProto.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist3dProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Ellipse2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Ellipse2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Ellipse2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Ellipse2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Pose2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Pose2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Pose3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose3dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Pose3dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose3dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/QuaternionStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/QuaternionStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/QuaternionStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/QuaternionStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Rectangle2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rectangle2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Rectangle2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Rectangle2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Rotation2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Rotation2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Rotation3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation3dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Rotation3dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation3dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Transform2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Transform2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Transform3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform3dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Transform3dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform3dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Translation2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Translation2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Translation3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation3dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Translation3dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation3dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Twist2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist2dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Twist2dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist2dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Twist3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist3dStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/geometry/struct/Twist3dStruct.java
rename to wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist3dStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/interpolation/Interpolatable.java b/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolatable.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/interpolation/Interpolatable.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/Interpolatable.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/interpolation/InterpolatingDoubleTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMap.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/interpolation/InterpolatingDoubleTreeMap.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMap.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/InterpolatingMatrixTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/InterpolatingMatrixTreeMap.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/interpolation/InterpolatingTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingTreeMap.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/interpolation/InterpolatingTreeMap.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingTreeMap.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/interpolation/Interpolator.java b/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/interpolation/Interpolator.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/Interpolator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/interpolation/InverseInterpolator.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InverseInterpolator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/interpolation/InverseInterpolator.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/InverseInterpolator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/interpolation/TimeInterpolatableBuffer.java b/wpimath/src/main/java/org/wpilib/math/interpolation/TimeInterpolatableBuffer.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/interpolation/TimeInterpolatableBuffer.java
rename to wpimath/src/main/java/org/wpilib/math/interpolation/TimeInterpolatableBuffer.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/ArmFeedforwardJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/ArmFeedforwardJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/ArmFeedforwardJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/ArmFeedforwardJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/DAREJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/DAREJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/DAREJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/DAREJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/EigenJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/EigenJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/EigenJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/EigenJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/Ellipse2dJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/Ellipse2dJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/Ellipse2dJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/Ellipse2dJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/StateSpaceUtilJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/StateSpaceUtilJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/StateSpaceUtilJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/StateSpaceUtilJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/Transform3dJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/Transform3dJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/Transform3dJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/Transform3dJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/Twist3dJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/Twist3dJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/Twist3dJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/Twist3dJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/jni/WPIMathJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/WPIMathJNI.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/jni/WPIMathJNI.java
rename to wpimath/src/main/java/org/wpilib/math/jni/WPIMathJNI.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/ChassisSpeeds.java b/wpimath/src/main/java/org/wpilib/math/kinematics/ChassisSpeeds.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/ChassisSpeeds.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/ChassisSpeeds.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveKinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveKinematics.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveKinematics.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveKinematics.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometry.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometry3d.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveWheelPositions.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelPositions.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveWheelPositions.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelPositions.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveWheelSpeeds.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeeds.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/DifferentialDriveWheelSpeeds.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeeds.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/Kinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/Kinematics.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/Kinematics.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/Kinematics.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveKinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveKinematics.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveKinematics.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveKinematics.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveOdometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveOdometry.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveOdometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveOdometry3d.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveWheelPositions.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelPositions.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveWheelPositions.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelPositions.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveWheelSpeeds.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeeds.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/MecanumDriveWheelSpeeds.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeeds.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/Odometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/Odometry.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/Odometry.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/Odometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/Odometry3d.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/Odometry3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveDriveKinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveKinematics.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveDriveKinematics.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveKinematics.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveDriveOdometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveDriveOdometry.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveDriveOdometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry3d.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveDriveOdometry3d.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry3d.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveModulePosition.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModulePosition.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveModulePosition.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModulePosition.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveModuleState.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModuleState.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/SwerveModuleState.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModuleState.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/ChassisSpeedsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/ChassisSpeedsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveKinematicsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveKinematicsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/MecanumDriveKinematicsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/MecanumDriveKinematicsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelPositionsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelPositionsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/SwerveDriveKinematicsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/SwerveDriveKinematicsProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/SwerveModulePositionProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/SwerveModulePositionProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/SwerveModuleStateProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/proto/SwerveModuleStateProto.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/ChassisSpeedsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/ChassisSpeedsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveKinematicsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveKinematicsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/MecanumDriveKinematicsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/MecanumDriveKinematicsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/SwerveDriveKinematicsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/SwerveDriveKinematicsStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/SwerveModulePositionStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/SwerveModulePositionStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/SwerveModuleStateStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/kinematics/struct/SwerveModuleStateStruct.java
rename to wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/DARE.java b/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/DARE.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/DARE.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/MatBuilder.java b/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/MatBuilder.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/Matrix.java b/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/Matrix.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/VecBuilder.java b/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/VecBuilder.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/Vector.java b/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/Vector.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/Vector.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/proto/MatrixProto.java b/wpimath/src/main/java/org/wpilib/math/linalg/proto/MatrixProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/proto/MatrixProto.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/proto/MatrixProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/proto/VectorProto.java b/wpimath/src/main/java/org/wpilib/math/linalg/proto/VectorProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/proto/VectorProto.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/proto/VectorProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/struct/MatrixStruct.java b/wpimath/src/main/java/org/wpilib/math/linalg/struct/MatrixStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/struct/MatrixStruct.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/struct/MatrixStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/struct/VectorStruct.java b/wpimath/src/main/java/org/wpilib/math/linalg/struct/VectorStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/struct/VectorStruct.java
rename to wpimath/src/main/java/org/wpilib/math/linalg/struct/VectorStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/optimization/SimulatedAnnealing.java b/wpimath/src/main/java/org/wpilib/math/optimization/SimulatedAnnealing.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/optimization/SimulatedAnnealing.java
rename to wpimath/src/main/java/org/wpilib/math/optimization/SimulatedAnnealing.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/path/TravelingSalesman.java b/wpimath/src/main/java/org/wpilib/math/path/TravelingSalesman.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/path/TravelingSalesman.java
rename to wpimath/src/main/java/org/wpilib/math/path/TravelingSalesman.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/CubicHermiteSpline.java b/wpimath/src/main/java/org/wpilib/math/spline/CubicHermiteSpline.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/CubicHermiteSpline.java
rename to wpimath/src/main/java/org/wpilib/math/spline/CubicHermiteSpline.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/PoseWithCurvature.java b/wpimath/src/main/java/org/wpilib/math/spline/PoseWithCurvature.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/PoseWithCurvature.java
rename to wpimath/src/main/java/org/wpilib/math/spline/PoseWithCurvature.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/QuinticHermiteSpline.java b/wpimath/src/main/java/org/wpilib/math/spline/QuinticHermiteSpline.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/QuinticHermiteSpline.java
rename to wpimath/src/main/java/org/wpilib/math/spline/QuinticHermiteSpline.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/Spline.java b/wpimath/src/main/java/org/wpilib/math/spline/Spline.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/Spline.java
rename to wpimath/src/main/java/org/wpilib/math/spline/Spline.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/SplineHelper.java b/wpimath/src/main/java/org/wpilib/math/spline/SplineHelper.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/SplineHelper.java
rename to wpimath/src/main/java/org/wpilib/math/spline/SplineHelper.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/SplineParameterizer.java b/wpimath/src/main/java/org/wpilib/math/spline/SplineParameterizer.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/SplineParameterizer.java
rename to wpimath/src/main/java/org/wpilib/math/spline/SplineParameterizer.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/proto/CubicHermiteSplineProto.java b/wpimath/src/main/java/org/wpilib/math/spline/proto/CubicHermiteSplineProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/proto/CubicHermiteSplineProto.java
rename to wpimath/src/main/java/org/wpilib/math/spline/proto/CubicHermiteSplineProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/proto/QuinticHermiteSplineProto.java b/wpimath/src/main/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/proto/QuinticHermiteSplineProto.java
rename to wpimath/src/main/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/struct/CubicHermiteSplineStruct.java b/wpimath/src/main/java/org/wpilib/math/spline/struct/CubicHermiteSplineStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/struct/CubicHermiteSplineStruct.java
rename to wpimath/src/main/java/org/wpilib/math/spline/struct/CubicHermiteSplineStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/spline/struct/QuinticHermiteSplineStruct.java b/wpimath/src/main/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/spline/struct/QuinticHermiteSplineStruct.java
rename to wpimath/src/main/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/Discretization.java b/wpimath/src/main/java/org/wpilib/math/system/Discretization.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/Discretization.java
rename to wpimath/src/main/java/org/wpilib/math/system/Discretization.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/LinearSystem.java b/wpimath/src/main/java/org/wpilib/math/system/LinearSystem.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/LinearSystem.java
rename to wpimath/src/main/java/org/wpilib/math/system/LinearSystem.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/LinearSystemLoop.java b/wpimath/src/main/java/org/wpilib/math/system/LinearSystemLoop.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/LinearSystemLoop.java
rename to wpimath/src/main/java/org/wpilib/math/system/LinearSystemLoop.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/NumericalIntegration.java b/wpimath/src/main/java/org/wpilib/math/system/NumericalIntegration.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/NumericalIntegration.java
rename to wpimath/src/main/java/org/wpilib/math/system/NumericalIntegration.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/NumericalJacobian.java b/wpimath/src/main/java/org/wpilib/math/system/NumericalJacobian.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/NumericalJacobian.java
rename to wpimath/src/main/java/org/wpilib/math/system/NumericalJacobian.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/plant/DCMotor.java b/wpimath/src/main/java/org/wpilib/math/system/plant/DCMotor.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/plant/DCMotor.java
rename to wpimath/src/main/java/org/wpilib/math/system/plant/DCMotor.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/plant/LinearSystemId.java b/wpimath/src/main/java/org/wpilib/math/system/plant/LinearSystemId.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/plant/LinearSystemId.java
rename to wpimath/src/main/java/org/wpilib/math/system/plant/LinearSystemId.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/plant/proto/DCMotorProto.java b/wpimath/src/main/java/org/wpilib/math/system/plant/proto/DCMotorProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/plant/proto/DCMotorProto.java
rename to wpimath/src/main/java/org/wpilib/math/system/plant/proto/DCMotorProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/plant/struct/DCMotorStruct.java b/wpimath/src/main/java/org/wpilib/math/system/plant/struct/DCMotorStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/plant/struct/DCMotorStruct.java
rename to wpimath/src/main/java/org/wpilib/math/system/plant/struct/DCMotorStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/proto/LinearSystemProto.java b/wpimath/src/main/java/org/wpilib/math/system/proto/LinearSystemProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/proto/LinearSystemProto.java
rename to wpimath/src/main/java/org/wpilib/math/system/proto/LinearSystemProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/system/struct/LinearSystemStruct.java b/wpimath/src/main/java/org/wpilib/math/system/struct/LinearSystemStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/system/struct/LinearSystemStruct.java
rename to wpimath/src/main/java/org/wpilib/math/system/struct/LinearSystemStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/ExponentialProfile.java b/wpimath/src/main/java/org/wpilib/math/trajectory/ExponentialProfile.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/ExponentialProfile.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/ExponentialProfile.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/Trajectory.java b/wpimath/src/main/java/org/wpilib/math/trajectory/Trajectory.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/Trajectory.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/Trajectory.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryConfig.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryConfig.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryConfig.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryConfig.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryGenerator.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryGenerator.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryGenerator.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryGenerator.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryParameterizer.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryParameterizer.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryParameterizer.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryParameterizer.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrapezoidProfile.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrapezoidProfile.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/TrapezoidProfile.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/TrapezoidProfile.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/CentripetalAccelerationConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/CentripetalAccelerationConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/CentripetalAccelerationConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/CentripetalAccelerationConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/EllipticalRegionConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/EllipticalRegionConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/EllipticalRegionConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/EllipticalRegionConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/MaxVelocityConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MaxVelocityConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/MaxVelocityConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MaxVelocityConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/RectangularRegionConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/RectangularRegionConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/RectangularRegionConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/RectangularRegionConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/TrajectoryConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/TrajectoryConstraint.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/constraint/TrajectoryConstraint.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/constraint/TrajectoryConstraint.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/proto/TrajectoryProto.java b/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/proto/TrajectoryProto.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/proto/TrajectoryStateProto.java b/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryStateProto.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/proto/TrajectoryStateProto.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryStateProto.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/struct/ExponentialProfileStateStruct.java b/wpimath/src/main/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/struct/ExponentialProfileStateStruct.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/struct/TrapezoidProfileStateStruct.java b/wpimath/src/main/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStruct.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/trajectory/struct/TrapezoidProfileStateStruct.java
rename to wpimath/src/main/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStruct.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/ComputerVisionUtil.java b/wpimath/src/main/java/org/wpilib/math/util/ComputerVisionUtil.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/ComputerVisionUtil.java
rename to wpimath/src/main/java/org/wpilib/math/util/ComputerVisionUtil.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/MathShared.java b/wpimath/src/main/java/org/wpilib/math/util/MathShared.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/MathShared.java
rename to wpimath/src/main/java/org/wpilib/math/util/MathShared.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/MathSharedStore.java b/wpimath/src/main/java/org/wpilib/math/util/MathSharedStore.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/MathSharedStore.java
rename to wpimath/src/main/java/org/wpilib/math/util/MathSharedStore.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/MathUtil.java b/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/MathUtil.java
rename to wpimath/src/main/java/org/wpilib/math/util/MathUtil.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/Num.java b/wpimath/src/main/java/org/wpilib/math/util/Num.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/Num.java
rename to wpimath/src/main/java/org/wpilib/math/util/Num.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/Pair.java b/wpimath/src/main/java/org/wpilib/math/util/Pair.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/Pair.java
rename to wpimath/src/main/java/org/wpilib/math/util/Pair.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/StateSpaceUtil.java b/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/StateSpaceUtil.java
rename to wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java
diff --git a/wpimath/src/main/java/edu/wpi/first/math/util/Units.java b/wpimath/src/main/java/org/wpilib/math/util/Units.java
similarity index 100%
rename from wpimath/src/main/java/edu/wpi/first/math/util/Units.java
rename to wpimath/src/main/java/org/wpilib/math/util/Units.java
diff --git a/wpimath/src/test/java/edu/wpi/first/wpilibj/ProtoTestBase.java b/wpimath/src/test/java/org/wpilib/ProtoTestBase.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/wpilibj/ProtoTestBase.java
rename to wpimath/src/test/java/org/wpilib/ProtoTestBase.java
diff --git a/wpimath/src/test/java/edu/wpi/first/wpilibj/StructTestBase.java b/wpimath/src/test/java/org/wpilib/StructTestBase.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/wpilibj/StructTestBase.java
rename to wpimath/src/test/java/org/wpilib/StructTestBase.java
diff --git a/wpimath/src/test/java/edu/wpi/first/wpilibj/UtilityClassTest.java b/wpimath/src/test/java/org/wpilib/UtilityClassTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/wpilibj/UtilityClassTest.java
rename to wpimath/src/test/java/org/wpilib/UtilityClassTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/ArmFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ArmFeedforwardTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/ArmFeedforwardTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/ArmFeedforwardTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/BangBangInputOutputTest.java b/wpimath/src/test/java/org/wpilib/math/controller/BangBangInputOutputTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/BangBangInputOutputTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/BangBangInputOutputTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/BangBangToleranceTest.java b/wpimath/src/test/java/org/wpilib/math/controller/BangBangToleranceTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/BangBangToleranceTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/BangBangToleranceTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/ControlAffinePlantInversionFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforwardTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/ControlAffinePlantInversionFeedforwardTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforwardTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/DifferentialDriveAccelerationLimiterTest.java b/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiterTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/DifferentialDriveAccelerationLimiterTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiterTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/DifferentialDriveFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveFeedforwardTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/DifferentialDriveFeedforwardTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveFeedforwardTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/ElevatorFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ElevatorFeedforwardTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/ElevatorFeedforwardTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/ElevatorFeedforwardTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/ImplicitModelFollowerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ImplicitModelFollowerTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/ImplicitModelFollowerTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/ImplicitModelFollowerTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/LTVDifferentialDriveControllerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LTVDifferentialDriveControllerTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/LTVDifferentialDriveControllerTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/LTVDifferentialDriveControllerTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/LTVUnicycleControllerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LTVUnicycleControllerTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/LTVUnicycleControllerTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/LTVUnicycleControllerTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/LinearPlantInversionFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LinearPlantInversionFeedforwardTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/LinearPlantInversionFeedforwardTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/LinearPlantInversionFeedforwardTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/LinearQuadraticRegulatorTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LinearQuadraticRegulatorTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/LinearQuadraticRegulatorTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/LinearQuadraticRegulatorTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/LinearSystemLoopTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LinearSystemLoopTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/LinearSystemLoopTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/LinearSystemLoopTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/PIDInputOutputTest.java b/wpimath/src/test/java/org/wpilib/math/controller/PIDInputOutputTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/PIDInputOutputTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/PIDInputOutputTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/PIDToleranceTest.java b/wpimath/src/test/java/org/wpilib/math/controller/PIDToleranceTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/PIDToleranceTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/PIDToleranceTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/ProfiledPIDControllerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDControllerTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/ProfiledPIDControllerTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDControllerTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/ProfiledPIDInputOutputTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDInputOutputTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/ProfiledPIDInputOutputTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDInputOutputTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/SimpleMotorFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/SimpleMotorFeedforwardTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/SimpleMotorFeedforwardTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/SimpleMotorFeedforwardTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/proto/ArmFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/ArmFeedforwardProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/proto/ArmFeedforwardProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/proto/ArmFeedforwardProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/proto/ElevatorFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/proto/ElevatorFeedforwardProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/proto/SimpleMotorFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/proto/SimpleMotorFeedforwardProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/struct/ArmFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/ArmFeedforwardStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/struct/ArmFeedforwardStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/struct/ArmFeedforwardStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/struct/DifferentialDriveFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/struct/DifferentialDriveFeedforwardStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/struct/ElevatorFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/struct/ElevatorFeedforwardStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/controller/struct/SimpleMotorFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/controller/struct/SimpleMotorFeedforwardStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/AngleStatisticsTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/AngleStatisticsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/AngleStatisticsTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/AngleStatisticsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimator3dTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimator3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimatorTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimatorTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/DifferentialDrivePoseEstimatorTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimatorTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/ExtendedKalmanFilterTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/ExtendedKalmanFilterTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/ExtendedKalmanFilterTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/ExtendedKalmanFilterTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/KalmanFilterTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/KalmanFilterTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/KalmanFilterTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/KalmanFilterTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimator3dTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimator3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimatorTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimatorTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/MecanumDrivePoseEstimatorTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimatorTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/MerweScaledSigmaPointsTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MerweScaledSigmaPointsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/MerweScaledSigmaPointsTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/MerweScaledSigmaPointsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/MerweUKFTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MerweUKFTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/MerweUKFTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/MerweUKFTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/S3SigmaPointsTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/S3SigmaPointsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/S3SigmaPointsTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/S3SigmaPointsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/S3UKFTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/S3UKFTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/S3UKFTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/S3UKFTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimator3dTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimator3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimatorTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimatorTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/estimator/SwerveDrivePoseEstimatorTest.java
rename to wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimatorTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/filter/DebouncerTest.java b/wpimath/src/test/java/org/wpilib/math/filter/DebouncerTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/filter/DebouncerTest.java
rename to wpimath/src/test/java/org/wpilib/math/filter/DebouncerTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/filter/LinearFilterTest.java b/wpimath/src/test/java/org/wpilib/math/filter/LinearFilterTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/filter/LinearFilterTest.java
rename to wpimath/src/test/java/org/wpilib/math/filter/LinearFilterTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/filter/MedianFilterTest.java b/wpimath/src/test/java/org/wpilib/math/filter/MedianFilterTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/filter/MedianFilterTest.java
rename to wpimath/src/test/java/org/wpilib/math/filter/MedianFilterTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/filter/SlewRateLimiterTest.java b/wpimath/src/test/java/org/wpilib/math/filter/SlewRateLimiterTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/filter/SlewRateLimiterTest.java
rename to wpimath/src/test/java/org/wpilib/math/filter/SlewRateLimiterTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/CoordinateSystemTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/CoordinateSystemTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/CoordinateSystemTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/CoordinateSystemTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Ellipse2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Ellipse2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Ellipse2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Ellipse2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Pose2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Pose2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Pose2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Pose2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Pose3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Pose3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Pose3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Pose3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/QuaternionTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/QuaternionTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/QuaternionTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/QuaternionTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Rectangle2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Rectangle2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Rectangle2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Rectangle2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Rotation2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Rotation2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Rotation2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Rotation2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Rotation3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Rotation3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Rotation3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Rotation3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Transform2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Transform2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Transform2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Transform2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Transform3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Transform3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Transform3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Transform3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Translation2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Translation2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Translation2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Translation2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Translation3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Translation3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Translation3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Translation3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Twist2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Twist2dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Twist2dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Twist2dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/Twist3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Twist3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/Twist3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/Twist3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Ellipse2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Ellipse2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Ellipse2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Ellipse2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Pose2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Pose2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Pose3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose3dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Pose3dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose3dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/QuaternionProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/QuaternionProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/QuaternionProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/QuaternionProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Rectangle2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rectangle2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Rectangle2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Rectangle2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Rotation2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Rotation2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Rotation3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation3dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Rotation3dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation3dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Transform2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Transform2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Transform3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform3dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Transform3dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform3dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Translation2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Translation2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Translation3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation3dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Translation3dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation3dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Twist2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist2dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Twist2dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist2dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Twist3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist3dProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/proto/Twist3dProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist3dProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Ellipse2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Ellipse2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Ellipse2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Ellipse2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Pose2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Pose2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Pose3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose3dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Pose3dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose3dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/QuaternionStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/QuaternionStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/QuaternionStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/QuaternionStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Rectangle2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rectangle2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Rectangle2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Rectangle2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Rotation2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Rotation2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Rotation3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation3dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Rotation3dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation3dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Transform2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Transform2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Transform3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform3dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Transform3dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform3dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Translation2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Translation2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Translation3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation3dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Translation3dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation3dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Twist2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist2dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Twist2dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist2dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Twist3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist3dStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/geometry/struct/Twist3dStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist3dStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/interpolation/InterpolatingDoubleTreeMapTest.java b/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMapTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/interpolation/InterpolatingDoubleTreeMapTest.java
rename to wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMapTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/interpolation/InterpolatingTreeMapTest.java b/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingTreeMapTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/interpolation/InterpolatingTreeMapTest.java
rename to wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingTreeMapTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/interpolation/TimeInterpolatableBufferTest.java b/wpimath/src/test/java/org/wpilib/math/interpolation/TimeInterpolatableBufferTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/interpolation/TimeInterpolatableBufferTest.java
rename to wpimath/src/test/java/org/wpilib/math/interpolation/TimeInterpolatableBufferTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/ArmFeedforwardJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/ArmFeedforwardJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/ArmFeedforwardJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/ArmFeedforwardJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/DAREJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/DAREJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/DAREJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/DAREJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/EigenJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/EigenJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/EigenJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/EigenJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/Ellipse2dJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/Ellipse2dJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/Ellipse2dJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/Ellipse2dJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/StateSpaceUtilJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/StateSpaceUtilJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/StateSpaceUtilJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/StateSpaceUtilJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/Transform3dJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/Transform3dJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/Transform3dJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/Transform3dJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/jni/Twist3dJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/Twist3dJNITest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/jni/Twist3dJNITest.java
rename to wpimath/src/test/java/org/wpilib/math/jni/Twist3dJNITest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/ChassisSpeedsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/ChassisSpeedsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/ChassisSpeedsTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/ChassisSpeedsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveKinematicsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveKinematicsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveKinematicsTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveKinematicsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometry3dTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometry3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometryTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometryTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveOdometryTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometryTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveWheelSpeedsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeedsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/DifferentialDriveWheelSpeedsTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeedsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveKinematicsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveKinematicsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveKinematicsTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveKinematicsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveOdometry3dTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometry3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveOdometry3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometry3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveOdometryTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometryTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveOdometryTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometryTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveWheelSpeedsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeedsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/MecanumDriveWheelSpeedsTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeedsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveDriveKinematicsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveKinematicsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveDriveKinematicsTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveKinematicsTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveDriveOdometry3dTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometry3dTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveDriveOdometry3dTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometry3dTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveDriveOdometryTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometryTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveDriveOdometryTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometryTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveModuleStateTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveModuleStateTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/SwerveModuleStateTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/SwerveModuleStateTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/ChassisSpeedsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/ChassisSpeedsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/SwerveModulePositionProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/SwerveModulePositionProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/SwerveModuleStateProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/proto/SwerveModuleStateProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/ChassisSpeedsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/ChassisSpeedsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/MecanumDriveKinematicsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/MecanumDriveKinematicsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/SwerveDriveKinematicsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/SwerveDriveKinematicsStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/SwerveModulePositionStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/SwerveModulePositionStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/SwerveModuleStateStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/kinematics/struct/SwerveModuleStateStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/DARETest.java b/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/DARETest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/MatrixTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/MatrixTest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/VectorTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/VectorTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/VectorTest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/VectorTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/proto/MatrixProtoTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/proto/MatrixProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/proto/MatrixProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/proto/MatrixProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/proto/VectorProtoTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/proto/VectorProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/proto/VectorProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/proto/VectorProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/struct/MatrixStructTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/struct/MatrixStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/struct/MatrixStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/struct/MatrixStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/struct/VectorStructTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/struct/VectorStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/struct/VectorStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/linalg/struct/VectorStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/optimization/SimulatedAnnealingTest.java b/wpimath/src/test/java/org/wpilib/math/optimization/SimulatedAnnealingTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/optimization/SimulatedAnnealingTest.java
rename to wpimath/src/test/java/org/wpilib/math/optimization/SimulatedAnnealingTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/path/TravelingSalesmanTest.java b/wpimath/src/test/java/org/wpilib/math/path/TravelingSalesmanTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/path/TravelingSalesmanTest.java
rename to wpimath/src/test/java/org/wpilib/math/path/TravelingSalesmanTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/spline/CubicHermiteSplineTest.java b/wpimath/src/test/java/org/wpilib/math/spline/CubicHermiteSplineTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/spline/CubicHermiteSplineTest.java
rename to wpimath/src/test/java/org/wpilib/math/spline/CubicHermiteSplineTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/spline/QuinticHermiteSplineTest.java b/wpimath/src/test/java/org/wpilib/math/spline/QuinticHermiteSplineTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/spline/QuinticHermiteSplineTest.java
rename to wpimath/src/test/java/org/wpilib/math/spline/QuinticHermiteSplineTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/spline/proto/CubicHermiteSplineProtoTest.java b/wpimath/src/test/java/org/wpilib/math/spline/proto/CubicHermiteSplineProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/spline/proto/CubicHermiteSplineProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/spline/proto/CubicHermiteSplineProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/spline/proto/QuinticHermiteSplineProtoTest.java b/wpimath/src/test/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/spline/proto/QuinticHermiteSplineProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/spline/struct/CubicHermiteSplineStructTest.java b/wpimath/src/test/java/org/wpilib/math/spline/struct/CubicHermiteSplineStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/spline/struct/CubicHermiteSplineStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/spline/struct/CubicHermiteSplineStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/spline/struct/QuinticHermiteSplineStructTest.java b/wpimath/src/test/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/spline/struct/QuinticHermiteSplineStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/DiscretizationTest.java b/wpimath/src/test/java/org/wpilib/math/system/DiscretizationTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/DiscretizationTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/DiscretizationTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/LinearSystemIDTest.java b/wpimath/src/test/java/org/wpilib/math/system/LinearSystemIDTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/LinearSystemIDTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/LinearSystemIDTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/NumericalIntegrationTest.java b/wpimath/src/test/java/org/wpilib/math/system/NumericalIntegrationTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/NumericalIntegrationTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/NumericalIntegrationTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/plant/proto/DCMotorProtoTest.java b/wpimath/src/test/java/org/wpilib/math/system/plant/proto/DCMotorProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/plant/proto/DCMotorProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/plant/proto/DCMotorProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/plant/struct/DCMotorStructTest.java b/wpimath/src/test/java/org/wpilib/math/system/plant/struct/DCMotorStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/plant/struct/DCMotorStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/plant/struct/DCMotorStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/proto/LinearSystemProtoTest.java b/wpimath/src/test/java/org/wpilib/math/system/proto/LinearSystemProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/proto/LinearSystemProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/proto/LinearSystemProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/system/struct/LinearSystemStructTest.java b/wpimath/src/test/java/org/wpilib/math/system/struct/LinearSystemStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/system/struct/LinearSystemStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/system/struct/LinearSystemStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/CentripetalAccelerationConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/CentripetalAccelerationConstraintTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/CentripetalAccelerationConstraintTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/CentripetalAccelerationConstraintTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/DifferentialDriveKinematicsConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveKinematicsConstraintTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/DifferentialDriveKinematicsConstraintTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveKinematicsConstraintTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/DifferentialDriveVoltageConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveVoltageConstraintTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/DifferentialDriveVoltageConstraintTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveVoltageConstraintTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/EllipticalRegionConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/EllipticalRegionConstraintTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/EllipticalRegionConstraintTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/EllipticalRegionConstraintTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/ExponentialProfileTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/ExponentialProfileTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/ExponentialProfileTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/ExponentialProfileTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/RectangularRegionConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/RectangularRegionConstraintTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/RectangularRegionConstraintTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/RectangularRegionConstraintTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/TrajectoryConcatenateTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryConcatenateTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/TrajectoryConcatenateTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryConcatenateTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/TrajectoryGeneratorTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryGeneratorTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/TrajectoryGeneratorTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryGeneratorTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/TrajectoryTransformTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryTransformTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/TrajectoryTransformTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryTransformTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/TrapezoidProfileTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrapezoidProfileTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/TrapezoidProfileTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/TrapezoidProfileTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/proto/TrajectoryProtoTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/proto/TrajectoryProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/proto/TrajectoryStateProtoTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryStateProtoTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/proto/TrajectoryStateProtoTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryStateProtoTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/struct/ExponentialProfileStateStructTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/struct/ExponentialProfileStateStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/trajectory/struct/TrapezoidProfileStateStructTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStructTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/trajectory/struct/TrapezoidProfileStateStructTest.java
rename to wpimath/src/test/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStructTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/ComputerVisionUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/ComputerVisionUtilTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/ComputerVisionUtilTest.java
rename to wpimath/src/test/java/org/wpilib/math/util/ComputerVisionUtilTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/MathUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/MathUtilTest.java
rename to wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/StateSpaceUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/StateSpaceUtilTest.java
rename to wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java
diff --git a/wpimath/src/test/java/edu/wpi/first/math/util/UnitsTest.java b/wpimath/src/test/java/org/wpilib/math/util/UnitsTest.java
similarity index 100%
rename from wpimath/src/test/java/edu/wpi/first/math/util/UnitsTest.java
rename to wpimath/src/test/java/org/wpilib/math/util/UnitsTest.java
diff --git a/wpinet/src/dev/java/edu/wpi/first/net/DevMain.java b/wpinet/src/dev/java/org/wpilib/net/DevMain.java
similarity index 100%
rename from wpinet/src/dev/java/edu/wpi/first/net/DevMain.java
rename to wpinet/src/dev/java/org/wpilib/net/DevMain.java
diff --git a/wpinet/src/main/java/edu/wpi/first/net/MulticastServiceAnnouncer.java b/wpinet/src/main/java/org/wpilib/net/MulticastServiceAnnouncer.java
similarity index 100%
rename from wpinet/src/main/java/edu/wpi/first/net/MulticastServiceAnnouncer.java
rename to wpinet/src/main/java/org/wpilib/net/MulticastServiceAnnouncer.java
diff --git a/wpinet/src/main/java/edu/wpi/first/net/MulticastServiceResolver.java b/wpinet/src/main/java/org/wpilib/net/MulticastServiceResolver.java
similarity index 100%
rename from wpinet/src/main/java/edu/wpi/first/net/MulticastServiceResolver.java
rename to wpinet/src/main/java/org/wpilib/net/MulticastServiceResolver.java
diff --git a/wpinet/src/main/java/edu/wpi/first/net/PortForwarder.java b/wpinet/src/main/java/org/wpilib/net/PortForwarder.java
similarity index 100%
rename from wpinet/src/main/java/edu/wpi/first/net/PortForwarder.java
rename to wpinet/src/main/java/org/wpilib/net/PortForwarder.java
diff --git a/wpinet/src/main/java/edu/wpi/first/net/ServiceData.java b/wpinet/src/main/java/org/wpilib/net/ServiceData.java
similarity index 100%
rename from wpinet/src/main/java/edu/wpi/first/net/ServiceData.java
rename to wpinet/src/main/java/org/wpilib/net/ServiceData.java
diff --git a/wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java b/wpinet/src/main/java/org/wpilib/net/WPINetJNI.java
similarity index 100%
rename from wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java
rename to wpinet/src/main/java/org/wpilib/net/WPINetJNI.java
diff --git a/wpinet/src/main/java/edu/wpi/first/net/WebServer.java b/wpinet/src/main/java/org/wpilib/net/WebServer.java
similarity index 100%
rename from wpinet/src/main/java/edu/wpi/first/net/WebServer.java
rename to wpinet/src/main/java/org/wpilib/net/WebServer.java
diff --git a/wpinet/src/test/java/edu/wpi/first/net/WPINetJNITest.java b/wpinet/src/test/java/org/wpilib/net/WPINetJNITest.java
similarity index 100%
rename from wpinet/src/test/java/edu/wpi/first/net/WPINetJNITest.java
rename to wpinet/src/test/java/org/wpilib/net/WPINetJNITest.java
diff --git a/wpiunits/src/dev/java/edu/wpi/first/units/DevMain.java b/wpiunits/src/dev/java/org/wpilib/units/DevMain.java
similarity index 100%
rename from wpiunits/src/dev/java/edu/wpi/first/units/DevMain.java
rename to wpiunits/src/dev/java/org/wpilib/units/DevMain.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Acceleration.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Acceleration.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Angle.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Angle.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Angle.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularAcceleration.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularAcceleration.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularAcceleration.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularMomentum.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularMomentum.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularMomentum.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularVelocity.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/AngularVelocity.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularVelocity.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Current.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Current.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Current.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Dimensionless.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Dimensionless.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Dimensionless.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Distance.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Distance.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Distance.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Energy.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Energy.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Energy.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Force.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Force.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Force.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Frequency.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Frequency.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Frequency.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearAcceleration.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearAcceleration.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearAcceleration.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearMomentum.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearMomentum.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearMomentum.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearVelocity.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/LinearVelocity.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearVelocity.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mass.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mass.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Mass.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/MomentOfInertia.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/MomentOfInertia.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/MomentOfInertia.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mult.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Mult.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Mult.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Per.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Per.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Per.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Power.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Power.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Power.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Resistance.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Resistance.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Resistance.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Temperature.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Temperature.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Temperature.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Time.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Time.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Time.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Torque.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Torque.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Torque.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Velocity.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Velocity.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Velocity.java
diff --git a/wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Voltage.java
similarity index 100%
rename from wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Voltage.java
rename to wpiunits/src/generated/main/java/org/wpilib/units/measure/Voltage.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/AccelerationUnit.java b/wpiunits/src/main/java/org/wpilib/units/AccelerationUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/AccelerationUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/AccelerationUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/AngleUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngleUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/AngleUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/AngleUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/AngularAccelerationUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngularAccelerationUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/AngularAccelerationUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/AngularAccelerationUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/AngularMomentumUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/AngularMomentumUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/AngularVelocityUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngularVelocityUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/AngularVelocityUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/AngularVelocityUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/BaseUnits.java b/wpiunits/src/main/java/org/wpilib/units/BaseUnits.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/BaseUnits.java
rename to wpiunits/src/main/java/org/wpilib/units/BaseUnits.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/CombinatoryUnitCache.java b/wpiunits/src/main/java/org/wpilib/units/CombinatoryUnitCache.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/CombinatoryUnitCache.java
rename to wpiunits/src/main/java/org/wpilib/units/CombinatoryUnitCache.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/CurrentUnit.java b/wpiunits/src/main/java/org/wpilib/units/CurrentUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/CurrentUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/CurrentUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/DimensionlessUnit.java b/wpiunits/src/main/java/org/wpilib/units/DimensionlessUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/DimensionlessUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/DimensionlessUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/DistanceUnit.java b/wpiunits/src/main/java/org/wpilib/units/DistanceUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/DistanceUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/DistanceUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/EnergyUnit.java b/wpiunits/src/main/java/org/wpilib/units/EnergyUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/EnergyUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/EnergyUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/ForceUnit.java b/wpiunits/src/main/java/org/wpilib/units/ForceUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/ForceUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/ForceUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/FrequencyUnit.java b/wpiunits/src/main/java/org/wpilib/units/FrequencyUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/FrequencyUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/FrequencyUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java b/wpiunits/src/main/java/org/wpilib/units/ImmutableMeasure.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/ImmutableMeasure.java
rename to wpiunits/src/main/java/org/wpilib/units/ImmutableMeasure.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/LinearAccelerationUnit.java b/wpiunits/src/main/java/org/wpilib/units/LinearAccelerationUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/LinearAccelerationUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/LinearAccelerationUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/LinearMomentumUnit.java b/wpiunits/src/main/java/org/wpilib/units/LinearMomentumUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/LinearMomentumUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/LinearMomentumUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/LinearVelocityUnit.java b/wpiunits/src/main/java/org/wpilib/units/LinearVelocityUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/LinearVelocityUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/LinearVelocityUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/MassUnit.java b/wpiunits/src/main/java/org/wpilib/units/MassUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/MassUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/MassUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/Measure.java b/wpiunits/src/main/java/org/wpilib/units/Measure.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/Measure.java
rename to wpiunits/src/main/java/org/wpilib/units/Measure.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/MomentOfInertiaUnit.java b/wpiunits/src/main/java/org/wpilib/units/MomentOfInertiaUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/MomentOfInertiaUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/MomentOfInertiaUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/MultUnit.java b/wpiunits/src/main/java/org/wpilib/units/MultUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/MultUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/MultUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/PerUnit.java b/wpiunits/src/main/java/org/wpilib/units/PerUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/PerUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/PerUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/PowerUnit.java b/wpiunits/src/main/java/org/wpilib/units/PowerUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/PowerUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/PowerUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/ResistanceUnit.java b/wpiunits/src/main/java/org/wpilib/units/ResistanceUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/ResistanceUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/ResistanceUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/TemperatureUnit.java b/wpiunits/src/main/java/org/wpilib/units/TemperatureUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/TemperatureUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/TemperatureUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/TimeUnit.java b/wpiunits/src/main/java/org/wpilib/units/TimeUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/TimeUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/TimeUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/TorqueUnit.java b/wpiunits/src/main/java/org/wpilib/units/TorqueUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/TorqueUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/TorqueUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/UnaryFunction.java b/wpiunits/src/main/java/org/wpilib/units/UnaryFunction.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/UnaryFunction.java
rename to wpiunits/src/main/java/org/wpilib/units/UnaryFunction.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/Unit.java b/wpiunits/src/main/java/org/wpilib/units/Unit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/Unit.java
rename to wpiunits/src/main/java/org/wpilib/units/Unit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/UnitBuilder.java b/wpiunits/src/main/java/org/wpilib/units/UnitBuilder.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/UnitBuilder.java
rename to wpiunits/src/main/java/org/wpilib/units/UnitBuilder.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/Units.java b/wpiunits/src/main/java/org/wpilib/units/Units.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/Units.java
rename to wpiunits/src/main/java/org/wpilib/units/Units.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/VelocityUnit.java b/wpiunits/src/main/java/org/wpilib/units/VelocityUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/VelocityUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/VelocityUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/VoltageUnit.java b/wpiunits/src/main/java/org/wpilib/units/VoltageUnit.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/VoltageUnit.java
rename to wpiunits/src/main/java/org/wpilib/units/VoltageUnit.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/collections/LongToObjectHashMap.java b/wpiunits/src/main/java/org/wpilib/units/collections/LongToObjectHashMap.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/collections/LongToObjectHashMap.java
rename to wpiunits/src/main/java/org/wpilib/units/collections/LongToObjectHashMap.java
diff --git a/wpiunits/src/main/java/edu/wpi/first/units/collections/ReadOnlyPrimitiveLongSet.java b/wpiunits/src/main/java/org/wpilib/units/collections/ReadOnlyPrimitiveLongSet.java
similarity index 100%
rename from wpiunits/src/main/java/edu/wpi/first/units/collections/ReadOnlyPrimitiveLongSet.java
rename to wpiunits/src/main/java/org/wpilib/units/collections/ReadOnlyPrimitiveLongSet.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/CurrentUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/CurrentUnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/CurrentUnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/CurrentUnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/DistanceUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/DistanceUnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/DistanceUnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/DistanceUnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/ExampleUnit.java b/wpiunits/src/test/java/org/wpilib/units/ExampleUnit.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/ExampleUnit.java
rename to wpiunits/src/test/java/org/wpilib/units/ExampleUnit.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java b/wpiunits/src/test/java/org/wpilib/units/MeasureTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/MeasureTest.java
rename to wpiunits/src/test/java/org/wpilib/units/MeasureTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/MultUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/MultUnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/MultUnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/MultUnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/PerUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/PerUnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/PerUnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/PerUnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/UnaryFunctionTest.java b/wpiunits/src/test/java/org/wpilib/units/UnaryFunctionTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/UnaryFunctionTest.java
rename to wpiunits/src/test/java/org/wpilib/units/UnaryFunctionTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/UnitTest.java b/wpiunits/src/test/java/org/wpilib/units/UnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/UnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/UnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/UnitsTest.java b/wpiunits/src/test/java/org/wpilib/units/UnitsTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/UnitsTest.java
rename to wpiunits/src/test/java/org/wpilib/units/UnitsTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/VelocityUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/VelocityUnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/VelocityUnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/VelocityUnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/VoltageUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/VoltageUnitTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/VoltageUnitTest.java
rename to wpiunits/src/test/java/org/wpilib/units/VoltageUnitTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/collections/LongToObjectHashMapTest.java b/wpiunits/src/test/java/org/wpilib/units/collections/LongToObjectHashMapTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/collections/LongToObjectHashMapTest.java
rename to wpiunits/src/test/java/org/wpilib/units/collections/LongToObjectHashMapTest.java
diff --git a/wpiunits/src/test/java/edu/wpi/first/units/measure/VelocityTest.java b/wpiunits/src/test/java/org/wpilib/units/measure/VelocityTest.java
similarity index 100%
rename from wpiunits/src/test/java/edu/wpi/first/units/measure/VelocityTest.java
rename to wpiunits/src/test/java/org/wpilib/units/measure/VelocityTest.java
diff --git a/wpiutil/src/dev/java/edu/wpi/first/util/DevMain.java b/wpiutil/src/dev/java/org/wpilib/util/DevMain.java
similarity index 100%
rename from wpiutil/src/dev/java/edu/wpi/first/util/DevMain.java
rename to wpiutil/src/dev/java/org/wpilib/util/DevMain.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/ErrorMessages.java b/wpiutil/src/main/java/org/wpilib/util/ErrorMessages.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/ErrorMessages.java
rename to wpiutil/src/main/java/org/wpilib/util/ErrorMessages.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/PixelFormat.java b/wpiutil/src/main/java/org/wpilib/util/PixelFormat.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/PixelFormat.java
rename to wpiutil/src/main/java/org/wpilib/util/PixelFormat.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/RawFrame.java b/wpiutil/src/main/java/org/wpilib/util/RawFrame.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/RawFrame.java
rename to wpiutil/src/main/java/org/wpilib/util/RawFrame.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/TimestampSource.java b/wpiutil/src/main/java/org/wpilib/util/TimestampSource.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/TimestampSource.java
rename to wpiutil/src/main/java/org/wpilib/util/TimestampSource.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPISerializable.java b/wpiutil/src/main/java/org/wpilib/util/WPISerializable.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/WPISerializable.java
rename to wpiutil/src/main/java/org/wpilib/util/WPISerializable.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java b/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java
rename to wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/cleanup/CleanupPool.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/CleanupPool.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/cleanup/CleanupPool.java
rename to wpiutil/src/main/java/org/wpilib/util/cleanup/CleanupPool.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/cleanup/ReflectionCleanup.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/ReflectionCleanup.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/cleanup/ReflectionCleanup.java
rename to wpiutil/src/main/java/org/wpilib/util/cleanup/ReflectionCleanup.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/cleanup/SkipCleanup.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/SkipCleanup.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/cleanup/SkipCleanup.java
rename to wpiutil/src/main/java/org/wpilib/util/cleanup/SkipCleanup.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPICleaner.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/WPICleaner.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/WPICleaner.java
rename to wpiutil/src/main/java/org/wpilib/util/cleanup/WPICleaner.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/concurrent/Event.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/Event.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/concurrent/Event.java
rename to wpiutil/src/main/java/org/wpilib/util/concurrent/Event.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/EventVector.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/EventVector.java
rename to wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/concurrent/Semaphore.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/Semaphore.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/concurrent/Semaphore.java
rename to wpiutil/src/main/java/org/wpilib/util/concurrent/Semaphore.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/CircularBuffer.java b/wpiutil/src/main/java/org/wpilib/util/container/CircularBuffer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/CircularBuffer.java
rename to wpiutil/src/main/java/org/wpilib/util/container/CircularBuffer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/DoubleCircularBuffer.java b/wpiutil/src/main/java/org/wpilib/util/container/DoubleCircularBuffer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/DoubleCircularBuffer.java
rename to wpiutil/src/main/java/org/wpilib/util/container/DoubleCircularBuffer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/function/BooleanConsumer.java b/wpiutil/src/main/java/org/wpilib/util/function/BooleanConsumer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/function/BooleanConsumer.java
rename to wpiutil/src/main/java/org/wpilib/util/function/BooleanConsumer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/function/FloatConsumer.java b/wpiutil/src/main/java/org/wpilib/util/function/FloatConsumer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/function/FloatConsumer.java
rename to wpiutil/src/main/java/org/wpilib/util/function/FloatConsumer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/function/FloatSupplier.java b/wpiutil/src/main/java/org/wpilib/util/function/FloatSupplier.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/function/FloatSupplier.java
rename to wpiutil/src/main/java/org/wpilib/util/function/FloatSupplier.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/protobuf/Protobuf.java b/wpiutil/src/main/java/org/wpilib/util/protobuf/Protobuf.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/protobuf/Protobuf.java
rename to wpiutil/src/main/java/org/wpilib/util/protobuf/Protobuf.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/protobuf/ProtobufBuffer.java b/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufBuffer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/protobuf/ProtobufBuffer.java
rename to wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufBuffer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/protobuf/ProtobufSerializable.java b/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufSerializable.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/protobuf/ProtobufSerializable.java
rename to wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufSerializable.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/ClassPreloader.java b/wpiutil/src/main/java/org/wpilib/util/runtime/ClassPreloader.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/ClassPreloader.java
rename to wpiutil/src/main/java/org/wpilib/util/runtime/ClassPreloader.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/CombinedRuntimeLoader.java b/wpiutil/src/main/java/org/wpilib/util/runtime/CombinedRuntimeLoader.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/CombinedRuntimeLoader.java
rename to wpiutil/src/main/java/org/wpilib/util/runtime/CombinedRuntimeLoader.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/MsvcRuntimeException.java b/wpiutil/src/main/java/org/wpilib/util/runtime/MsvcRuntimeException.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/MsvcRuntimeException.java
rename to wpiutil/src/main/java/org/wpilib/util/runtime/MsvcRuntimeException.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/RuntimeDetector.java b/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeDetector.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/RuntimeDetector.java
rename to wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeDetector.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/RuntimeLoader.java b/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeLoader.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/RuntimeLoader.java
rename to wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeLoader.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/sendable/Sendable.java b/wpiutil/src/main/java/org/wpilib/util/sendable/Sendable.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/sendable/Sendable.java
rename to wpiutil/src/main/java/org/wpilib/util/sendable/Sendable.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/sendable/SendableBuilder.java b/wpiutil/src/main/java/org/wpilib/util/sendable/SendableBuilder.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/sendable/SendableBuilder.java
rename to wpiutil/src/main/java/org/wpilib/util/sendable/SendableBuilder.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/sendable/SendableRegistry.java b/wpiutil/src/main/java/org/wpilib/util/sendable/SendableRegistry.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/sendable/SendableRegistry.java
rename to wpiutil/src/main/java/org/wpilib/util/sendable/SendableRegistry.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/BadSchemaException.java b/wpiutil/src/main/java/org/wpilib/util/struct/BadSchemaException.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/BadSchemaException.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/BadSchemaException.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/DynamicStruct.java b/wpiutil/src/main/java/org/wpilib/util/struct/DynamicStruct.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/DynamicStruct.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/DynamicStruct.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/Struct.java b/wpiutil/src/main/java/org/wpilib/util/struct/Struct.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/Struct.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/Struct.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructBuffer.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructBuffer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructBuffer.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructBuffer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructDescriptor.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptor.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructDescriptor.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptor.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructDescriptorDatabase.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptorDatabase.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructDescriptorDatabase.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptorDatabase.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructFetcher.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructFetcher.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructFetcher.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructFetcher.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructFieldDescriptor.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldDescriptor.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructFieldDescriptor.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructFieldDescriptor.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructFieldType.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldType.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructFieldType.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructFieldType.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructGenerator.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructGenerator.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructGenerator.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructGenerator.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/StructSerializable.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructSerializable.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/StructSerializable.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/StructSerializable.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/parser/Lexer.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/Lexer.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/parser/Lexer.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/parser/Lexer.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/parser/ParseException.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParseException.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/parser/ParseException.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/parser/ParseException.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/parser/ParsedDeclaration.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedDeclaration.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/parser/ParsedDeclaration.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedDeclaration.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/parser/ParsedSchema.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedSchema.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/parser/ParsedSchema.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedSchema.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/parser/Parser.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/Parser.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/parser/Parser.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/parser/Parser.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/struct/parser/TokenKind.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/TokenKind.java
similarity index 100%
rename from wpiutil/src/main/java/edu/wpi/first/util/struct/parser/TokenKind.java
rename to wpiutil/src/main/java/org/wpilib/util/struct/parser/TokenKind.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/ErrorMessagesTest.java b/wpiutil/src/test/java/org/wpilib/util/ErrorMessagesTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/ErrorMessagesTest.java
rename to wpiutil/src/test/java/org/wpilib/util/ErrorMessagesTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/WPIUtilJNITest.java b/wpiutil/src/test/java/org/wpilib/util/WPIUtilJNITest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/WPIUtilJNITest.java
rename to wpiutil/src/test/java/org/wpilib/util/WPIUtilJNITest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/cleanup/CleanupPoolTest.java b/wpiutil/src/test/java/org/wpilib/util/cleanup/CleanupPoolTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/cleanup/CleanupPoolTest.java
rename to wpiutil/src/test/java/org/wpilib/util/cleanup/CleanupPoolTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/cleanup/ReflectionCleanupTest.java b/wpiutil/src/test/java/org/wpilib/util/cleanup/ReflectionCleanupTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/cleanup/ReflectionCleanupTest.java
rename to wpiutil/src/test/java/org/wpilib/util/cleanup/ReflectionCleanupTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/CircularBufferTest.java b/wpiutil/src/test/java/org/wpilib/util/container/CircularBufferTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/CircularBufferTest.java
rename to wpiutil/src/test/java/org/wpilib/util/container/CircularBufferTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/DoubleCircularBufferTest.java b/wpiutil/src/test/java/org/wpilib/util/container/DoubleCircularBufferTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/DoubleCircularBufferTest.java
rename to wpiutil/src/test/java/org/wpilib/util/container/DoubleCircularBufferTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/struct/DynamicStructTest.java b/wpiutil/src/test/java/org/wpilib/util/struct/DynamicStructTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/struct/DynamicStructTest.java
rename to wpiutil/src/test/java/org/wpilib/util/struct/DynamicStructTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/struct/StructGeneratorTest.java b/wpiutil/src/test/java/org/wpilib/util/struct/StructGeneratorTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/struct/StructGeneratorTest.java
rename to wpiutil/src/test/java/org/wpilib/util/struct/StructGeneratorTest.java
diff --git a/wpiutil/src/test/java/edu/wpi/first/util/struct/parser/ParserTest.java b/wpiutil/src/test/java/org/wpilib/util/struct/parser/ParserTest.java
similarity index 100%
rename from wpiutil/src/test/java/edu/wpi/first/util/struct/parser/ParserTest.java
rename to wpiutil/src/test/java/org/wpilib/util/struct/parser/ParserTest.java
diff --git a/xrpVendordep/src/dev/java/edu/wpi/first/wpilibj/xrp/DevMain.java b/xrpVendordep/src/dev/java/org/wpilib/xrp/DevMain.java
similarity index 100%
rename from xrpVendordep/src/dev/java/edu/wpi/first/wpilibj/xrp/DevMain.java
rename to xrpVendordep/src/dev/java/org/wpilib/xrp/DevMain.java
diff --git a/xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPGyro.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPGyro.java
similarity index 100%
rename from xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPGyro.java
rename to xrpVendordep/src/main/java/org/wpilib/xrp/XRPGyro.java
diff --git a/xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPMotor.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPMotor.java
similarity index 100%
rename from xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPMotor.java
rename to xrpVendordep/src/main/java/org/wpilib/xrp/XRPMotor.java
diff --git a/xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPOnBoardIO.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPOnBoardIO.java
similarity index 100%
rename from xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPOnBoardIO.java
rename to xrpVendordep/src/main/java/org/wpilib/xrp/XRPOnBoardIO.java
diff --git a/xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPRangefinder.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPRangefinder.java
similarity index 100%
rename from xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPRangefinder.java
rename to xrpVendordep/src/main/java/org/wpilib/xrp/XRPRangefinder.java
diff --git a/xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPReflectanceSensor.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPReflectanceSensor.java
similarity index 100%
rename from xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPReflectanceSensor.java
rename to xrpVendordep/src/main/java/org/wpilib/xrp/XRPReflectanceSensor.java
diff --git a/xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPServo.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPServo.java
similarity index 100%
rename from xrpVendordep/src/main/java/edu/wpi/first/wpilibj/xrp/XRPServo.java
rename to xrpVendordep/src/main/java/org/wpilib/xrp/XRPServo.java