diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTag.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTag.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagDetection.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagDetection.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagDetector.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagDetector.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagDetector_cv.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector_cv.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagDetector_cv.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector_cv.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagFieldLayout.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagFieldLayout.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagFields.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagFields.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagPoseEstimate.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagPoseEstimate.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp
diff --git a/apriltag/src/main/native/include/frc/apriltag/AprilTagPoseEstimator.h b/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp
similarity index 100%
rename from apriltag/src/main/native/include/frc/apriltag/AprilTagPoseEstimator.h
rename to apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp
diff --git a/cameraserver/src/main/native/include/cameraserver/CameraServer.h b/cameraserver/src/main/native/include/wpi/cameraserver/CameraServer.hpp
similarity index 100%
rename from cameraserver/src/main/native/include/cameraserver/CameraServer.h
rename to cameraserver/src/main/native/include/wpi/cameraserver/CameraServer.hpp
diff --git a/cameraserver/src/main/native/include/cameraserver/CameraServerShared.h b/cameraserver/src/main/native/include/wpi/cameraserver/CameraServerShared.hpp
similarity index 100%
rename from cameraserver/src/main/native/include/cameraserver/CameraServerShared.h
rename to cameraserver/src/main/native/include/wpi/cameraserver/CameraServerShared.hpp
diff --git a/cameraserver/src/main/native/include/vision/VisionPipeline.h b/cameraserver/src/main/native/include/wpi/vision/VisionPipeline.hpp
similarity index 100%
rename from cameraserver/src/main/native/include/vision/VisionPipeline.h
rename to cameraserver/src/main/native/include/wpi/vision/VisionPipeline.hpp
diff --git a/cameraserver/src/main/native/include/vision/VisionRunner.h b/cameraserver/src/main/native/include/wpi/vision/VisionRunner.hpp
similarity index 100%
rename from cameraserver/src/main/native/include/vision/VisionRunner.h
rename to cameraserver/src/main/native/include/wpi/vision/VisionRunner.hpp
diff --git a/commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS4Controller.h b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp
similarity index 100%
rename from commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS4Controller.h
rename to commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp
diff --git a/commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS5Controller.h b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp
similarity index 100%
rename from commandsv2/src/generated/main/native/include/frc2/command/button/CommandPS5Controller.h
rename to commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp
diff --git a/commandsv2/src/generated/main/native/include/frc2/command/button/CommandStadiaController.h b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp
similarity index 100%
rename from commandsv2/src/generated/main/native/include/frc2/command/button/CommandStadiaController.h
rename to commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp
diff --git a/commandsv2/src/generated/main/native/include/frc2/command/button/CommandXboxController.h b/commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp
similarity index 100%
rename from commandsv2/src/generated/main/native/include/frc2/command/button/CommandXboxController.h
rename to commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/Command.h b/commandsv2/src/main/native/include/wpi/commands2/Command.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/Command.h
rename to commandsv2/src/main/native/include/wpi/commands2/Command.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/CommandHelper.h b/commandsv2/src/main/native/include/wpi/commands2/CommandHelper.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/CommandHelper.h
rename to commandsv2/src/main/native/include/wpi/commands2/CommandHelper.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/CommandPtr.h b/commandsv2/src/main/native/include/wpi/commands2/CommandPtr.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/CommandPtr.h
rename to commandsv2/src/main/native/include/wpi/commands2/CommandPtr.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/CommandScheduler.h b/commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/CommandScheduler.h
rename to commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/Commands.h b/commandsv2/src/main/native/include/wpi/commands2/Commands.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/Commands.h
rename to commandsv2/src/main/native/include/wpi/commands2/Commands.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/ConditionalCommand.h b/commandsv2/src/main/native/include/wpi/commands2/ConditionalCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/ConditionalCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/ConditionalCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/DeferredCommand.h b/commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/DeferredCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/FunctionalCommand.h b/commandsv2/src/main/native/include/wpi/commands2/FunctionalCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/FunctionalCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/FunctionalCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/InstantCommand.h b/commandsv2/src/main/native/include/wpi/commands2/InstantCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/InstantCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/InstantCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/NotifierCommand.h b/commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/NotifierCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/ParallelCommandGroup.h b/commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/ParallelCommandGroup.h
rename to commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/ParallelDeadlineGroup.h b/commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/ParallelDeadlineGroup.h
rename to commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/ParallelRaceGroup.h b/commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/ParallelRaceGroup.h
rename to commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/PrintCommand.h b/commandsv2/src/main/native/include/wpi/commands2/PrintCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/PrintCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/PrintCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/ProxyCommand.h b/commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/ProxyCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/RepeatCommand.h b/commandsv2/src/main/native/include/wpi/commands2/RepeatCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/RepeatCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/RepeatCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/Requirements.h b/commandsv2/src/main/native/include/wpi/commands2/Requirements.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/Requirements.h
rename to commandsv2/src/main/native/include/wpi/commands2/Requirements.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/RunCommand.h b/commandsv2/src/main/native/include/wpi/commands2/RunCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/RunCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/RunCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/ScheduleCommand.h b/commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/ScheduleCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/SelectCommand.h b/commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/SelectCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/SequentialCommandGroup.h b/commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/SequentialCommandGroup.h
rename to commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/StartEndCommand.h b/commandsv2/src/main/native/include/wpi/commands2/StartEndCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/StartEndCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/StartEndCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/Subsystem.h b/commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/Subsystem.h
rename to commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/SubsystemBase.h b/commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/SubsystemBase.h
rename to commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/WaitCommand.h b/commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/WaitCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/WaitUntilCommand.h b/commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/WaitUntilCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/WrapperCommand.h b/commandsv2/src/main/native/include/wpi/commands2/WrapperCommand.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/WrapperCommand.h
rename to commandsv2/src/main/native/include/wpi/commands2/WrapperCommand.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/CommandGamepad.h b/commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/CommandGamepad.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/CommandGenericHID.h b/commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/CommandGenericHID.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/CommandJoystick.h b/commandsv2/src/main/native/include/wpi/commands2/button/CommandJoystick.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/CommandJoystick.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/CommandJoystick.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/JoystickButton.h b/commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/JoystickButton.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/NetworkButton.h b/commandsv2/src/main/native/include/wpi/commands2/button/NetworkButton.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/NetworkButton.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/NetworkButton.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/POVButton.h b/commandsv2/src/main/native/include/wpi/commands2/button/POVButton.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/POVButton.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/POVButton.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/RobotModeTriggers.h b/commandsv2/src/main/native/include/wpi/commands2/button/RobotModeTriggers.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/RobotModeTriggers.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/RobotModeTriggers.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/button/Trigger.h b/commandsv2/src/main/native/include/wpi/commands2/button/Trigger.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/button/Trigger.h
rename to commandsv2/src/main/native/include/wpi/commands2/button/Trigger.hpp
diff --git a/commandsv2/src/main/native/include/frc2/command/sysid/SysIdRoutine.h b/commandsv2/src/main/native/include/wpi/commands2/sysid/SysIdRoutine.hpp
similarity index 100%
rename from commandsv2/src/main/native/include/frc2/command/sysid/SysIdRoutine.h
rename to commandsv2/src/main/native/include/wpi/commands2/sysid/SysIdRoutine.hpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.h b/commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.hpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.h
rename to commandsv2/src/test/native/cpp/frc2/command/CommandTestBase.hpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.h b/commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.hpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.h
rename to commandsv2/src/test/native/cpp/frc2/command/CompositionTestBase.hpp
diff --git a/commandsv2/src/test/native/cpp/frc2/command/make_vector.h b/commandsv2/src/test/native/cpp/frc2/command/make_vector.hpp
similarity index 100%
rename from commandsv2/src/test/native/cpp/frc2/command/make_vector.h
rename to commandsv2/src/test/native/cpp/frc2/command/make_vector.hpp
diff --git a/cscore/src/main/native/cpp/ConfigurableSourceImpl.h b/cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/ConfigurableSourceImpl.h
rename to cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp
diff --git a/cscore/src/main/native/cpp/Frame.h b/cscore/src/main/native/cpp/Frame.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Frame.h
rename to cscore/src/main/native/cpp/Frame.hpp
diff --git a/cscore/src/main/native/cpp/Handle.h b/cscore/src/main/native/cpp/Handle.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Handle.h
rename to cscore/src/main/native/cpp/Handle.hpp
diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.h b/cscore/src/main/native/cpp/HttpCameraImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/HttpCameraImpl.h
rename to cscore/src/main/native/cpp/HttpCameraImpl.hpp
diff --git a/cscore/src/main/native/cpp/Image.h b/cscore/src/main/native/cpp/Image.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Image.h
rename to cscore/src/main/native/cpp/Image.hpp
diff --git a/cscore/src/main/native/cpp/Instance.h b/cscore/src/main/native/cpp/Instance.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Instance.h
rename to cscore/src/main/native/cpp/Instance.hpp
diff --git a/cscore/src/main/native/cpp/JpegUtil.h b/cscore/src/main/native/cpp/JpegUtil.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/JpegUtil.h
rename to cscore/src/main/native/cpp/JpegUtil.hpp
diff --git a/cscore/src/main/native/cpp/Log.h b/cscore/src/main/native/cpp/Log.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Log.h
rename to cscore/src/main/native/cpp/Log.hpp
diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.h b/cscore/src/main/native/cpp/MjpegServerImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/MjpegServerImpl.h
rename to cscore/src/main/native/cpp/MjpegServerImpl.hpp
diff --git a/cscore/src/main/native/cpp/NetworkListener.h b/cscore/src/main/native/cpp/NetworkListener.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/NetworkListener.h
rename to cscore/src/main/native/cpp/NetworkListener.hpp
diff --git a/cscore/src/main/native/cpp/Notifier.h b/cscore/src/main/native/cpp/Notifier.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Notifier.h
rename to cscore/src/main/native/cpp/Notifier.hpp
diff --git a/cscore/src/main/native/cpp/PropertyContainer.h b/cscore/src/main/native/cpp/PropertyContainer.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/PropertyContainer.h
rename to cscore/src/main/native/cpp/PropertyContainer.hpp
diff --git a/cscore/src/main/native/cpp/PropertyImpl.h b/cscore/src/main/native/cpp/PropertyImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/PropertyImpl.h
rename to cscore/src/main/native/cpp/PropertyImpl.hpp
diff --git a/cscore/src/main/native/cpp/RawSinkImpl.h b/cscore/src/main/native/cpp/RawSinkImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/RawSinkImpl.h
rename to cscore/src/main/native/cpp/RawSinkImpl.hpp
diff --git a/cscore/src/main/native/cpp/RawSourceImpl.h b/cscore/src/main/native/cpp/RawSourceImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/RawSourceImpl.h
rename to cscore/src/main/native/cpp/RawSourceImpl.hpp
diff --git a/cscore/src/main/native/cpp/SinkImpl.h b/cscore/src/main/native/cpp/SinkImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/SinkImpl.h
rename to cscore/src/main/native/cpp/SinkImpl.hpp
diff --git a/cscore/src/main/native/cpp/SourceImpl.h b/cscore/src/main/native/cpp/SourceImpl.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/SourceImpl.h
rename to cscore/src/main/native/cpp/SourceImpl.hpp
diff --git a/cscore/src/main/native/cpp/Telemetry.h b/cscore/src/main/native/cpp/Telemetry.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/Telemetry.h
rename to cscore/src/main/native/cpp/Telemetry.hpp
diff --git a/cscore/src/main/native/cpp/UnlimitedHandleResource.h b/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/UnlimitedHandleResource.h
rename to cscore/src/main/native/cpp/UnlimitedHandleResource.hpp
diff --git a/cscore/src/main/native/cpp/UsbCameraListener.h b/cscore/src/main/native/cpp/UsbCameraListener.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/UsbCameraListener.h
rename to cscore/src/main/native/cpp/UsbCameraListener.hpp
diff --git a/cscore/src/main/native/cpp/c_util.h b/cscore/src/main/native/cpp/c_util.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/c_util.h
rename to cscore/src/main/native/cpp/c_util.hpp
diff --git a/cscore/src/main/native/cpp/default_init_allocator.h b/cscore/src/main/native/cpp/default_init_allocator.hpp
similarity index 100%
rename from cscore/src/main/native/cpp/default_init_allocator.h
rename to cscore/src/main/native/cpp/default_init_allocator.hpp
diff --git a/cscore/src/main/native/include/cscore.h b/cscore/src/main/native/include/wpi/cs/cscore.h
similarity index 100%
rename from cscore/src/main/native/include/cscore.h
rename to cscore/src/main/native/include/wpi/cs/cscore.h
diff --git a/cscore/src/main/native/include/cscore_c.h b/cscore/src/main/native/include/wpi/cs/cscore_c.h
similarity index 100%
rename from cscore/src/main/native/include/cscore_c.h
rename to cscore/src/main/native/include/wpi/cs/cscore_c.h
diff --git a/cscore/src/main/native/include/cscore_cpp.h b/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp
similarity index 100%
rename from cscore/src/main/native/include/cscore_cpp.h
rename to cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp
diff --git a/cscore/src/main/native/include/cscore_cv.h b/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp
similarity index 100%
rename from cscore/src/main/native/include/cscore_cv.h
rename to cscore/src/main/native/include/wpi/cs/cscore_cv.hpp
diff --git a/cscore/src/main/native/include/cscore_oo.h b/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp
similarity index 100%
rename from cscore/src/main/native/include/cscore_oo.h
rename to cscore/src/main/native/include/wpi/cs/cscore_oo.hpp
diff --git a/cscore/src/main/native/include/cscore_raw.h b/cscore/src/main/native/include/wpi/cs/cscore_raw.h
similarity index 100%
rename from cscore/src/main/native/include/cscore_raw.h
rename to cscore/src/main/native/include/wpi/cs/cscore_raw.h
diff --git a/cscore/src/main/native/include/cscore_runloop.h b/cscore/src/main/native/include/wpi/cs/cscore_runloop.hpp
similarity index 100%
rename from cscore/src/main/native/include/cscore_runloop.h
rename to cscore/src/main/native/include/wpi/cs/cscore_runloop.hpp
diff --git a/cscore/src/main/native/linux/UsbCameraBuffer.h b/cscore/src/main/native/linux/UsbCameraBuffer.hpp
similarity index 100%
rename from cscore/src/main/native/linux/UsbCameraBuffer.h
rename to cscore/src/main/native/linux/UsbCameraBuffer.hpp
diff --git a/cscore/src/main/native/linux/UsbCameraImpl.h b/cscore/src/main/native/linux/UsbCameraImpl.hpp
similarity index 100%
rename from cscore/src/main/native/linux/UsbCameraImpl.h
rename to cscore/src/main/native/linux/UsbCameraImpl.hpp
diff --git a/cscore/src/main/native/linux/UsbCameraProperty.h b/cscore/src/main/native/linux/UsbCameraProperty.hpp
similarity index 100%
rename from cscore/src/main/native/linux/UsbCameraProperty.h
rename to cscore/src/main/native/linux/UsbCameraProperty.hpp
diff --git a/cscore/src/main/native/linux/UsbUtil.h b/cscore/src/main/native/linux/UsbUtil.hpp
similarity index 100%
rename from cscore/src/main/native/linux/UsbUtil.h
rename to cscore/src/main/native/linux/UsbUtil.hpp
diff --git a/cscore/src/main/native/objcpp/UsbCameraDelegate.h b/cscore/src/main/native/objcpp/UsbCameraDelegate.hpp
similarity index 100%
rename from cscore/src/main/native/objcpp/UsbCameraDelegate.h
rename to cscore/src/main/native/objcpp/UsbCameraDelegate.hpp
diff --git a/cscore/src/main/native/objcpp/UsbCameraImpl.h b/cscore/src/main/native/objcpp/UsbCameraImpl.hpp
similarity index 100%
rename from cscore/src/main/native/objcpp/UsbCameraImpl.h
rename to cscore/src/main/native/objcpp/UsbCameraImpl.hpp
diff --git a/cscore/src/main/native/objcpp/UsbCameraImplObjc.h b/cscore/src/main/native/objcpp/UsbCameraImplObjc.hpp
similarity index 100%
rename from cscore/src/main/native/objcpp/UsbCameraImplObjc.h
rename to cscore/src/main/native/objcpp/UsbCameraImplObjc.hpp
diff --git a/cscore/src/main/native/objcpp/UvcControlImpl.h b/cscore/src/main/native/objcpp/UvcControlImpl.hpp
similarity index 100%
rename from cscore/src/main/native/objcpp/UvcControlImpl.h
rename to cscore/src/main/native/objcpp/UvcControlImpl.hpp
diff --git a/cscore/src/main/native/windows/COMCreators.h b/cscore/src/main/native/windows/COMCreators.hpp
similarity index 100%
rename from cscore/src/main/native/windows/COMCreators.h
rename to cscore/src/main/native/windows/COMCreators.hpp
diff --git a/cscore/src/main/native/windows/ComPtr.h b/cscore/src/main/native/windows/ComPtr.hpp
similarity index 100%
rename from cscore/src/main/native/windows/ComPtr.h
rename to cscore/src/main/native/windows/ComPtr.hpp
diff --git a/cscore/src/main/native/windows/UsbCameraImpl.h b/cscore/src/main/native/windows/UsbCameraImpl.hpp
similarity index 100%
rename from cscore/src/main/native/windows/UsbCameraImpl.h
rename to cscore/src/main/native/windows/UsbCameraImpl.hpp
diff --git a/cscore/src/main/native/windows/UsbCameraProperty.h b/cscore/src/main/native/windows/UsbCameraProperty.hpp
similarity index 100%
rename from cscore/src/main/native/windows/UsbCameraProperty.h
rename to cscore/src/main/native/windows/UsbCameraProperty.hpp
diff --git a/cscore/src/main/native/windows/WindowsMessagePump.h b/cscore/src/main/native/windows/WindowsMessagePump.hpp
similarity index 100%
rename from cscore/src/main/native/windows/WindowsMessagePump.h
rename to cscore/src/main/native/windows/WindowsMessagePump.hpp
diff --git a/datalog/src/main/native/cpp/jni/DataLogJNI.h b/datalog/src/main/native/cpp/jni/DataLogJNI.hpp
similarity index 100%
rename from datalog/src/main/native/cpp/jni/DataLogJNI.h
rename to datalog/src/main/native/cpp/jni/DataLogJNI.hpp
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLog.h b/datalog/src/main/native/include/wpi/datalog/DataLog.hpp
similarity index 100%
rename from datalog/src/main/native/include/wpi/datalog/DataLog.h
rename to datalog/src/main/native/include/wpi/datalog/DataLog.hpp
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.h b/datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp
similarity index 100%
rename from datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.h
rename to datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLogReader.h b/datalog/src/main/native/include/wpi/datalog/DataLogReader.hpp
similarity index 100%
rename from datalog/src/main/native/include/wpi/datalog/DataLogReader.h
rename to datalog/src/main/native/include/wpi/datalog/DataLogReader.hpp
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.h b/datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp
similarity index 100%
rename from datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.h
rename to datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLogWriter.h b/datalog/src/main/native/include/wpi/datalog/DataLogWriter.hpp
similarity index 100%
rename from datalog/src/main/native/include/wpi/datalog/DataLogWriter.h
rename to datalog/src/main/native/include/wpi/datalog/DataLogWriter.hpp
diff --git a/datalog/src/main/native/include/wpi/datalog/FileLogger.h b/datalog/src/main/native/include/wpi/datalog/FileLogger.hpp
similarity index 100%
rename from datalog/src/main/native/include/wpi/datalog/FileLogger.h
rename to datalog/src/main/native/include/wpi/datalog/FileLogger.hpp
diff --git a/fields/src/main/native/include/fields/2018-powerup.h b/fields/src/main/native/include/wpi/fields/2018-powerup.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2018-powerup.h
rename to fields/src/main/native/include/wpi/fields/2018-powerup.hpp
diff --git a/fields/src/main/native/include/fields/2019-deepspace.h b/fields/src/main/native/include/wpi/fields/2019-deepspace.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2019-deepspace.h
rename to fields/src/main/native/include/wpi/fields/2019-deepspace.hpp
diff --git a/fields/src/main/native/include/fields/2020-infiniterecharge.h b/fields/src/main/native/include/wpi/fields/2020-infiniterecharge.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2020-infiniterecharge.h
rename to fields/src/main/native/include/wpi/fields/2020-infiniterecharge.hpp
diff --git a/fields/src/main/native/include/fields/2021-barrel.h b/fields/src/main/native/include/wpi/fields/2021-barrel.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2021-barrel.h
rename to fields/src/main/native/include/wpi/fields/2021-barrel.hpp
diff --git a/fields/src/main/native/include/fields/2021-bounce.h b/fields/src/main/native/include/wpi/fields/2021-bounce.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2021-bounce.h
rename to fields/src/main/native/include/wpi/fields/2021-bounce.hpp
diff --git a/fields/src/main/native/include/fields/2021-galacticsearcha.h b/fields/src/main/native/include/wpi/fields/2021-galacticsearcha.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2021-galacticsearcha.h
rename to fields/src/main/native/include/wpi/fields/2021-galacticsearcha.hpp
diff --git a/fields/src/main/native/include/fields/2021-galacticsearchb.h b/fields/src/main/native/include/wpi/fields/2021-galacticsearchb.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2021-galacticsearchb.h
rename to fields/src/main/native/include/wpi/fields/2021-galacticsearchb.hpp
diff --git a/fields/src/main/native/include/fields/2021-infiniterecharge.h b/fields/src/main/native/include/wpi/fields/2021-infiniterecharge.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2021-infiniterecharge.h
rename to fields/src/main/native/include/wpi/fields/2021-infiniterecharge.hpp
diff --git a/fields/src/main/native/include/fields/2021-slalom.h b/fields/src/main/native/include/wpi/fields/2021-slalom.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2021-slalom.h
rename to fields/src/main/native/include/wpi/fields/2021-slalom.hpp
diff --git a/fields/src/main/native/include/fields/2022-rapidreact.h b/fields/src/main/native/include/wpi/fields/2022-rapidreact.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2022-rapidreact.h
rename to fields/src/main/native/include/wpi/fields/2022-rapidreact.hpp
diff --git a/fields/src/main/native/include/fields/2023-chargedup.h b/fields/src/main/native/include/wpi/fields/2023-chargedup.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2023-chargedup.h
rename to fields/src/main/native/include/wpi/fields/2023-chargedup.hpp
diff --git a/fields/src/main/native/include/fields/2024-crescendo.h b/fields/src/main/native/include/wpi/fields/2024-crescendo.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2024-crescendo.h
rename to fields/src/main/native/include/wpi/fields/2024-crescendo.hpp
diff --git a/fields/src/main/native/include/fields/2025-reefscape.h b/fields/src/main/native/include/wpi/fields/2025-reefscape.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/2025-reefscape.h
rename to fields/src/main/native/include/wpi/fields/2025-reefscape.hpp
diff --git a/fields/src/main/native/include/fields/fields.h b/fields/src/main/native/include/wpi/fields/fields.hpp
similarity index 100%
rename from fields/src/main/native/include/fields/fields.h
rename to fields/src/main/native/include/wpi/fields/fields.hpp
diff --git a/glass/src/app/native/cpp/camerasupport.h b/glass/src/app/native/cpp/camerasupport.hpp
similarity index 100%
rename from glass/src/app/native/cpp/camerasupport.h
rename to glass/src/app/native/cpp/camerasupport.hpp
diff --git a/glass/src/lib/native/include/glass/Context.h b/glass/src/lib/native/include/wpi/glass/Context.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/Context.h
rename to glass/src/lib/native/include/wpi/glass/Context.hpp
diff --git a/glass/src/lib/native/include/glass/ContextInternal.h b/glass/src/lib/native/include/wpi/glass/ContextInternal.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/ContextInternal.h
rename to glass/src/lib/native/include/wpi/glass/ContextInternal.hpp
diff --git a/glass/src/lib/native/include/glass/DataSource.h b/glass/src/lib/native/include/wpi/glass/DataSource.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/DataSource.h
rename to glass/src/lib/native/include/wpi/glass/DataSource.hpp
diff --git a/glass/src/lib/native/include/glass/MainMenuBar.h b/glass/src/lib/native/include/wpi/glass/MainMenuBar.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/MainMenuBar.h
rename to glass/src/lib/native/include/wpi/glass/MainMenuBar.hpp
diff --git a/glass/src/lib/native/include/glass/Model.h b/glass/src/lib/native/include/wpi/glass/Model.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/Model.h
rename to glass/src/lib/native/include/wpi/glass/Model.hpp
diff --git a/glass/src/lib/native/include/glass/Provider.h b/glass/src/lib/native/include/wpi/glass/Provider.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/Provider.h
rename to glass/src/lib/native/include/wpi/glass/Provider.hpp
diff --git a/glass/src/lib/native/include/glass/Storage.h b/glass/src/lib/native/include/wpi/glass/Storage.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/Storage.h
rename to glass/src/lib/native/include/wpi/glass/Storage.hpp
diff --git a/glass/src/lib/native/include/glass/View.h b/glass/src/lib/native/include/wpi/glass/View.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/View.h
rename to glass/src/lib/native/include/wpi/glass/View.hpp
diff --git a/glass/src/lib/native/include/glass/Window.h b/glass/src/lib/native/include/wpi/glass/Window.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/Window.h
rename to glass/src/lib/native/include/wpi/glass/Window.hpp
diff --git a/glass/src/lib/native/include/glass/WindowManager.h b/glass/src/lib/native/include/wpi/glass/WindowManager.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/WindowManager.h
rename to glass/src/lib/native/include/wpi/glass/WindowManager.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/AnalogInput.h b/glass/src/lib/native/include/wpi/glass/hardware/AnalogInput.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/AnalogInput.h
rename to glass/src/lib/native/include/wpi/glass/hardware/AnalogInput.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/DIO.h b/glass/src/lib/native/include/wpi/glass/hardware/DIO.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/DIO.h
rename to glass/src/lib/native/include/wpi/glass/hardware/DIO.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/Encoder.h b/glass/src/lib/native/include/wpi/glass/hardware/Encoder.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/Encoder.h
rename to glass/src/lib/native/include/wpi/glass/hardware/Encoder.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/Gyro.h b/glass/src/lib/native/include/wpi/glass/hardware/Gyro.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/Gyro.h
rename to glass/src/lib/native/include/wpi/glass/hardware/Gyro.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/LEDDisplay.h b/glass/src/lib/native/include/wpi/glass/hardware/LEDDisplay.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/LEDDisplay.h
rename to glass/src/lib/native/include/wpi/glass/hardware/LEDDisplay.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/MotorController.h b/glass/src/lib/native/include/wpi/glass/hardware/MotorController.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/MotorController.h
rename to glass/src/lib/native/include/wpi/glass/hardware/MotorController.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/PWM.h b/glass/src/lib/native/include/wpi/glass/hardware/PWM.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/PWM.h
rename to glass/src/lib/native/include/wpi/glass/hardware/PWM.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/Pneumatic.h b/glass/src/lib/native/include/wpi/glass/hardware/Pneumatic.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/Pneumatic.h
rename to glass/src/lib/native/include/wpi/glass/hardware/Pneumatic.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/PowerDistribution.h b/glass/src/lib/native/include/wpi/glass/hardware/PowerDistribution.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/PowerDistribution.h
rename to glass/src/lib/native/include/wpi/glass/hardware/PowerDistribution.hpp
diff --git a/glass/src/lib/native/include/glass/hardware/RoboRio.h b/glass/src/lib/native/include/wpi/glass/hardware/RoboRio.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/hardware/RoboRio.h
rename to glass/src/lib/native/include/wpi/glass/hardware/RoboRio.hpp
diff --git a/glass/src/lib/native/include/glass/other/Alerts.h b/glass/src/lib/native/include/wpi/glass/other/Alerts.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Alerts.h
rename to glass/src/lib/native/include/wpi/glass/other/Alerts.hpp
diff --git a/glass/src/lib/native/include/glass/other/CommandScheduler.h b/glass/src/lib/native/include/wpi/glass/other/CommandScheduler.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/CommandScheduler.h
rename to glass/src/lib/native/include/wpi/glass/other/CommandScheduler.hpp
diff --git a/glass/src/lib/native/include/glass/other/CommandSelector.h b/glass/src/lib/native/include/wpi/glass/other/CommandSelector.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/CommandSelector.h
rename to glass/src/lib/native/include/wpi/glass/other/CommandSelector.hpp
diff --git a/glass/src/lib/native/include/glass/other/DeviceTree.h b/glass/src/lib/native/include/wpi/glass/other/DeviceTree.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/DeviceTree.h
rename to glass/src/lib/native/include/wpi/glass/other/DeviceTree.hpp
diff --git a/glass/src/lib/native/include/glass/other/Drive.h b/glass/src/lib/native/include/wpi/glass/other/Drive.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Drive.h
rename to glass/src/lib/native/include/wpi/glass/other/Drive.hpp
diff --git a/glass/src/lib/native/include/glass/other/FMS.h b/glass/src/lib/native/include/wpi/glass/other/FMS.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/FMS.h
rename to glass/src/lib/native/include/wpi/glass/other/FMS.hpp
diff --git a/glass/src/lib/native/include/glass/other/Field2D.h b/glass/src/lib/native/include/wpi/glass/other/Field2D.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Field2D.h
rename to glass/src/lib/native/include/wpi/glass/other/Field2D.hpp
diff --git a/glass/src/lib/native/include/glass/other/Log.h b/glass/src/lib/native/include/wpi/glass/other/Log.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Log.h
rename to glass/src/lib/native/include/wpi/glass/other/Log.hpp
diff --git a/glass/src/lib/native/include/glass/other/Mechanism2D.h b/glass/src/lib/native/include/wpi/glass/other/Mechanism2D.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Mechanism2D.h
rename to glass/src/lib/native/include/wpi/glass/other/Mechanism2D.hpp
diff --git a/glass/src/lib/native/include/glass/other/PIDController.h b/glass/src/lib/native/include/wpi/glass/other/PIDController.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/PIDController.h
rename to glass/src/lib/native/include/wpi/glass/other/PIDController.hpp
diff --git a/glass/src/lib/native/include/glass/other/Plot.h b/glass/src/lib/native/include/wpi/glass/other/Plot.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Plot.h
rename to glass/src/lib/native/include/wpi/glass/other/Plot.hpp
diff --git a/glass/src/lib/native/include/glass/other/ProfiledPIDController.h b/glass/src/lib/native/include/wpi/glass/other/ProfiledPIDController.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/ProfiledPIDController.h
rename to glass/src/lib/native/include/wpi/glass/other/ProfiledPIDController.hpp
diff --git a/glass/src/lib/native/include/glass/other/StringChooser.h b/glass/src/lib/native/include/wpi/glass/other/StringChooser.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/StringChooser.h
rename to glass/src/lib/native/include/wpi/glass/other/StringChooser.hpp
diff --git a/glass/src/lib/native/include/glass/other/Subsystem.h b/glass/src/lib/native/include/wpi/glass/other/Subsystem.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/other/Subsystem.h
rename to glass/src/lib/native/include/wpi/glass/other/Subsystem.hpp
diff --git a/glass/src/lib/native/include/glass/support/ColorSetting.h b/glass/src/lib/native/include/wpi/glass/support/ColorSetting.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/support/ColorSetting.h
rename to glass/src/lib/native/include/wpi/glass/support/ColorSetting.hpp
diff --git a/glass/src/lib/native/include/glass/support/EnumSetting.h b/glass/src/lib/native/include/wpi/glass/support/EnumSetting.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/support/EnumSetting.h
rename to glass/src/lib/native/include/wpi/glass/support/EnumSetting.hpp
diff --git a/glass/src/lib/native/include/glass/support/ExpressionParser.h b/glass/src/lib/native/include/wpi/glass/support/ExpressionParser.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/support/ExpressionParser.h
rename to glass/src/lib/native/include/wpi/glass/support/ExpressionParser.hpp
diff --git a/glass/src/lib/native/include/glass/support/ExtraGuiWidgets.h b/glass/src/lib/native/include/wpi/glass/support/ExtraGuiWidgets.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/support/ExtraGuiWidgets.h
rename to glass/src/lib/native/include/wpi/glass/support/ExtraGuiWidgets.hpp
diff --git a/glass/src/lib/native/include/glass/support/NameSetting.h b/glass/src/lib/native/include/wpi/glass/support/NameSetting.hpp
similarity index 100%
rename from glass/src/lib/native/include/glass/support/NameSetting.h
rename to glass/src/lib/native/include/wpi/glass/support/NameSetting.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTAlerts.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTAlerts.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTAlerts.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTAlerts.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTCommandScheduler.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandScheduler.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTCommandScheduler.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTCommandScheduler.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTCommandSelector.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandSelector.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTCommandSelector.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTCommandSelector.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTDifferentialDrive.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTDifferentialDrive.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTDifferentialDrive.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTDifferentialDrive.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTDigitalInput.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalInput.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTDigitalInput.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalInput.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTDigitalOutput.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalOutput.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTDigitalOutput.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalOutput.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTFMS.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTFMS.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTFMS.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTFMS.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTField2D.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTField2D.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTField2D.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTField2D.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTGyro.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTGyro.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTGyro.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTGyro.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTMecanumDrive.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTMecanumDrive.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTMecanumDrive.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTMecanumDrive.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTMechanism2D.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTMechanism2D.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTMechanism2D.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTMechanism2D.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTMotorController.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTMotorController.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTMotorController.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTMotorController.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTPIDController.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTPIDController.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTPIDController.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTPIDController.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTProfiledPIDController.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTProfiledPIDController.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTProfiledPIDController.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTProfiledPIDController.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTStringChooser.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTStringChooser.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTStringChooser.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTStringChooser.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NTSubsystem.h b/glass/src/libnt/native/include/wpi/glass/networktables/NTSubsystem.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NTSubsystem.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NTSubsystem.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NetworkTables.h b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTables.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NetworkTables.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NetworkTables.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NetworkTablesProvider.h b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesProvider.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NetworkTablesProvider.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesProvider.hpp
diff --git a/glass/src/libnt/native/include/glass/networktables/NetworkTablesSettings.h b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesSettings.hpp
similarity index 100%
rename from glass/src/libnt/native/include/glass/networktables/NetworkTablesSettings.h
rename to glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesSettings.hpp
diff --git a/hal/src/main/native/include/hal/.clang-tidy b/hal/src/main/native/include/wpi/hal/.clang-tidy
similarity index 100%
rename from hal/src/main/native/include/hal/.clang-tidy
rename to hal/src/main/native/include/wpi/hal/.clang-tidy
diff --git a/hal/src/main/native/include/hal/AddressableLED.h b/hal/src/main/native/include/wpi/hal/AddressableLED.h
similarity index 100%
rename from hal/src/main/native/include/hal/AddressableLED.h
rename to hal/src/main/native/include/wpi/hal/AddressableLED.h
diff --git a/hal/src/main/native/include/hal/AddressableLEDTypes.h b/hal/src/main/native/include/wpi/hal/AddressableLEDTypes.h
similarity index 100%
rename from hal/src/main/native/include/hal/AddressableLEDTypes.h
rename to hal/src/main/native/include/wpi/hal/AddressableLEDTypes.h
diff --git a/hal/src/main/native/include/hal/AnalogInput.h b/hal/src/main/native/include/wpi/hal/AnalogInput.h
similarity index 100%
rename from hal/src/main/native/include/hal/AnalogInput.h
rename to hal/src/main/native/include/wpi/hal/AnalogInput.h
diff --git a/hal/src/main/native/include/hal/CAN.h b/hal/src/main/native/include/wpi/hal/CAN.h
similarity index 100%
rename from hal/src/main/native/include/hal/CAN.h
rename to hal/src/main/native/include/wpi/hal/CAN.h
diff --git a/hal/src/main/native/include/hal/CANAPI.h b/hal/src/main/native/include/wpi/hal/CANAPI.h
similarity index 100%
rename from hal/src/main/native/include/hal/CANAPI.h
rename to hal/src/main/native/include/wpi/hal/CANAPI.h
diff --git a/hal/src/main/native/include/hal/CANAPITypes.h b/hal/src/main/native/include/wpi/hal/CANAPITypes.h
similarity index 100%
rename from hal/src/main/native/include/hal/CANAPITypes.h
rename to hal/src/main/native/include/wpi/hal/CANAPITypes.h
diff --git a/hal/src/main/native/include/hal/CTREPCM.h b/hal/src/main/native/include/wpi/hal/CTREPCM.h
similarity index 100%
rename from hal/src/main/native/include/hal/CTREPCM.h
rename to hal/src/main/native/include/wpi/hal/CTREPCM.h
diff --git a/hal/src/main/native/include/hal/Constants.h b/hal/src/main/native/include/wpi/hal/Constants.h
similarity index 100%
rename from hal/src/main/native/include/hal/Constants.h
rename to hal/src/main/native/include/wpi/hal/Constants.h
diff --git a/hal/src/main/native/include/hal/Counter.h b/hal/src/main/native/include/wpi/hal/Counter.h
similarity index 100%
rename from hal/src/main/native/include/hal/Counter.h
rename to hal/src/main/native/include/wpi/hal/Counter.h
diff --git a/hal/src/main/native/include/hal/DIO.h b/hal/src/main/native/include/wpi/hal/DIO.h
similarity index 100%
rename from hal/src/main/native/include/hal/DIO.h
rename to hal/src/main/native/include/wpi/hal/DIO.h
diff --git a/hal/src/main/native/include/hal/DriverStation.h b/hal/src/main/native/include/wpi/hal/DriverStation.h
similarity index 100%
rename from hal/src/main/native/include/hal/DriverStation.h
rename to hal/src/main/native/include/wpi/hal/DriverStation.h
diff --git a/hal/src/main/native/include/hal/DriverStationTypes.h b/hal/src/main/native/include/wpi/hal/DriverStationTypes.h
similarity index 100%
rename from hal/src/main/native/include/hal/DriverStationTypes.h
rename to hal/src/main/native/include/wpi/hal/DriverStationTypes.h
diff --git a/hal/src/main/native/include/hal/DutyCycle.h b/hal/src/main/native/include/wpi/hal/DutyCycle.h
similarity index 100%
rename from hal/src/main/native/include/hal/DutyCycle.h
rename to hal/src/main/native/include/wpi/hal/DutyCycle.h
diff --git a/hal/src/main/native/include/hal/Encoder.h b/hal/src/main/native/include/wpi/hal/Encoder.h
similarity index 100%
rename from hal/src/main/native/include/hal/Encoder.h
rename to hal/src/main/native/include/wpi/hal/Encoder.h
diff --git a/hal/src/main/native/include/hal/Errors.h b/hal/src/main/native/include/wpi/hal/Errors.h
similarity index 100%
rename from hal/src/main/native/include/hal/Errors.h
rename to hal/src/main/native/include/wpi/hal/Errors.h
diff --git a/hal/src/main/native/include/hal/Extensions.h b/hal/src/main/native/include/wpi/hal/Extensions.h
similarity index 100%
rename from hal/src/main/native/include/hal/Extensions.h
rename to hal/src/main/native/include/wpi/hal/Extensions.h
diff --git a/hal/src/main/native/include/hal/HAL.h b/hal/src/main/native/include/wpi/hal/HAL.h
similarity index 100%
rename from hal/src/main/native/include/hal/HAL.h
rename to hal/src/main/native/include/wpi/hal/HAL.h
diff --git a/hal/src/main/native/include/hal/HALBase.h b/hal/src/main/native/include/wpi/hal/HALBase.h
similarity index 100%
rename from hal/src/main/native/include/hal/HALBase.h
rename to hal/src/main/native/include/wpi/hal/HALBase.h
diff --git a/hal/src/main/native/include/hal/I2C.h b/hal/src/main/native/include/wpi/hal/I2C.h
similarity index 100%
rename from hal/src/main/native/include/hal/I2C.h
rename to hal/src/main/native/include/wpi/hal/I2C.h
diff --git a/hal/src/main/native/include/hal/I2CTypes.h b/hal/src/main/native/include/wpi/hal/I2CTypes.h
similarity index 100%
rename from hal/src/main/native/include/hal/I2CTypes.h
rename to hal/src/main/native/include/wpi/hal/I2CTypes.h
diff --git a/hal/src/main/native/include/hal/IMU.h b/hal/src/main/native/include/wpi/hal/IMU.h
similarity index 100%
rename from hal/src/main/native/include/hal/IMU.h
rename to hal/src/main/native/include/wpi/hal/IMU.h
diff --git a/hal/src/main/native/include/hal/IMUTypes.h b/hal/src/main/native/include/wpi/hal/IMUTypes.h
similarity index 100%
rename from hal/src/main/native/include/hal/IMUTypes.h
rename to hal/src/main/native/include/wpi/hal/IMUTypes.h
diff --git a/hal/src/main/native/include/hal/Main.h b/hal/src/main/native/include/wpi/hal/Main.h
similarity index 100%
rename from hal/src/main/native/include/hal/Main.h
rename to hal/src/main/native/include/wpi/hal/Main.h
diff --git a/hal/src/main/native/include/hal/Notifier.h b/hal/src/main/native/include/wpi/hal/Notifier.h
similarity index 100%
rename from hal/src/main/native/include/hal/Notifier.h
rename to hal/src/main/native/include/wpi/hal/Notifier.h
diff --git a/hal/src/main/native/include/hal/PWM.h b/hal/src/main/native/include/wpi/hal/PWM.h
similarity index 100%
rename from hal/src/main/native/include/hal/PWM.h
rename to hal/src/main/native/include/wpi/hal/PWM.h
diff --git a/hal/src/main/native/include/hal/Ports.h b/hal/src/main/native/include/wpi/hal/Ports.h
similarity index 100%
rename from hal/src/main/native/include/hal/Ports.h
rename to hal/src/main/native/include/wpi/hal/Ports.h
diff --git a/hal/src/main/native/include/hal/Power.h b/hal/src/main/native/include/wpi/hal/Power.h
similarity index 100%
rename from hal/src/main/native/include/hal/Power.h
rename to hal/src/main/native/include/wpi/hal/Power.h
diff --git a/hal/src/main/native/include/hal/PowerDistribution.h b/hal/src/main/native/include/wpi/hal/PowerDistribution.h
similarity index 100%
rename from hal/src/main/native/include/hal/PowerDistribution.h
rename to hal/src/main/native/include/wpi/hal/PowerDistribution.h
diff --git a/hal/src/main/native/include/hal/REVPH.h b/hal/src/main/native/include/wpi/hal/REVPH.h
similarity index 100%
rename from hal/src/main/native/include/hal/REVPH.h
rename to hal/src/main/native/include/wpi/hal/REVPH.h
diff --git a/hal/src/main/native/include/hal/SerialPort.h b/hal/src/main/native/include/wpi/hal/SerialPort.h
similarity index 100%
rename from hal/src/main/native/include/hal/SerialPort.h
rename to hal/src/main/native/include/wpi/hal/SerialPort.h
diff --git a/hal/src/main/native/include/hal/SimDevice.h b/hal/src/main/native/include/wpi/hal/SimDevice.h
similarity index 100%
rename from hal/src/main/native/include/hal/SimDevice.h
rename to hal/src/main/native/include/wpi/hal/SimDevice.h
diff --git a/hal/src/main/native/include/hal/SystemServer.h b/hal/src/main/native/include/wpi/hal/SystemServer.h
similarity index 100%
rename from hal/src/main/native/include/hal/SystemServer.h
rename to hal/src/main/native/include/wpi/hal/SystemServer.h
diff --git a/hal/src/main/native/include/hal/Threads.h b/hal/src/main/native/include/wpi/hal/Threads.h
similarity index 100%
rename from hal/src/main/native/include/hal/Threads.h
rename to hal/src/main/native/include/wpi/hal/Threads.h
diff --git a/hal/src/main/native/include/hal/Types.h b/hal/src/main/native/include/wpi/hal/Types.h
similarity index 100%
rename from hal/src/main/native/include/hal/Types.h
rename to hal/src/main/native/include/wpi/hal/Types.h
diff --git a/hal/src/main/native/include/hal/UsageReporting.h b/hal/src/main/native/include/wpi/hal/UsageReporting.h
similarity index 100%
rename from hal/src/main/native/include/hal/UsageReporting.h
rename to hal/src/main/native/include/wpi/hal/UsageReporting.h
diff --git a/hal/src/main/native/include/hal/Value.h b/hal/src/main/native/include/wpi/hal/Value.h
similarity index 100%
rename from hal/src/main/native/include/hal/Value.h
rename to hal/src/main/native/include/wpi/hal/Value.h
diff --git a/hal/src/main/native/include/hal/cpp/fpga_clock.h b/hal/src/main/native/include/wpi/hal/cpp/fpga_clock.h
similarity index 100%
rename from hal/src/main/native/include/hal/cpp/fpga_clock.h
rename to hal/src/main/native/include/wpi/hal/cpp/fpga_clock.h
diff --git a/hal/src/main/native/include/hal/handles/DigitalHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/DigitalHandleResource.h
rename to hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.h
diff --git a/hal/src/main/native/include/hal/handles/HandlesInternal.h b/hal/src/main/native/include/wpi/hal/handles/HandlesInternal.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/HandlesInternal.h
rename to hal/src/main/native/include/wpi/hal/handles/HandlesInternal.h
diff --git a/hal/src/main/native/include/hal/handles/IndexedClassedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/IndexedClassedHandleResource.h
rename to hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.h
diff --git a/hal/src/main/native/include/hal/handles/IndexedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/IndexedHandleResource.h
rename to hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.h
diff --git a/hal/src/main/native/include/hal/handles/LimitedClassedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/LimitedClassedHandleResource.h
rename to hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.h
diff --git a/hal/src/main/native/include/hal/handles/LimitedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/LimitedHandleResource.h
rename to hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.h
diff --git a/hal/src/main/native/include/hal/handles/UnlimitedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.h
similarity index 100%
rename from hal/src/main/native/include/hal/handles/UnlimitedHandleResource.h
rename to hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.h
diff --git a/hal/src/main/native/include/hal/proto/ControlData.h b/hal/src/main/native/include/wpi/hal/proto/ControlData.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/ControlData.h
rename to hal/src/main/native/include/wpi/hal/proto/ControlData.h
diff --git a/hal/src/main/native/include/hal/proto/ErrorInfo.h b/hal/src/main/native/include/wpi/hal/proto/ErrorInfo.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/ErrorInfo.h
rename to hal/src/main/native/include/wpi/hal/proto/ErrorInfo.h
diff --git a/hal/src/main/native/include/hal/proto/JoystickDescriptor.h b/hal/src/main/native/include/wpi/hal/proto/JoystickDescriptor.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/JoystickDescriptor.h
rename to hal/src/main/native/include/wpi/hal/proto/JoystickDescriptor.h
diff --git a/hal/src/main/native/include/hal/proto/JoystickRumbleData.h b/hal/src/main/native/include/wpi/hal/proto/JoystickRumbleData.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/JoystickRumbleData.h
rename to hal/src/main/native/include/wpi/hal/proto/JoystickRumbleData.h
diff --git a/hal/src/main/native/include/hal/proto/MatchInfo.h b/hal/src/main/native/include/wpi/hal/proto/MatchInfo.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/MatchInfo.h
rename to hal/src/main/native/include/wpi/hal/proto/MatchInfo.h
diff --git a/hal/src/main/native/include/hal/proto/OpMode.h b/hal/src/main/native/include/wpi/hal/proto/OpMode.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/OpMode.h
rename to hal/src/main/native/include/wpi/hal/proto/OpMode.h
diff --git a/hal/src/main/native/include/hal/proto/VersionInfo.h b/hal/src/main/native/include/wpi/hal/proto/VersionInfo.h
similarity index 100%
rename from hal/src/main/native/include/hal/proto/VersionInfo.h
rename to hal/src/main/native/include/wpi/hal/proto/VersionInfo.h
diff --git a/hal/src/main/native/include/hal/simulation/AddressableLEDData.h b/hal/src/main/native/include/wpi/hal/simulation/AddressableLEDData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/AddressableLEDData.h
rename to hal/src/main/native/include/wpi/hal/simulation/AddressableLEDData.h
diff --git a/hal/src/main/native/include/hal/simulation/AnalogInData.h b/hal/src/main/native/include/wpi/hal/simulation/AnalogInData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/AnalogInData.h
rename to hal/src/main/native/include/wpi/hal/simulation/AnalogInData.h
diff --git a/hal/src/main/native/include/hal/simulation/CTREPCMData.h b/hal/src/main/native/include/wpi/hal/simulation/CTREPCMData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/CTREPCMData.h
rename to hal/src/main/native/include/wpi/hal/simulation/CTREPCMData.h
diff --git a/hal/src/main/native/include/hal/simulation/CanData.h b/hal/src/main/native/include/wpi/hal/simulation/CanData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/CanData.h
rename to hal/src/main/native/include/wpi/hal/simulation/CanData.h
diff --git a/hal/src/main/native/include/hal/simulation/DIOData.h b/hal/src/main/native/include/wpi/hal/simulation/DIOData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/DIOData.h
rename to hal/src/main/native/include/wpi/hal/simulation/DIOData.h
diff --git a/hal/src/main/native/include/hal/simulation/DigitalPWMData.h b/hal/src/main/native/include/wpi/hal/simulation/DigitalPWMData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/DigitalPWMData.h
rename to hal/src/main/native/include/wpi/hal/simulation/DigitalPWMData.h
diff --git a/hal/src/main/native/include/hal/simulation/DriverStationData.h b/hal/src/main/native/include/wpi/hal/simulation/DriverStationData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/DriverStationData.h
rename to hal/src/main/native/include/wpi/hal/simulation/DriverStationData.h
diff --git a/hal/src/main/native/include/hal/simulation/DutyCycleData.h b/hal/src/main/native/include/wpi/hal/simulation/DutyCycleData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/DutyCycleData.h
rename to hal/src/main/native/include/wpi/hal/simulation/DutyCycleData.h
diff --git a/hal/src/main/native/include/hal/simulation/EncoderData.h b/hal/src/main/native/include/wpi/hal/simulation/EncoderData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/EncoderData.h
rename to hal/src/main/native/include/wpi/hal/simulation/EncoderData.h
diff --git a/hal/src/main/native/include/hal/simulation/I2CData.h b/hal/src/main/native/include/wpi/hal/simulation/I2CData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/I2CData.h
rename to hal/src/main/native/include/wpi/hal/simulation/I2CData.h
diff --git a/hal/src/main/native/include/hal/simulation/MockHooks.h b/hal/src/main/native/include/wpi/hal/simulation/MockHooks.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/MockHooks.h
rename to hal/src/main/native/include/wpi/hal/simulation/MockHooks.h
diff --git a/hal/src/main/native/include/hal/simulation/NotifierData.h b/hal/src/main/native/include/wpi/hal/simulation/NotifierData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/NotifierData.h
rename to hal/src/main/native/include/wpi/hal/simulation/NotifierData.h
diff --git a/hal/src/main/native/include/hal/simulation/NotifyListener.h b/hal/src/main/native/include/wpi/hal/simulation/NotifyListener.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/NotifyListener.h
rename to hal/src/main/native/include/wpi/hal/simulation/NotifyListener.h
diff --git a/hal/src/main/native/include/hal/simulation/PWMData.h b/hal/src/main/native/include/wpi/hal/simulation/PWMData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/PWMData.h
rename to hal/src/main/native/include/wpi/hal/simulation/PWMData.h
diff --git a/hal/src/main/native/include/hal/simulation/PowerDistributionData.h b/hal/src/main/native/include/wpi/hal/simulation/PowerDistributionData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/PowerDistributionData.h
rename to hal/src/main/native/include/wpi/hal/simulation/PowerDistributionData.h
diff --git a/hal/src/main/native/include/hal/simulation/REVPHData.h b/hal/src/main/native/include/wpi/hal/simulation/REVPHData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/REVPHData.h
rename to hal/src/main/native/include/wpi/hal/simulation/REVPHData.h
diff --git a/hal/src/main/native/include/hal/simulation/Reset.h b/hal/src/main/native/include/wpi/hal/simulation/Reset.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/Reset.h
rename to hal/src/main/native/include/wpi/hal/simulation/Reset.h
diff --git a/hal/src/main/native/include/hal/simulation/RoboRioData.h b/hal/src/main/native/include/wpi/hal/simulation/RoboRioData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/RoboRioData.h
rename to hal/src/main/native/include/wpi/hal/simulation/RoboRioData.h
diff --git a/hal/src/main/native/include/hal/simulation/SimCallbackRegistry.h b/hal/src/main/native/include/wpi/hal/simulation/SimCallbackRegistry.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/SimCallbackRegistry.h
rename to hal/src/main/native/include/wpi/hal/simulation/SimCallbackRegistry.h
diff --git a/hal/src/main/native/include/hal/simulation/SimDataValue.h b/hal/src/main/native/include/wpi/hal/simulation/SimDataValue.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/SimDataValue.h
rename to hal/src/main/native/include/wpi/hal/simulation/SimDataValue.h
diff --git a/hal/src/main/native/include/hal/simulation/SimDeviceData.h b/hal/src/main/native/include/wpi/hal/simulation/SimDeviceData.h
similarity index 100%
rename from hal/src/main/native/include/hal/simulation/SimDeviceData.h
rename to hal/src/main/native/include/wpi/hal/simulation/SimDeviceData.h
diff --git a/ntcore/src/generated/main/native/include/networktables/BooleanArrayTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/BooleanArrayTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/BooleanArrayTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/BooleanArrayTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/BooleanTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/BooleanTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/BooleanTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/BooleanTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/DoubleArrayTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/DoubleArrayTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/DoubleArrayTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/DoubleArrayTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/DoubleTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/DoubleTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/DoubleTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/DoubleTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/FloatArrayTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/FloatArrayTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/FloatArrayTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/FloatArrayTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/FloatTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/FloatTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/FloatTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/FloatTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/IntegerArrayTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/IntegerArrayTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/IntegerArrayTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/IntegerArrayTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/IntegerTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/IntegerTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/IntegerTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/IntegerTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/RawTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/RawTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/RawTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/RawTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/StringArrayTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/StringArrayTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/StringArrayTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/StringArrayTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/networktables/StringTopic.h b/ntcore/src/generated/main/native/include/wpi/nt/StringTopic.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/networktables/StringTopic.h
rename to ntcore/src/generated/main/native/include/wpi/nt/StringTopic.hpp
diff --git a/ntcore/src/generated/main/native/include/ntcore_c_types.h b/ntcore/src/generated/main/native/include/wpi/nt/ntcore_c_types.h
similarity index 100%
rename from ntcore/src/generated/main/native/include/ntcore_c_types.h
rename to ntcore/src/generated/main/native/include/wpi/nt/ntcore_c_types.h
diff --git a/ntcore/src/generated/main/native/include/ntcore_cpp_types.h b/ntcore/src/generated/main/native/include/wpi/nt/ntcore_cpp_types.hpp
similarity index 100%
rename from ntcore/src/generated/main/native/include/ntcore_cpp_types.h
rename to ntcore/src/generated/main/native/include/wpi/nt/ntcore_cpp_types.hpp
diff --git a/ntcore/src/main/native/cpp/ConnectionList.h b/ntcore/src/main/native/cpp/ConnectionList.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/ConnectionList.h
rename to ntcore/src/main/native/cpp/ConnectionList.hpp
diff --git a/ntcore/src/main/native/cpp/Handle.h b/ntcore/src/main/native/cpp/Handle.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/Handle.h
rename to ntcore/src/main/native/cpp/Handle.hpp
diff --git a/ntcore/src/main/native/cpp/HandleMap.h b/ntcore/src/main/native/cpp/HandleMap.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/HandleMap.h
rename to ntcore/src/main/native/cpp/HandleMap.hpp
diff --git a/ntcore/src/main/native/cpp/IConnectionList.h b/ntcore/src/main/native/cpp/IConnectionList.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/IConnectionList.h
rename to ntcore/src/main/native/cpp/IConnectionList.hpp
diff --git a/ntcore/src/main/native/cpp/IListenerStorage.h b/ntcore/src/main/native/cpp/IListenerStorage.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/IListenerStorage.h
rename to ntcore/src/main/native/cpp/IListenerStorage.hpp
diff --git a/ntcore/src/main/native/cpp/INetworkClient.h b/ntcore/src/main/native/cpp/INetworkClient.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/INetworkClient.h
rename to ntcore/src/main/native/cpp/INetworkClient.hpp
diff --git a/ntcore/src/main/native/cpp/InstanceImpl.h b/ntcore/src/main/native/cpp/InstanceImpl.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/InstanceImpl.h
rename to ntcore/src/main/native/cpp/InstanceImpl.hpp
diff --git a/ntcore/src/main/native/cpp/ListenerStorage.h b/ntcore/src/main/native/cpp/ListenerStorage.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/ListenerStorage.h
rename to ntcore/src/main/native/cpp/ListenerStorage.hpp
diff --git a/ntcore/src/main/native/cpp/LocalStorage.h b/ntcore/src/main/native/cpp/LocalStorage.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/LocalStorage.h
rename to ntcore/src/main/native/cpp/LocalStorage.hpp
diff --git a/ntcore/src/main/native/cpp/Log.h b/ntcore/src/main/native/cpp/Log.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/Log.h
rename to ntcore/src/main/native/cpp/Log.hpp
diff --git a/ntcore/src/main/native/cpp/LoggerImpl.h b/ntcore/src/main/native/cpp/LoggerImpl.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/LoggerImpl.h
rename to ntcore/src/main/native/cpp/LoggerImpl.hpp
diff --git a/ntcore/src/main/native/cpp/NetworkClient.h b/ntcore/src/main/native/cpp/NetworkClient.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/NetworkClient.h
rename to ntcore/src/main/native/cpp/NetworkClient.hpp
diff --git a/ntcore/src/main/native/cpp/NetworkServer.h b/ntcore/src/main/native/cpp/NetworkServer.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/NetworkServer.h
rename to ntcore/src/main/native/cpp/NetworkServer.hpp
diff --git a/ntcore/src/main/native/cpp/PubSubOptions.h b/ntcore/src/main/native/cpp/PubSubOptions.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/PubSubOptions.h
rename to ntcore/src/main/native/cpp/PubSubOptions.hpp
diff --git a/ntcore/src/main/native/cpp/Types_internal.h b/ntcore/src/main/native/cpp/Types_internal.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/Types_internal.h
rename to ntcore/src/main/native/cpp/Types_internal.hpp
diff --git a/ntcore/src/main/native/cpp/ValueCircularBuffer.h b/ntcore/src/main/native/cpp/ValueCircularBuffer.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/ValueCircularBuffer.h
rename to ntcore/src/main/native/cpp/ValueCircularBuffer.hpp
diff --git a/ntcore/src/main/native/cpp/Value_internal.h b/ntcore/src/main/native/cpp/Value_internal.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/Value_internal.h
rename to ntcore/src/main/native/cpp/Value_internal.hpp
diff --git a/ntcore/src/main/native/cpp/VectorSet.h b/ntcore/src/main/native/cpp/VectorSet.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/VectorSet.h
rename to ntcore/src/main/native/cpp/VectorSet.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLogger.h b/ntcore/src/main/native/cpp/local/LocalDataLogger.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalDataLogger.h
rename to ntcore/src/main/native/cpp/local/LocalDataLogger.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.h b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.h
rename to ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalEntry.h b/ntcore/src/main/native/cpp/local/LocalEntry.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalEntry.h
rename to ntcore/src/main/native/cpp/local/LocalEntry.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalListener.h b/ntcore/src/main/native/cpp/local/LocalListener.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalListener.h
rename to ntcore/src/main/native/cpp/local/LocalListener.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalMultiSubscriber.h b/ntcore/src/main/native/cpp/local/LocalMultiSubscriber.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalMultiSubscriber.h
rename to ntcore/src/main/native/cpp/local/LocalMultiSubscriber.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalPublisher.h b/ntcore/src/main/native/cpp/local/LocalPublisher.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalPublisher.h
rename to ntcore/src/main/native/cpp/local/LocalPublisher.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalStorageImpl.h b/ntcore/src/main/native/cpp/local/LocalStorageImpl.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalStorageImpl.h
rename to ntcore/src/main/native/cpp/local/LocalStorageImpl.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalSubscriber.h b/ntcore/src/main/native/cpp/local/LocalSubscriber.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalSubscriber.h
rename to ntcore/src/main/native/cpp/local/LocalSubscriber.hpp
diff --git a/ntcore/src/main/native/cpp/local/LocalTopic.h b/ntcore/src/main/native/cpp/local/LocalTopic.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/LocalTopic.h
rename to ntcore/src/main/native/cpp/local/LocalTopic.hpp
diff --git a/ntcore/src/main/native/cpp/local/PubSubConfig.h b/ntcore/src/main/native/cpp/local/PubSubConfig.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/local/PubSubConfig.h
rename to ntcore/src/main/native/cpp/local/PubSubConfig.hpp
diff --git a/ntcore/src/main/native/cpp/net/ClientImpl.h b/ntcore/src/main/native/cpp/net/ClientImpl.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/ClientImpl.h
rename to ntcore/src/main/native/cpp/net/ClientImpl.hpp
diff --git a/ntcore/src/main/native/cpp/net/ClientMessageQueue.h b/ntcore/src/main/native/cpp/net/ClientMessageQueue.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/ClientMessageQueue.h
rename to ntcore/src/main/native/cpp/net/ClientMessageQueue.hpp
diff --git a/ntcore/src/main/native/cpp/net/Message.h b/ntcore/src/main/native/cpp/net/Message.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/Message.h
rename to ntcore/src/main/native/cpp/net/Message.hpp
diff --git a/ntcore/src/main/native/cpp/net/MessageHandler.h b/ntcore/src/main/native/cpp/net/MessageHandler.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/MessageHandler.h
rename to ntcore/src/main/native/cpp/net/MessageHandler.hpp
diff --git a/ntcore/src/main/native/cpp/net/NetworkInterface.h b/ntcore/src/main/native/cpp/net/NetworkInterface.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/NetworkInterface.h
rename to ntcore/src/main/native/cpp/net/NetworkInterface.hpp
diff --git a/ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.h b/ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.h
rename to ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.hpp
diff --git a/ntcore/src/main/native/cpp/net/NetworkPing.h b/ntcore/src/main/native/cpp/net/NetworkPing.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/NetworkPing.h
rename to ntcore/src/main/native/cpp/net/NetworkPing.hpp
diff --git a/ntcore/src/main/native/cpp/net/WebSocketConnection.h b/ntcore/src/main/native/cpp/net/WebSocketConnection.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/WebSocketConnection.h
rename to ntcore/src/main/native/cpp/net/WebSocketConnection.hpp
diff --git a/ntcore/src/main/native/cpp/net/WireConnection.h b/ntcore/src/main/native/cpp/net/WireConnection.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/WireConnection.h
rename to ntcore/src/main/native/cpp/net/WireConnection.hpp
diff --git a/ntcore/src/main/native/cpp/net/WireDecoder.h b/ntcore/src/main/native/cpp/net/WireDecoder.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/WireDecoder.h
rename to ntcore/src/main/native/cpp/net/WireDecoder.hpp
diff --git a/ntcore/src/main/native/cpp/net/WireEncoder.h b/ntcore/src/main/native/cpp/net/WireEncoder.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/net/WireEncoder.h
rename to ntcore/src/main/native/cpp/net/WireEncoder.hpp
diff --git a/ntcore/src/main/native/cpp/server/Constants.h b/ntcore/src/main/native/cpp/server/Constants.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/Constants.h
rename to ntcore/src/main/native/cpp/server/Constants.hpp
diff --git a/ntcore/src/main/native/cpp/server/Functions.h b/ntcore/src/main/native/cpp/server/Functions.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/Functions.h
rename to ntcore/src/main/native/cpp/server/Functions.hpp
diff --git a/ntcore/src/main/native/cpp/server/MessagePackWriter.h b/ntcore/src/main/native/cpp/server/MessagePackWriter.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/MessagePackWriter.h
rename to ntcore/src/main/native/cpp/server/MessagePackWriter.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerClient.h b/ntcore/src/main/native/cpp/server/ServerClient.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerClient.h
rename to ntcore/src/main/native/cpp/server/ServerClient.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerClient4.h b/ntcore/src/main/native/cpp/server/ServerClient4.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerClient4.h
rename to ntcore/src/main/native/cpp/server/ServerClient4.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerClient4Base.h b/ntcore/src/main/native/cpp/server/ServerClient4Base.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerClient4Base.h
rename to ntcore/src/main/native/cpp/server/ServerClient4Base.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerClientLocal.h b/ntcore/src/main/native/cpp/server/ServerClientLocal.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerClientLocal.h
rename to ntcore/src/main/native/cpp/server/ServerClientLocal.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerImpl.h b/ntcore/src/main/native/cpp/server/ServerImpl.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerImpl.h
rename to ntcore/src/main/native/cpp/server/ServerImpl.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerPublisher.h b/ntcore/src/main/native/cpp/server/ServerPublisher.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerPublisher.h
rename to ntcore/src/main/native/cpp/server/ServerPublisher.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerStorage.h b/ntcore/src/main/native/cpp/server/ServerStorage.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerStorage.h
rename to ntcore/src/main/native/cpp/server/ServerStorage.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerSubscriber.h b/ntcore/src/main/native/cpp/server/ServerSubscriber.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerSubscriber.h
rename to ntcore/src/main/native/cpp/server/ServerSubscriber.hpp
diff --git a/ntcore/src/main/native/cpp/server/ServerTopic.h b/ntcore/src/main/native/cpp/server/ServerTopic.hpp
similarity index 100%
rename from ntcore/src/main/native/cpp/server/ServerTopic.h
rename to ntcore/src/main/native/cpp/server/ServerTopic.hpp
diff --git a/ntcore/src/main/native/include/networktables/GenericEntry.h b/ntcore/src/main/native/include/wpi/nt/GenericEntry.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/GenericEntry.h
rename to ntcore/src/main/native/include/wpi/nt/GenericEntry.hpp
diff --git a/ntcore/src/main/native/include/networktables/MultiSubscriber.h b/ntcore/src/main/native/include/wpi/nt/MultiSubscriber.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/MultiSubscriber.h
rename to ntcore/src/main/native/include/wpi/nt/MultiSubscriber.hpp
diff --git a/ntcore/src/main/native/include/networktables/NTSendable.h b/ntcore/src/main/native/include/wpi/nt/NTSendable.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NTSendable.h
rename to ntcore/src/main/native/include/wpi/nt/NTSendable.hpp
diff --git a/ntcore/src/main/native/include/networktables/NTSendableBuilder.h b/ntcore/src/main/native/include/wpi/nt/NTSendableBuilder.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NTSendableBuilder.h
rename to ntcore/src/main/native/include/wpi/nt/NTSendableBuilder.hpp
diff --git a/ntcore/src/main/native/include/networktables/NetworkTable.h b/ntcore/src/main/native/include/wpi/nt/NetworkTable.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NetworkTable.h
rename to ntcore/src/main/native/include/wpi/nt/NetworkTable.hpp
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h b/ntcore/src/main/native/include/wpi/nt/NetworkTableEntry.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NetworkTableEntry.h
rename to ntcore/src/main/native/include/wpi/nt/NetworkTableEntry.hpp
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.h b/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NetworkTableInstance.h
rename to ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableListener.h b/ntcore/src/main/native/include/wpi/nt/NetworkTableListener.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NetworkTableListener.h
rename to ntcore/src/main/native/include/wpi/nt/NetworkTableListener.hpp
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableType.h b/ntcore/src/main/native/include/wpi/nt/NetworkTableType.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NetworkTableType.h
rename to ntcore/src/main/native/include/wpi/nt/NetworkTableType.hpp
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableValue.h b/ntcore/src/main/native/include/wpi/nt/NetworkTableValue.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/NetworkTableValue.h
rename to ntcore/src/main/native/include/wpi/nt/NetworkTableValue.hpp
diff --git a/ntcore/src/main/native/include/networktables/ProtobufTopic.h b/ntcore/src/main/native/include/wpi/nt/ProtobufTopic.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/ProtobufTopic.h
rename to ntcore/src/main/native/include/wpi/nt/ProtobufTopic.hpp
diff --git a/ntcore/src/main/native/include/networktables/StructArrayTopic.h b/ntcore/src/main/native/include/wpi/nt/StructArrayTopic.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/StructArrayTopic.h
rename to ntcore/src/main/native/include/wpi/nt/StructArrayTopic.hpp
diff --git a/ntcore/src/main/native/include/networktables/StructTopic.h b/ntcore/src/main/native/include/wpi/nt/StructTopic.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/StructTopic.h
rename to ntcore/src/main/native/include/wpi/nt/StructTopic.hpp
diff --git a/ntcore/src/main/native/include/networktables/Topic.h b/ntcore/src/main/native/include/wpi/nt/Topic.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/Topic.h
rename to ntcore/src/main/native/include/wpi/nt/Topic.hpp
diff --git a/ntcore/src/main/native/include/networktables/UnitTopic.h b/ntcore/src/main/native/include/wpi/nt/UnitTopic.hpp
similarity index 100%
rename from ntcore/src/main/native/include/networktables/UnitTopic.h
rename to ntcore/src/main/native/include/wpi/nt/UnitTopic.hpp
diff --git a/ntcore/src/main/native/include/ntcore.h b/ntcore/src/main/native/include/wpi/nt/ntcore.h
similarity index 100%
rename from ntcore/src/main/native/include/ntcore.h
rename to ntcore/src/main/native/include/wpi/nt/ntcore.h
diff --git a/ntcore/src/main/native/include/ntcore_c.h b/ntcore/src/main/native/include/wpi/nt/ntcore_c.h
similarity index 100%
rename from ntcore/src/main/native/include/ntcore_c.h
rename to ntcore/src/main/native/include/wpi/nt/ntcore_c.h
diff --git a/ntcore/src/main/native/include/ntcore_cpp.h b/ntcore/src/main/native/include/wpi/nt/ntcore_cpp.hpp
similarity index 100%
rename from ntcore/src/main/native/include/ntcore_cpp.h
rename to ntcore/src/main/native/include/wpi/nt/ntcore_cpp.hpp
diff --git a/ntcore/src/main/native/include/ntcore_test.h b/ntcore/src/main/native/include/wpi/nt/ntcore_test.hpp
similarity index 100%
rename from ntcore/src/main/native/include/ntcore_test.h
rename to ntcore/src/main/native/include/wpi/nt/ntcore_test.hpp
diff --git a/ntcore/src/test/native/cpp/MockConnectionList.h b/ntcore/src/test/native/cpp/MockConnectionList.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/MockConnectionList.h
rename to ntcore/src/test/native/cpp/MockConnectionList.hpp
diff --git a/ntcore/src/test/native/cpp/MockListenerStorage.h b/ntcore/src/test/native/cpp/MockListenerStorage.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/MockListenerStorage.h
rename to ntcore/src/test/native/cpp/MockListenerStorage.hpp
diff --git a/ntcore/src/test/native/cpp/MockLogger.h b/ntcore/src/test/native/cpp/MockLogger.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/MockLogger.h
rename to ntcore/src/test/native/cpp/MockLogger.hpp
diff --git a/ntcore/src/test/native/cpp/PubSubOptionsMatcher.h b/ntcore/src/test/native/cpp/PubSubOptionsMatcher.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/PubSubOptionsMatcher.h
rename to ntcore/src/test/native/cpp/PubSubOptionsMatcher.hpp
diff --git a/ntcore/src/test/native/cpp/StorageTest.h b/ntcore/src/test/native/cpp/StorageTest.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/StorageTest.h
rename to ntcore/src/test/native/cpp/StorageTest.hpp
diff --git a/ntcore/src/test/native/cpp/TestPrinters.h b/ntcore/src/test/native/cpp/TestPrinters.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/TestPrinters.h
rename to ntcore/src/test/native/cpp/TestPrinters.hpp
diff --git a/ntcore/src/test/native/cpp/ValueMatcher.h b/ntcore/src/test/native/cpp/ValueMatcher.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/ValueMatcher.h
rename to ntcore/src/test/native/cpp/ValueMatcher.hpp
diff --git a/ntcore/src/test/native/cpp/net/MockClientMessageQueue.h b/ntcore/src/test/native/cpp/net/MockClientMessageQueue.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/net/MockClientMessageQueue.h
rename to ntcore/src/test/native/cpp/net/MockClientMessageQueue.hpp
diff --git a/ntcore/src/test/native/cpp/net/MockMessageHandler.h b/ntcore/src/test/native/cpp/net/MockMessageHandler.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/net/MockMessageHandler.h
rename to ntcore/src/test/native/cpp/net/MockMessageHandler.hpp
diff --git a/ntcore/src/test/native/cpp/net/MockNetworkInterface.h b/ntcore/src/test/native/cpp/net/MockNetworkInterface.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/net/MockNetworkInterface.h
rename to ntcore/src/test/native/cpp/net/MockNetworkInterface.hpp
diff --git a/ntcore/src/test/native/cpp/net/MockWireConnection.h b/ntcore/src/test/native/cpp/net/MockWireConnection.hpp
similarity index 100%
rename from ntcore/src/test/native/cpp/net/MockWireConnection.h
rename to ntcore/src/test/native/cpp/net/MockWireConnection.hpp
diff --git a/romiVendordep/src/main/native/include/frc/romi/OnBoardIO.h b/romiVendordep/src/main/native/include/wpi/romi/OnBoardIO.hpp
similarity index 100%
rename from romiVendordep/src/main/native/include/frc/romi/OnBoardIO.h
rename to romiVendordep/src/main/native/include/wpi/romi/OnBoardIO.hpp
diff --git a/romiVendordep/src/main/native/include/frc/romi/RomiGyro.h b/romiVendordep/src/main/native/include/wpi/romi/RomiGyro.hpp
similarity index 100%
rename from romiVendordep/src/main/native/include/frc/romi/RomiGyro.h
rename to romiVendordep/src/main/native/include/wpi/romi/RomiGyro.hpp
diff --git a/romiVendordep/src/main/native/include/frc/romi/RomiMotor.h b/romiVendordep/src/main/native/include/wpi/romi/RomiMotor.hpp
similarity index 100%
rename from romiVendordep/src/main/native/include/frc/romi/RomiMotor.h
rename to romiVendordep/src/main/native/include/wpi/romi/RomiMotor.hpp
diff --git a/simulation/halsim_ds_socket/src/main/native/include/DSCommJoystickPacket.h b/simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommJoystickPacket.hpp
similarity index 100%
rename from simulation/halsim_ds_socket/src/main/native/include/DSCommJoystickPacket.h
rename to simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommJoystickPacket.hpp
diff --git a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h b/simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp
similarity index 100%
rename from simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h
rename to simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.h b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.h
rename to simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.h b/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.h b/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/DIOSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/DIOSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h
rename to simulation/halsim_gui/src/main/native/cpp/DriverStationGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.h b/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.h b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/PCMSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/PHSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/PHSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.h b/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/PWMSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/PWMSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.h b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.h b/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.h
rename to simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/cpp/TimingGui.h b/simulation/halsim_gui/src/main/native/cpp/TimingGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/cpp/TimingGui.h
rename to simulation/halsim_gui/src/main/native/cpp/TimingGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/include/HALDataSource.h b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALDataSource.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/include/HALDataSource.h
rename to simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALDataSource.hpp
diff --git a/simulation/halsim_gui/src/main/native/include/HALProvider.h b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALProvider.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/include/HALProvider.h
rename to simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALProvider.hpp
diff --git a/simulation/halsim_gui/src/main/native/include/HALSimGui.h b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/include/HALSimGui.h
rename to simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp
diff --git a/simulation/halsim_gui/src/main/native/include/HALSimGuiExt.h b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGuiExt.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/include/HALSimGuiExt.h
rename to simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGuiExt.hpp
diff --git a/simulation/halsim_gui/src/main/native/include/SimDeviceGui.h b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/SimDeviceGui.hpp
similarity index 100%
rename from simulation/halsim_gui/src/main/native/include/SimDeviceGui.h
rename to simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/SimDeviceGui.hpp
diff --git a/simulation/halsim_ws_client/src/main/native/include/HALSimWS.h b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp
similarity index 100%
rename from simulation/halsim_ws_client/src/main/native/include/HALSimWS.h
rename to simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp
diff --git a/simulation/halsim_ws_client/src/main/native/include/HALSimWSClient.h b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp
similarity index 100%
rename from simulation/halsim_ws_client/src/main/native/include/HALSimWSClient.h
rename to simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp
diff --git a/simulation/halsim_ws_client/src/main/native/include/HALSimWSClientConnection.h b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp
similarity index 100%
rename from simulation/halsim_ws_client/src/main/native/include/HALSimWSClientConnection.h
rename to simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/HALSimBaseWebSocketConnection.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/HALSimBaseWebSocketConnection.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSBaseProvider.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSBaseProvider.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSHalProviders.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProviderContainer.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProviderContainer.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_AddressableLED.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_AddressableLED.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_AddressableLED.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_AddressableLED.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Analog.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_Analog.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_DIO.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_DIO.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_DriverStation.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_DriverStation.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Encoder.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_Encoder.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_HAL.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_HAL.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Joystick.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_Joystick.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_PCM.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_PCM.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_PWM.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_PWM.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_RoboRIO.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_RoboRIO.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_Solenoid.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Solenoid.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_Solenoid.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Solenoid.hpp
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSProvider_dPWM.h b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSProvider_dPWM.h
rename to simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp
diff --git a/simulation/halsim_ws_server/src/main/native/include/HALSimHttpConnection.h b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp
similarity index 100%
rename from simulation/halsim_ws_server/src/main/native/include/HALSimHttpConnection.h
rename to simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp
diff --git a/simulation/halsim_ws_server/src/main/native/include/HALSimWSServer.h b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp
similarity index 100%
rename from simulation/halsim_ws_server/src/main/native/include/HALSimWSServer.h
rename to simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp
diff --git a/simulation/halsim_ws_server/src/main/native/include/HALSimWeb.h b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp
similarity index 100%
rename from simulation/halsim_ws_server/src/main/native/include/HALSimWeb.h
rename to simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp
diff --git a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.h b/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp
similarity index 100%
rename from simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.h
rename to simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp
diff --git a/simulation/halsim_xrp/src/main/native/include/HALSimXRP.h b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp
similarity index 100%
rename from simulation/halsim_xrp/src/main/native/include/HALSimXRP.h
rename to simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp
diff --git a/simulation/halsim_xrp/src/main/native/include/HALSimXRPClient.h b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp
similarity index 100%
rename from simulation/halsim_xrp/src/main/native/include/HALSimXRPClient.h
rename to simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp
diff --git a/simulation/halsim_xrp/src/main/native/include/XRP.h b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp
similarity index 100%
rename from simulation/halsim_xrp/src/main/native/include/XRP.h
rename to simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp
diff --git a/tools/datalogtool/src/main/native/cpp/App.h b/tools/datalogtool/src/main/native/cpp/App.hpp
similarity index 100%
rename from tools/datalogtool/src/main/native/cpp/App.h
rename to tools/datalogtool/src/main/native/cpp/App.hpp
diff --git a/tools/datalogtool/src/main/native/cpp/Downloader.h b/tools/datalogtool/src/main/native/cpp/Downloader.hpp
similarity index 100%
rename from tools/datalogtool/src/main/native/cpp/Downloader.h
rename to tools/datalogtool/src/main/native/cpp/Downloader.hpp
diff --git a/tools/datalogtool/src/main/native/cpp/Exporter.h b/tools/datalogtool/src/main/native/cpp/Exporter.hpp
similarity index 100%
rename from tools/datalogtool/src/main/native/cpp/Exporter.h
rename to tools/datalogtool/src/main/native/cpp/Exporter.hpp
diff --git a/tools/datalogtool/src/main/native/cpp/Sftp.h b/tools/datalogtool/src/main/native/cpp/Sftp.hpp
similarity index 100%
rename from tools/datalogtool/src/main/native/cpp/Sftp.h
rename to tools/datalogtool/src/main/native/cpp/Sftp.hpp
diff --git a/tools/processstarter/src/main/native/linux/main.h b/tools/processstarter/src/main/native/linux/main.hpp
similarity index 100%
rename from tools/processstarter/src/main/native/linux/main.h
rename to tools/processstarter/src/main/native/linux/main.hpp
diff --git a/tools/processstarter/src/main/native/osx/main.h b/tools/processstarter/src/main/native/osx/main.hpp
similarity index 100%
rename from tools/processstarter/src/main/native/osx/main.h
rename to tools/processstarter/src/main/native/osx/main.hpp
diff --git a/tools/processstarter/src/main/native/windows/main.h b/tools/processstarter/src/main/native/windows/main.hpp
similarity index 100%
rename from tools/processstarter/src/main/native/windows/main.h
rename to tools/processstarter/src/main/native/windows/main.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/Util.h b/tools/sysid/src/main/native/include/wpi/sysid/Util.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/Util.h
rename to tools/sysid/src/main/native/include/wpi/sysid/Util.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/AnalysisManager.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisManager.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/AnalysisManager.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisManager.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/AnalysisType.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisType.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/AnalysisType.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisType.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/ArmSim.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/ArmSim.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/ArmSim.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/ArmSim.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/ElevatorSim.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/ElevatorSim.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/ElevatorSim.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/ElevatorSim.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/FeedbackAnalysis.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/FeedbackAnalysis.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/FeedbackAnalysis.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/FeedbackAnalysis.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/FeedbackControllerPreset.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/FeedbackControllerPreset.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/FeedforwardAnalysis.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/FeedforwardAnalysis.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/FeedforwardAnalysis.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/FeedforwardAnalysis.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/FilteringUtils.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/FilteringUtils.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/FilteringUtils.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/FilteringUtils.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/OLS.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/OLS.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/OLS.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/OLS.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/SimpleMotorSim.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/SimpleMotorSim.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/SimpleMotorSim.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/SimpleMotorSim.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/Storage.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/Storage.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/Storage.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/Storage.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/analysis/TrackwidthAnalysis.h b/tools/sysid/src/main/native/include/wpi/sysid/analysis/TrackwidthAnalysis.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/analysis/TrackwidthAnalysis.h
rename to tools/sysid/src/main/native/include/wpi/sysid/analysis/TrackwidthAnalysis.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/view/Analyzer.h b/tools/sysid/src/main/native/include/wpi/sysid/view/Analyzer.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/view/Analyzer.h
rename to tools/sysid/src/main/native/include/wpi/sysid/view/Analyzer.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/view/AnalyzerPlot.h b/tools/sysid/src/main/native/include/wpi/sysid/view/AnalyzerPlot.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/view/AnalyzerPlot.h
rename to tools/sysid/src/main/native/include/wpi/sysid/view/AnalyzerPlot.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/view/DataSelector.h b/tools/sysid/src/main/native/include/wpi/sysid/view/DataSelector.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/view/DataSelector.h
rename to tools/sysid/src/main/native/include/wpi/sysid/view/DataSelector.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/view/LogLoader.h b/tools/sysid/src/main/native/include/wpi/sysid/view/LogLoader.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/view/LogLoader.h
rename to tools/sysid/src/main/native/include/wpi/sysid/view/LogLoader.hpp
diff --git a/tools/sysid/src/main/native/include/sysid/view/UILayout.h b/tools/sysid/src/main/native/include/wpi/sysid/view/UILayout.hpp
similarity index 100%
rename from tools/sysid/src/main/native/include/sysid/view/UILayout.h
rename to tools/sysid/src/main/native/include/wpi/sysid/view/UILayout.hpp
diff --git a/tools/wpical/src/main/native/include/cameracalibration.h b/tools/wpical/src/main/native/include/cameracalibration.hpp
similarity index 100%
rename from tools/wpical/src/main/native/include/cameracalibration.h
rename to tools/wpical/src/main/native/include/cameracalibration.hpp
diff --git a/tools/wpical/src/main/native/include/fieldcalibration.h b/tools/wpical/src/main/native/include/fieldcalibration.hpp
similarity index 100%
rename from tools/wpical/src/main/native/include/fieldcalibration.h
rename to tools/wpical/src/main/native/include/fieldcalibration.hpp
diff --git a/tools/wpical/src/main/native/include/fieldmap.h b/tools/wpical/src/main/native/include/fieldmap.hpp
similarity index 100%
rename from tools/wpical/src/main/native/include/fieldmap.h
rename to tools/wpical/src/main/native/include/fieldmap.hpp
diff --git a/tools/wpical/src/main/native/include/fmap.h b/tools/wpical/src/main/native/include/fmap.hpp
similarity index 100%
rename from tools/wpical/src/main/native/include/fmap.h
rename to tools/wpical/src/main/native/include/fmap.hpp
diff --git a/tools/wpical/src/main/native/include/tagpose.h b/tools/wpical/src/main/native/include/tagpose.hpp
similarity index 100%
rename from tools/wpical/src/main/native/include/tagpose.h
rename to tools/wpical/src/main/native/include/tagpose.hpp
diff --git a/tools/wpical/src/test/native/cpp/path_lookup.h b/tools/wpical/src/test/native/cpp/path_lookup.hpp
similarity index 100%
rename from tools/wpical/src/test/native/cpp/path_lookup.h
rename to tools/wpical/src/test/native/cpp/path_lookup.hpp
diff --git a/wpigui/src/main/native/include/portable-file-dialogs.h b/wpigui/src/main/native/include/wpi/gui/portable-file-dialogs.h
similarity index 100%
rename from wpigui/src/main/native/include/portable-file-dialogs.h
rename to wpigui/src/main/native/include/wpi/gui/portable-file-dialogs.h
diff --git a/wpigui/src/main/native/include/wpigui.h b/wpigui/src/main/native/include/wpi/gui/wpigui.hpp
similarity index 100%
rename from wpigui/src/main/native/include/wpigui.h
rename to wpigui/src/main/native/include/wpi/gui/wpigui.hpp
diff --git a/wpigui/src/main/native/include/wpigui_internal.h b/wpigui/src/main/native/include/wpi/gui/wpigui_internal.hpp
similarity index 100%
rename from wpigui/src/main/native/include/wpigui_internal.h
rename to wpigui/src/main/native/include/wpi/gui/wpigui_internal.hpp
diff --git a/wpigui/src/main/native/include/wpigui_openurl.h b/wpigui/src/main/native/include/wpi/gui/wpigui_openurl.hpp
similarity index 100%
rename from wpigui/src/main/native/include/wpigui_openurl.h
rename to wpigui/src/main/native/include/wpi/gui/wpigui_openurl.hpp
diff --git a/wpilibc/src/generated/main/native/cpp/PS4Controller.cpp b/wpilibc/src/generated/main/native/cpp/driverstation/PS4Controller.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/PS4Controller.cpp
rename to wpilibc/src/generated/main/native/cpp/driverstation/PS4Controller.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/PS5Controller.cpp b/wpilibc/src/generated/main/native/cpp/driverstation/PS5Controller.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/PS5Controller.cpp
rename to wpilibc/src/generated/main/native/cpp/driverstation/PS5Controller.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/StadiaController.cpp b/wpilibc/src/generated/main/native/cpp/driverstation/StadiaController.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/StadiaController.cpp
rename to wpilibc/src/generated/main/native/cpp/driverstation/StadiaController.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/XboxController.cpp b/wpilibc/src/generated/main/native/cpp/driverstation/XboxController.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/XboxController.cpp
rename to wpilibc/src/generated/main/native/cpp/driverstation/XboxController.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/Koors40.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/Koors40.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/Koors40.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/Koors40.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/PWMSparkFlex.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/PWMSparkFlex.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/PWMSparkFlex.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/PWMSparkFlex.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/PWMSparkMax.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/PWMSparkMax.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/PWMSparkMax.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/PWMSparkMax.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/PWMTalonFX.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/PWMTalonFX.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/PWMTalonFX.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/PWMTalonFX.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/PWMTalonSRX.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/PWMTalonSRX.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/PWMTalonSRX.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/PWMTalonSRX.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/PWMVenom.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/PWMVenom.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/PWMVenom.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/PWMVenom.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/PWMVictorSPX.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/PWMVictorSPX.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/PWMVictorSPX.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/PWMVictorSPX.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/Spark.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/Spark.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/Spark.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/Spark.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/SparkMini.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/SparkMini.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/SparkMini.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/SparkMini.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/Talon.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/Talon.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/Talon.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/Talon.cpp
diff --git a/wpilibc/src/generated/main/native/cpp/motorcontrol/VictorSP.cpp b/wpilibc/src/generated/main/native/cpp/hardware/motor/VictorSP.cpp
similarity index 100%
rename from wpilibc/src/generated/main/native/cpp/motorcontrol/VictorSP.cpp
rename to wpilibc/src/generated/main/native/cpp/hardware/motor/VictorSP.cpp
diff --git a/wpilibc/src/generated/main/native/include/frc/PS4Controller.h b/wpilibc/src/generated/main/native/include/wpi/driverstation/PS4Controller.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/PS4Controller.h
rename to wpilibc/src/generated/main/native/include/wpi/driverstation/PS4Controller.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/PS5Controller.h b/wpilibc/src/generated/main/native/include/wpi/driverstation/PS5Controller.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/PS5Controller.h
rename to wpilibc/src/generated/main/native/include/wpi/driverstation/PS5Controller.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/StadiaController.h b/wpilibc/src/generated/main/native/include/wpi/driverstation/StadiaController.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/StadiaController.h
rename to wpilibc/src/generated/main/native/include/wpi/driverstation/StadiaController.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/XboxController.h b/wpilibc/src/generated/main/native/include/wpi/driverstation/XboxController.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/XboxController.h
rename to wpilibc/src/generated/main/native/include/wpi/driverstation/XboxController.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/Koors40.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/Koors40.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/Koors40.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/Koors40.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMSparkFlex.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMSparkFlex.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMSparkFlex.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMSparkFlex.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMSparkMax.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMSparkMax.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMSparkMax.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMSparkMax.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMTalonFX.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMTalonFX.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMTalonFX.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMTalonFX.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMTalonSRX.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMTalonSRX.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMTalonSRX.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMTalonSRX.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMVenom.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMVenom.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMVenom.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMVenom.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMVictorSPX.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMVictorSPX.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/PWMVictorSPX.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/PWMVictorSPX.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/Spark.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/Spark.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/Spark.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/Spark.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/SparkMini.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/SparkMini.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/SparkMini.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/SparkMini.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/Talon.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/Talon.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/Talon.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/Talon.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/motorcontrol/VictorSP.h b/wpilibc/src/generated/main/native/include/wpi/hardware/motor/VictorSP.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/motorcontrol/VictorSP.h
rename to wpilibc/src/generated/main/native/include/wpi/hardware/motor/VictorSP.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/simulation/PS4ControllerSim.h b/wpilibc/src/generated/main/native/include/wpi/simulation/PS4ControllerSim.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/simulation/PS4ControllerSim.h
rename to wpilibc/src/generated/main/native/include/wpi/simulation/PS4ControllerSim.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/simulation/PS5ControllerSim.h b/wpilibc/src/generated/main/native/include/wpi/simulation/PS5ControllerSim.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/simulation/PS5ControllerSim.h
rename to wpilibc/src/generated/main/native/include/wpi/simulation/PS5ControllerSim.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/simulation/StadiaControllerSim.h b/wpilibc/src/generated/main/native/include/wpi/simulation/StadiaControllerSim.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/simulation/StadiaControllerSim.h
rename to wpilibc/src/generated/main/native/include/wpi/simulation/StadiaControllerSim.hpp
diff --git a/wpilibc/src/generated/main/native/include/frc/simulation/XboxControllerSim.h b/wpilibc/src/generated/main/native/include/wpi/simulation/XboxControllerSim.hpp
similarity index 100%
rename from wpilibc/src/generated/main/native/include/frc/simulation/XboxControllerSim.h
rename to wpilibc/src/generated/main/native/include/wpi/simulation/XboxControllerSim.hpp
diff --git a/wpilibc/src/main/native/cpp/DSControlWord.cpp b/wpilibc/src/main/native/cpp/driverstation/DSControlWord.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DSControlWord.cpp
rename to wpilibc/src/main/native/cpp/driverstation/DSControlWord.cpp
diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DriverStation.cpp
rename to wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp
diff --git a/wpilibc/src/main/native/cpp/Gamepad.cpp b/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Gamepad.cpp
rename to wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
diff --git a/wpilibc/src/main/native/cpp/GenericHID.cpp b/wpilibc/src/main/native/cpp/driverstation/GenericHID.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/GenericHID.cpp
rename to wpilibc/src/main/native/cpp/driverstation/GenericHID.cpp
diff --git a/wpilibc/src/main/native/cpp/Joystick.cpp b/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Joystick.cpp
rename to wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
diff --git a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp b/wpilibc/src/main/native/cpp/hardware/accelerometer/ADXL345_I2C.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/ADXL345_I2C.cpp
rename to wpilibc/src/main/native/cpp/hardware/accelerometer/ADXL345_I2C.cpp
diff --git a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp b/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
rename to wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
diff --git a/wpilibc/src/main/native/cpp/CAN.cpp b/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/CAN.cpp
rename to wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
diff --git a/wpilibc/src/main/native/cpp/I2C.cpp b/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/I2C.cpp
rename to wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
diff --git a/wpilibc/src/main/native/cpp/SerialPort.cpp b/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/SerialPort.cpp
rename to wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
diff --git a/wpilibc/src/main/native/cpp/AnalogInput.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/AnalogInput.cpp
rename to wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
diff --git a/wpilibc/src/main/native/cpp/DigitalInput.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DigitalInput.cpp
rename to wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
diff --git a/wpilibc/src/main/native/cpp/DigitalOutput.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DigitalOutput.cpp
rename to wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
diff --git a/wpilibc/src/main/native/cpp/PWM.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/PWM.cpp
rename to wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
diff --git a/wpilibc/src/main/native/cpp/OnboardIMU.cpp b/wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/OnboardIMU.cpp
rename to wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.cpp
diff --git a/wpilibc/src/main/native/cpp/AddressableLED.cpp b/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/AddressableLED.cpp
rename to wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
diff --git a/wpilibc/src/main/native/cpp/LEDPattern.cpp b/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/LEDPattern.cpp
rename to wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
diff --git a/wpilibc/src/main/native/cpp/MotorSafety.cpp b/wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/MotorSafety.cpp
rename to wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.cpp
diff --git a/wpilibc/src/main/native/cpp/Compressor.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Compressor.cpp
rename to wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp
diff --git a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DoubleSolenoid.cpp
rename to wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp
diff --git a/wpilibc/src/main/native/cpp/PneumaticHub.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/PneumaticHub.cpp
rename to wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
diff --git a/wpilibc/src/main/native/cpp/PneumaticsBase.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/PneumaticsBase.cpp
rename to wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp
diff --git a/wpilibc/src/main/native/cpp/PneumaticsControlModule.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/PneumaticsControlModule.cpp
rename to wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
diff --git a/wpilibc/src/main/native/cpp/Solenoid.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Solenoid.cpp
rename to wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.cpp
diff --git a/wpilibc/src/main/native/cpp/PowerDistribution.cpp b/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/PowerDistribution.cpp
rename to wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
diff --git a/wpilibc/src/main/native/cpp/SharpIR.cpp b/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/SharpIR.cpp
rename to wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
diff --git a/wpilibc/src/main/native/cpp/AnalogEncoder.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/AnalogEncoder.cpp
rename to wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
diff --git a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
rename to wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.cpp
diff --git a/wpilibc/src/main/native/cpp/DutyCycle.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DutyCycle.cpp
rename to wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
diff --git a/wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp
rename to wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.cpp
diff --git a/wpilibc/src/main/native/cpp/Encoder.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Encoder.cpp
rename to wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
rename to wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp
diff --git a/wpilibc/src/main/native/cpp/RobotState.cpp b/wpilibc/src/main/native/cpp/opmode/RobotState.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/RobotState.cpp
rename to wpilibc/src/main/native/cpp/opmode/RobotState.cpp
diff --git a/wpilibc/src/main/native/cpp/TimedRobot.cpp b/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/TimedRobot.cpp
rename to wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp
diff --git a/wpilibc/src/main/native/cpp/TimesliceRobot.cpp b/wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/TimesliceRobot.cpp
rename to wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp
diff --git a/wpilibc/src/main/native/cpp/DataLogManager.cpp b/wpilibc/src/main/native/cpp/system/DataLogManager.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/DataLogManager.cpp
rename to wpilibc/src/main/native/cpp/system/DataLogManager.cpp
diff --git a/wpilibc/src/main/native/cpp/Errors.cpp b/wpilibc/src/main/native/cpp/system/Errors.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Errors.cpp
rename to wpilibc/src/main/native/cpp/system/Errors.cpp
diff --git a/wpilibc/src/main/native/cpp/Filesystem.cpp b/wpilibc/src/main/native/cpp/system/Filesystem.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Filesystem.cpp
rename to wpilibc/src/main/native/cpp/system/Filesystem.cpp
diff --git a/wpilibc/src/main/native/cpp/Notifier.cpp b/wpilibc/src/main/native/cpp/system/Notifier.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Notifier.cpp
rename to wpilibc/src/main/native/cpp/system/Notifier.cpp
diff --git a/wpilibc/src/main/native/cpp/Resource.cpp b/wpilibc/src/main/native/cpp/system/Resource.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Resource.cpp
rename to wpilibc/src/main/native/cpp/system/Resource.cpp
diff --git a/wpilibc/src/main/native/cpp/RobotController.cpp b/wpilibc/src/main/native/cpp/system/RobotController.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/RobotController.cpp
rename to wpilibc/src/main/native/cpp/system/RobotController.cpp
diff --git a/wpilibc/src/main/native/cpp/ScopedTracer.cpp b/wpilibc/src/main/native/cpp/system/ScopedTracer.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/ScopedTracer.cpp
rename to wpilibc/src/main/native/cpp/system/ScopedTracer.cpp
diff --git a/wpilibc/src/main/native/cpp/SystemServer.cpp b/wpilibc/src/main/native/cpp/system/SystemServer.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/SystemServer.cpp
rename to wpilibc/src/main/native/cpp/system/SystemServer.cpp
diff --git a/wpilibc/src/main/native/cpp/Threads.cpp b/wpilibc/src/main/native/cpp/system/Threads.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Threads.cpp
rename to wpilibc/src/main/native/cpp/system/Threads.cpp
diff --git a/wpilibc/src/main/native/cpp/Timer.cpp b/wpilibc/src/main/native/cpp/system/Timer.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Timer.cpp
rename to wpilibc/src/main/native/cpp/system/Timer.cpp
diff --git a/wpilibc/src/main/native/cpp/Tracer.cpp b/wpilibc/src/main/native/cpp/system/Tracer.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Tracer.cpp
rename to wpilibc/src/main/native/cpp/system/Tracer.cpp
diff --git a/wpilibc/src/main/native/cpp/Watchdog.cpp b/wpilibc/src/main/native/cpp/system/Watchdog.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Watchdog.cpp
rename to wpilibc/src/main/native/cpp/system/Watchdog.cpp
diff --git a/wpilibc/src/main/native/cpp/Alert.cpp b/wpilibc/src/main/native/cpp/util/Alert.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Alert.cpp
rename to wpilibc/src/main/native/cpp/util/Alert.cpp
diff --git a/wpilibc/src/main/native/cpp/Preferences.cpp b/wpilibc/src/main/native/cpp/util/Preferences.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/Preferences.cpp
rename to wpilibc/src/main/native/cpp/util/Preferences.cpp
diff --git a/wpilibc/src/main/native/cpp/SensorUtil.cpp b/wpilibc/src/main/native/cpp/util/SensorUtil.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/SensorUtil.cpp
rename to wpilibc/src/main/native/cpp/util/SensorUtil.cpp
diff --git a/wpilibc/src/main/native/include/frc/ExpansionHub.h b/wpilibc/src/main/native/include/wpi/ExpansionHub.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/ExpansionHub.h
rename to wpilibc/src/main/native/include/wpi/ExpansionHub.hpp
diff --git a/wpilibc/src/main/native/include/frc/ExpansionHubMotor.h b/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/ExpansionHubMotor.h
rename to wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp
diff --git a/wpilibc/src/main/native/include/frc/ExpansionHubPidConstants.h b/wpilibc/src/main/native/include/wpi/ExpansionHubPidConstants.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/ExpansionHubPidConstants.h
rename to wpilibc/src/main/native/include/wpi/ExpansionHubPidConstants.hpp
diff --git a/wpilibc/src/main/native/include/frc/ExpansionHubServo.h b/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/ExpansionHubServo.h
rename to wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp
diff --git a/wpilibc/src/main/native/include/frc/counter/EdgeConfiguration.h b/wpilibc/src/main/native/include/wpi/counter/EdgeConfiguration.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/counter/EdgeConfiguration.h
rename to wpilibc/src/main/native/include/wpi/counter/EdgeConfiguration.hpp
diff --git a/wpilibc/src/main/native/include/frc/counter/Tachometer.h b/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/counter/Tachometer.h
rename to wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
diff --git a/wpilibc/src/main/native/include/frc/counter/UpDownCounter.h b/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/counter/UpDownCounter.h
rename to wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
diff --git a/wpilibc/src/main/native/include/frc/drive/DifferentialDrive.h b/wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/drive/DifferentialDrive.h
rename to wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp
diff --git a/wpilibc/src/main/native/include/frc/drive/MecanumDrive.h b/wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/drive/MecanumDrive.h
rename to wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp
diff --git a/wpilibc/src/main/native/include/frc/drive/RobotDriveBase.h b/wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/drive/RobotDriveBase.h
rename to wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp
diff --git a/wpilibc/src/main/native/include/frc/DSControlWord.h b/wpilibc/src/main/native/include/wpi/driverstation/DSControlWord.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DSControlWord.h
rename to wpilibc/src/main/native/include/wpi/driverstation/DSControlWord.hpp
diff --git a/wpilibc/src/main/native/include/frc/DriverStation.h b/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DriverStation.h
rename to wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
diff --git a/wpilibc/src/main/native/include/frc/Gamepad.h b/wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Gamepad.h
rename to wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp
diff --git a/wpilibc/src/main/native/include/frc/GenericHID.h b/wpilibc/src/main/native/include/wpi/driverstation/GenericHID.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/GenericHID.h
rename to wpilibc/src/main/native/include/wpi/driverstation/GenericHID.hpp
diff --git a/wpilibc/src/main/native/include/frc/Joystick.h b/wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Joystick.h
rename to wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp
diff --git a/wpilibc/src/main/native/include/frc/event/BooleanEvent.h b/wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/event/BooleanEvent.h
rename to wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp
diff --git a/wpilibc/src/main/native/include/frc/event/EventLoop.h b/wpilibc/src/main/native/include/wpi/event/EventLoop.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/event/EventLoop.h
rename to wpilibc/src/main/native/include/wpi/event/EventLoop.hpp
diff --git a/wpilibc/src/main/native/include/frc/event/NetworkBooleanEvent.h b/wpilibc/src/main/native/include/wpi/event/NetworkBooleanEvent.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/event/NetworkBooleanEvent.h
rename to wpilibc/src/main/native/include/wpi/event/NetworkBooleanEvent.hpp
diff --git a/wpilibc/src/main/native/include/frc/ADXL345_I2C.h b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/ADXL345_I2C.h
rename to wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
diff --git a/wpilibc/src/main/native/include/frc/AnalogAccelerometer.h b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/AnalogAccelerometer.h
rename to wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp
diff --git a/wpilibc/src/main/native/include/frc/CAN.h b/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/CAN.h
rename to wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp
diff --git a/wpilibc/src/main/native/include/frc/I2C.h b/wpilibc/src/main/native/include/wpi/hardware/bus/I2C.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/I2C.h
rename to wpilibc/src/main/native/include/wpi/hardware/bus/I2C.hpp
diff --git a/wpilibc/src/main/native/include/frc/SerialPort.h b/wpilibc/src/main/native/include/wpi/hardware/bus/SerialPort.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/SerialPort.h
rename to wpilibc/src/main/native/include/wpi/hardware/bus/SerialPort.hpp
diff --git a/wpilibc/src/main/native/include/frc/AnalogInput.h b/wpilibc/src/main/native/include/wpi/hardware/discrete/AnalogInput.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/AnalogInput.h
rename to wpilibc/src/main/native/include/wpi/hardware/discrete/AnalogInput.hpp
diff --git a/wpilibc/src/main/native/include/frc/CounterBase.h b/wpilibc/src/main/native/include/wpi/hardware/discrete/CounterBase.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/CounterBase.h
rename to wpilibc/src/main/native/include/wpi/hardware/discrete/CounterBase.hpp
diff --git a/wpilibc/src/main/native/include/frc/DigitalInput.h b/wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalInput.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DigitalInput.h
rename to wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalInput.hpp
diff --git a/wpilibc/src/main/native/include/frc/DigitalOutput.h b/wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalOutput.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DigitalOutput.h
rename to wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalOutput.hpp
diff --git a/wpilibc/src/main/native/include/frc/PWM.h b/wpilibc/src/main/native/include/wpi/hardware/discrete/PWM.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/PWM.h
rename to wpilibc/src/main/native/include/wpi/hardware/discrete/PWM.hpp
diff --git a/wpilibc/src/main/native/include/frc/OnboardIMU.h b/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/OnboardIMU.h
rename to wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp
diff --git a/wpilibc/src/main/native/include/frc/AddressableLED.h b/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/AddressableLED.h
rename to wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
diff --git a/wpilibc/src/main/native/include/frc/LEDPattern.h b/wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/LEDPattern.h
rename to wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp
diff --git a/wpilibc/src/main/native/include/frc/motorcontrol/MotorController.h b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorController.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/motorcontrol/MotorController.h
rename to wpilibc/src/main/native/include/wpi/hardware/motor/MotorController.hpp
diff --git a/wpilibc/src/main/native/include/frc/motorcontrol/MotorControllerGroup.h b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/motorcontrol/MotorControllerGroup.h
rename to wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp
diff --git a/wpilibc/src/main/native/include/frc/MotorSafety.h b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/MotorSafety.h
rename to wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp
diff --git a/wpilibc/src/main/native/include/frc/motorcontrol/PWMMotorController.h b/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/motorcontrol/PWMMotorController.h
rename to wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
diff --git a/wpilibc/src/main/native/include/frc/Compressor.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Compressor.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp
diff --git a/wpilibc/src/main/native/include/frc/CompressorConfigType.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/CompressorConfigType.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/CompressorConfigType.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/CompressorConfigType.hpp
diff --git a/wpilibc/src/main/native/include/frc/DoubleSolenoid.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DoubleSolenoid.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp
diff --git a/wpilibc/src/main/native/include/frc/PneumaticHub.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/PneumaticHub.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp
diff --git a/wpilibc/src/main/native/include/frc/PneumaticsBase.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/PneumaticsBase.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp
diff --git a/wpilibc/src/main/native/include/frc/PneumaticsControlModule.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/PneumaticsControlModule.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp
diff --git a/wpilibc/src/main/native/include/frc/PneumaticsModuleType.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsModuleType.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/PneumaticsModuleType.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsModuleType.hpp
diff --git a/wpilibc/src/main/native/include/frc/Solenoid.h b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Solenoid.h
rename to wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp
diff --git a/wpilibc/src/main/native/include/frc/PowerDistribution.h b/wpilibc/src/main/native/include/wpi/hardware/power/PowerDistribution.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/PowerDistribution.h
rename to wpilibc/src/main/native/include/wpi/hardware/power/PowerDistribution.hpp
diff --git a/wpilibc/src/main/native/include/frc/SharpIR.h b/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/SharpIR.h
rename to wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
diff --git a/wpilibc/src/main/native/include/frc/AnalogEncoder.h b/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogEncoder.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/AnalogEncoder.h
rename to wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogEncoder.hpp
diff --git a/wpilibc/src/main/native/include/frc/AnalogPotentiometer.h b/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/AnalogPotentiometer.h
rename to wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp
diff --git a/wpilibc/src/main/native/include/frc/DutyCycle.h b/wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycle.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DutyCycle.h
rename to wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycle.hpp
diff --git a/wpilibc/src/main/native/include/frc/DutyCycleEncoder.h b/wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycleEncoder.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DutyCycleEncoder.h
rename to wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycleEncoder.hpp
diff --git a/wpilibc/src/main/native/include/frc/Encoder.h b/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Encoder.h
rename to wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
diff --git a/wpilibc/src/main/native/include/frc/internal/DriverStationModeThread.h b/wpilibc/src/main/native/include/wpi/internal/DriverStationModeThread.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/internal/DriverStationModeThread.h
rename to wpilibc/src/main/native/include/wpi/internal/DriverStationModeThread.hpp
diff --git a/wpilibc/src/main/native/include/frc/IterativeRobotBase.h b/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/IterativeRobotBase.h
rename to wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp
diff --git a/wpilibc/src/main/native/include/frc/RobotBase.h b/wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/RobotBase.h
rename to wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp
diff --git a/wpilibc/src/main/native/include/frc/RobotState.h b/wpilibc/src/main/native/include/wpi/opmode/RobotState.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/RobotState.h
rename to wpilibc/src/main/native/include/wpi/opmode/RobotState.hpp
diff --git a/wpilibc/src/main/native/include/frc/TimedRobot.h b/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/TimedRobot.h
rename to wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp
diff --git a/wpilibc/src/main/native/include/frc/TimesliceRobot.h b/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/TimesliceRobot.h
rename to wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/ADXL345Sim.h b/wpilibc/src/main/native/include/wpi/simulation/ADXL345Sim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/ADXL345Sim.h
rename to wpilibc/src/main/native/include/wpi/simulation/ADXL345Sim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/AddressableLEDSim.h b/wpilibc/src/main/native/include/wpi/simulation/AddressableLEDSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/AddressableLEDSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/AddressableLEDSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/AnalogEncoderSim.h b/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/AnalogEncoderSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/AnalogInputSim.h b/wpilibc/src/main/native/include/wpi/simulation/AnalogInputSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/AnalogInputSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/AnalogInputSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/BatterySim.h b/wpilibc/src/main/native/include/wpi/simulation/BatterySim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/BatterySim.h
rename to wpilibc/src/main/native/include/wpi/simulation/BatterySim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/CTREPCMSim.h b/wpilibc/src/main/native/include/wpi/simulation/CTREPCMSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/CTREPCMSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/CTREPCMSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/CallbackStore.h b/wpilibc/src/main/native/include/wpi/simulation/CallbackStore.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/CallbackStore.h
rename to wpilibc/src/main/native/include/wpi/simulation/CallbackStore.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DCMotorSim.h b/wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DCMotorSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DIOSim.h b/wpilibc/src/main/native/include/wpi/simulation/DIOSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DIOSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DIOSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DifferentialDrivetrainSim.h b/wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DifferentialDrivetrainSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DigitalPWMSim.h b/wpilibc/src/main/native/include/wpi/simulation/DigitalPWMSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DigitalPWMSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DigitalPWMSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DoubleSolenoidSim.h b/wpilibc/src/main/native/include/wpi/simulation/DoubleSolenoidSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DoubleSolenoidSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DoubleSolenoidSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DriverStationSim.h b/wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DriverStationSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DutyCycleEncoderSim.h b/wpilibc/src/main/native/include/wpi/simulation/DutyCycleEncoderSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DutyCycleEncoderSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DutyCycleEncoderSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/DutyCycleSim.h b/wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/DutyCycleSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/ElevatorSim.h b/wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/ElevatorSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/EncoderSim.h b/wpilibc/src/main/native/include/wpi/simulation/EncoderSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/EncoderSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/EncoderSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/FlywheelSim.h b/wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/FlywheelSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/GamepadSim.h b/wpilibc/src/main/native/include/wpi/simulation/GamepadSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/GamepadSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/GamepadSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/GenericHIDSim.h b/wpilibc/src/main/native/include/wpi/simulation/GenericHIDSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/GenericHIDSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/GenericHIDSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/JoystickSim.h b/wpilibc/src/main/native/include/wpi/simulation/JoystickSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/JoystickSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/JoystickSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/LinearSystemSim.h b/wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/LinearSystemSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/PWMMotorControllerSim.h b/wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/PWMMotorControllerSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/PWMSim.h b/wpilibc/src/main/native/include/wpi/simulation/PWMSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/PWMSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/PWMSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/PneumaticsBaseSim.h b/wpilibc/src/main/native/include/wpi/simulation/PneumaticsBaseSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/PneumaticsBaseSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/PneumaticsBaseSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/PowerDistributionSim.h b/wpilibc/src/main/native/include/wpi/simulation/PowerDistributionSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/PowerDistributionSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/PowerDistributionSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/REVPHSim.h b/wpilibc/src/main/native/include/wpi/simulation/REVPHSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/REVPHSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/REVPHSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/RoboRioSim.h b/wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/RoboRioSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/SendableChooserSim.h b/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/SendableChooserSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/SharpIRSim.h b/wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/SharpIRSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/SimDeviceSim.h b/wpilibc/src/main/native/include/wpi/simulation/SimDeviceSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/SimDeviceSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/SimDeviceSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/SimHooks.h b/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/SimHooks.h
rename to wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/SingleJointedArmSim.h b/wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/SingleJointedArmSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/simulation/SolenoidSim.h b/wpilibc/src/main/native/include/wpi/simulation/SolenoidSim.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/simulation/SolenoidSim.h
rename to wpilibc/src/main/native/include/wpi/simulation/SolenoidSim.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/Field2d.h b/wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/Field2d.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/FieldObject2d.h b/wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/FieldObject2d.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/ListenerExecutor.h b/wpilibc/src/main/native/include/wpi/smartdashboard/ListenerExecutor.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/ListenerExecutor.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/ListenerExecutor.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/Mechanism2d.h b/wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/Mechanism2d.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/MechanismLigament2d.h b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/MechanismLigament2d.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/MechanismObject2d.h b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/MechanismObject2d.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/MechanismRoot2d.h b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/MechanismRoot2d.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h b/wpilibc/src/main/native/include/wpi/smartdashboard/SendableBuilderImpl.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/SendableBuilderImpl.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h b/wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooserBase.h b/wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooserBase.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/SendableChooserBase.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooserBase.hpp
diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SmartDashboard.h b/wpilibc/src/main/native/include/wpi/smartdashboard/SmartDashboard.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/smartdashboard/SmartDashboard.h
rename to wpilibc/src/main/native/include/wpi/smartdashboard/SmartDashboard.hpp
diff --git a/wpilibc/src/main/native/include/frc/sysid/SysIdRoutineLog.h b/wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/sysid/SysIdRoutineLog.h
rename to wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp
diff --git a/wpilibc/src/main/native/include/frc/DataLogManager.h b/wpilibc/src/main/native/include/wpi/system/DataLogManager.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/DataLogManager.h
rename to wpilibc/src/main/native/include/wpi/system/DataLogManager.hpp
diff --git a/wpilibc/src/main/native/include/frc/Errors.h b/wpilibc/src/main/native/include/wpi/system/Errors.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Errors.h
rename to wpilibc/src/main/native/include/wpi/system/Errors.hpp
diff --git a/wpilibc/src/main/native/include/frc/Filesystem.h b/wpilibc/src/main/native/include/wpi/system/Filesystem.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Filesystem.h
rename to wpilibc/src/main/native/include/wpi/system/Filesystem.hpp
diff --git a/wpilibc/src/main/native/include/frc/Notifier.h b/wpilibc/src/main/native/include/wpi/system/Notifier.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Notifier.h
rename to wpilibc/src/main/native/include/wpi/system/Notifier.hpp
diff --git a/wpilibc/src/main/native/include/frc/Resource.h b/wpilibc/src/main/native/include/wpi/system/Resource.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Resource.h
rename to wpilibc/src/main/native/include/wpi/system/Resource.hpp
diff --git a/wpilibc/src/main/native/include/frc/RobotController.h b/wpilibc/src/main/native/include/wpi/system/RobotController.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/RobotController.h
rename to wpilibc/src/main/native/include/wpi/system/RobotController.hpp
diff --git a/wpilibc/src/main/native/include/frc/RuntimeType.h b/wpilibc/src/main/native/include/wpi/system/RuntimeType.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/RuntimeType.h
rename to wpilibc/src/main/native/include/wpi/system/RuntimeType.hpp
diff --git a/wpilibc/src/main/native/include/frc/ScopedTracer.h b/wpilibc/src/main/native/include/wpi/system/ScopedTracer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/ScopedTracer.h
rename to wpilibc/src/main/native/include/wpi/system/ScopedTracer.hpp
diff --git a/wpilibc/src/main/native/include/frc/SystemServer.h b/wpilibc/src/main/native/include/wpi/system/SystemServer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/SystemServer.h
rename to wpilibc/src/main/native/include/wpi/system/SystemServer.hpp
diff --git a/wpilibc/src/main/native/include/frc/Threads.h b/wpilibc/src/main/native/include/wpi/system/Threads.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Threads.h
rename to wpilibc/src/main/native/include/wpi/system/Threads.hpp
diff --git a/wpilibc/src/main/native/include/frc/Timer.h b/wpilibc/src/main/native/include/wpi/system/Timer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Timer.h
rename to wpilibc/src/main/native/include/wpi/system/Timer.hpp
diff --git a/wpilibc/src/main/native/include/frc/Tracer.h b/wpilibc/src/main/native/include/wpi/system/Tracer.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Tracer.h
rename to wpilibc/src/main/native/include/wpi/system/Tracer.hpp
diff --git a/wpilibc/src/main/native/include/frc/WPIErrors.mac b/wpilibc/src/main/native/include/wpi/system/WPIErrors.mac
similarity index 100%
rename from wpilibc/src/main/native/include/frc/WPIErrors.mac
rename to wpilibc/src/main/native/include/wpi/system/WPIErrors.mac
diff --git a/wpilibc/src/main/native/include/WPILibVersion.h b/wpilibc/src/main/native/include/wpi/system/WPILibVersion.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/WPILibVersion.h
rename to wpilibc/src/main/native/include/wpi/system/WPILibVersion.hpp
diff --git a/wpilibc/src/main/native/include/frc/WPIWarnings.mac b/wpilibc/src/main/native/include/wpi/system/WPIWarnings.mac
similarity index 100%
rename from wpilibc/src/main/native/include/frc/WPIWarnings.mac
rename to wpilibc/src/main/native/include/wpi/system/WPIWarnings.mac
diff --git a/wpilibc/src/main/native/include/frc/Watchdog.h b/wpilibc/src/main/native/include/wpi/system/Watchdog.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Watchdog.h
rename to wpilibc/src/main/native/include/wpi/system/Watchdog.hpp
diff --git a/wpilibc/src/main/native/include/frc/Alert.h b/wpilibc/src/main/native/include/wpi/util/Alert.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Alert.h
rename to wpilibc/src/main/native/include/wpi/util/Alert.hpp
diff --git a/wpilibc/src/main/native/include/frc/util/Color.h b/wpilibc/src/main/native/include/wpi/util/Color.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/util/Color.h
rename to wpilibc/src/main/native/include/wpi/util/Color.hpp
diff --git a/wpilibc/src/main/native/include/frc/util/Color8Bit.h b/wpilibc/src/main/native/include/wpi/util/Color8Bit.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/util/Color8Bit.h
rename to wpilibc/src/main/native/include/wpi/util/Color8Bit.hpp
diff --git a/wpilibc/src/main/native/include/frc/Preferences.h b/wpilibc/src/main/native/include/wpi/util/Preferences.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/Preferences.h
rename to wpilibc/src/main/native/include/wpi/util/Preferences.hpp
diff --git a/wpilibc/src/main/native/include/frc/SensorUtil.h b/wpilibc/src/main/native/include/wpi/util/SensorUtil.hpp
similarity index 100%
rename from wpilibc/src/main/native/include/frc/SensorUtil.h
rename to wpilibc/src/main/native/include/wpi/util/SensorUtil.hpp
diff --git a/wpilibc/src/test/native/cpp/JoystickTestMacros.h b/wpilibc/src/test/native/cpp/JoystickTestMacros.hpp
similarity index 100%
rename from wpilibc/src/test/native/cpp/JoystickTestMacros.h
rename to wpilibc/src/test/native/cpp/JoystickTestMacros.hpp
diff --git a/wpilibc/src/test/native/include/callback_helpers/TestCallbackHelpers.h b/wpilibc/src/test/native/include/callback_helpers/TestCallbackHelpers.hpp
similarity index 100%
rename from wpilibc/src/test/native/include/callback_helpers/TestCallbackHelpers.h
rename to wpilibc/src/test/native/include/callback_helpers/TestCallbackHelpers.hpp
diff --git a/wpilibc/src/test/native/include/motorcontrol/MockMotorController.h b/wpilibc/src/test/native/include/motorcontrol/MockMotorController.hpp
similarity index 100%
rename from wpilibc/src/test/native/include/motorcontrol/MockMotorController.h
rename to wpilibc/src/test/native/include/motorcontrol/MockMotorController.hpp
diff --git a/wpilibc/src/test/native/include/motorcontrol/MockPWMMotorController.h b/wpilibc/src/test/native/include/motorcontrol/MockPWMMotorController.hpp
similarity index 100%
rename from wpilibc/src/test/native/include/motorcontrol/MockPWMMotorController.h
rename to wpilibc/src/test/native/include/motorcontrol/MockPWMMotorController.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.h b/wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.h
rename to wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.h b/wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.h
rename to wpilibcExamples/src/main/cpp/commands/emptyclass/ReplaceMeEmptyClass.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.h b/wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.h
rename to wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.h b/wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.h
rename to wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.h b/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.h
rename to wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.h b/wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.h
rename to wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.h b/wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.h
rename to wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.hpp
diff --git a/wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.h b/wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.h
rename to wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.h b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.h
rename to wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.h b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.h
rename to wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/ExampleSmartMotorController.h b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/ExampleSmartMotorController.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/ExampleSmartMotorController.h
rename to wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/ExampleSmartMotorController.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.h
rename to wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/include/ExampleSmartMotorController.h b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/include/ExampleSmartMotorController.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/include/ExampleSmartMotorController.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/include/ExampleSmartMotorController.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.h b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.h b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/include/ExampleSmartMotorController.h b/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/include/ExampleSmartMotorController.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/include/ExampleSmartMotorController.h
rename to wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/include/ExampleSmartMotorController.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.h
rename to wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.h b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.h
rename to wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.h b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.h
rename to wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.h b/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.h
rename to wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.h b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.h
rename to wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.h b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.h
rename to wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.h b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.h
rename to wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.h b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.h
rename to wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.h b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.h
rename to wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/UnitTest/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/UnitTest/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.h b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.h
rename to wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Constants.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/Constants.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.hpp
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.h b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.h
rename to wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Constants.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Constants.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Constants.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/Constants.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.h
rename to wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp
diff --git a/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp
similarity index 100%
rename from wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.h
rename to wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp
diff --git a/wpimath/src/main/native/cpp/jni/Exceptions.h b/wpimath/src/main/native/cpp/jni/Exceptions.hpp
similarity index 100%
rename from wpimath/src/main/native/cpp/jni/Exceptions.h
rename to wpimath/src/main/native/cpp/jni/Exceptions.hpp
diff --git a/wpimath/src/main/native/cpp/MathShared.cpp b/wpimath/src/main/native/cpp/util/MathShared.cpp
similarity index 100%
rename from wpimath/src/main/native/cpp/MathShared.cpp
rename to wpimath/src/main/native/cpp/util/MathShared.cpp
diff --git a/wpimath/src/main/native/cpp/StateSpaceUtil.cpp b/wpimath/src/main/native/cpp/util/StateSpaceUtil.cpp
similarity index 100%
rename from wpimath/src/main/native/cpp/StateSpaceUtil.cpp
rename to wpimath/src/main/native/cpp/util/StateSpaceUtil.cpp
diff --git a/wpimath/src/main/native/include/frc/controller/ArmFeedforward.h b/wpimath/src/main/native/include/wpi/math/controller/ArmFeedforward.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/ArmFeedforward.h
rename to wpimath/src/main/native/include/wpi/math/controller/ArmFeedforward.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/BangBangController.h b/wpimath/src/main/native/include/wpi/math/controller/BangBangController.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/BangBangController.h
rename to wpimath/src/main/native/include/wpi/math/controller/BangBangController.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/ControlAffinePlantInversionFeedforward.h b/wpimath/src/main/native/include/wpi/math/controller/ControlAffinePlantInversionFeedforward.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/ControlAffinePlantInversionFeedforward.h
rename to wpimath/src/main/native/include/wpi/math/controller/ControlAffinePlantInversionFeedforward.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/DifferentialDriveAccelerationLimiter.h b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/DifferentialDriveAccelerationLimiter.h
rename to wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/DifferentialDriveFeedforward.h b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveFeedforward.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/DifferentialDriveFeedforward.h
rename to wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveFeedforward.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/DifferentialDriveWheelVoltages.h b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveWheelVoltages.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/DifferentialDriveWheelVoltages.h
rename to wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveWheelVoltages.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/ElevatorFeedforward.h b/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/ElevatorFeedforward.h
rename to wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/ImplicitModelFollower.h b/wpimath/src/main/native/include/wpi/math/controller/ImplicitModelFollower.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/ImplicitModelFollower.h
rename to wpimath/src/main/native/include/wpi/math/controller/ImplicitModelFollower.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/LTVDifferentialDriveController.h b/wpimath/src/main/native/include/wpi/math/controller/LTVDifferentialDriveController.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/LTVDifferentialDriveController.h
rename to wpimath/src/main/native/include/wpi/math/controller/LTVDifferentialDriveController.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/LTVUnicycleController.h b/wpimath/src/main/native/include/wpi/math/controller/LTVUnicycleController.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/LTVUnicycleController.h
rename to wpimath/src/main/native/include/wpi/math/controller/LTVUnicycleController.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/LinearPlantInversionFeedforward.h b/wpimath/src/main/native/include/wpi/math/controller/LinearPlantInversionFeedforward.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/LinearPlantInversionFeedforward.h
rename to wpimath/src/main/native/include/wpi/math/controller/LinearPlantInversionFeedforward.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/LinearQuadraticRegulator.h b/wpimath/src/main/native/include/wpi/math/controller/LinearQuadraticRegulator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/LinearQuadraticRegulator.h
rename to wpimath/src/main/native/include/wpi/math/controller/LinearQuadraticRegulator.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/PIDController.h b/wpimath/src/main/native/include/wpi/math/controller/PIDController.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/PIDController.h
rename to wpimath/src/main/native/include/wpi/math/controller/PIDController.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/ProfiledPIDController.h b/wpimath/src/main/native/include/wpi/math/controller/ProfiledPIDController.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/ProfiledPIDController.h
rename to wpimath/src/main/native/include/wpi/math/controller/ProfiledPIDController.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/SimpleMotorFeedforward.h b/wpimath/src/main/native/include/wpi/math/controller/SimpleMotorFeedforward.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/SimpleMotorFeedforward.h
rename to wpimath/src/main/native/include/wpi/math/controller/SimpleMotorFeedforward.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/proto/ArmFeedforwardProto.h b/wpimath/src/main/native/include/wpi/math/controller/proto/ArmFeedforwardProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/proto/ArmFeedforwardProto.h
rename to wpimath/src/main/native/include/wpi/math/controller/proto/ArmFeedforwardProto.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/proto/DifferentialDriveFeedforwardProto.h b/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/proto/DifferentialDriveFeedforwardProto.h
rename to wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/proto/DifferentialDriveWheelVoltagesProto.h b/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/proto/DifferentialDriveWheelVoltagesProto.h
rename to wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/proto/ElevatorFeedforwardProto.h b/wpimath/src/main/native/include/wpi/math/controller/proto/ElevatorFeedforwardProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/proto/ElevatorFeedforwardProto.h
rename to wpimath/src/main/native/include/wpi/math/controller/proto/ElevatorFeedforwardProto.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/proto/SimpleMotorFeedforwardProto.h b/wpimath/src/main/native/include/wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/proto/SimpleMotorFeedforwardProto.h
rename to wpimath/src/main/native/include/wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/struct/ArmFeedforwardStruct.h b/wpimath/src/main/native/include/wpi/math/controller/struct/ArmFeedforwardStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/struct/ArmFeedforwardStruct.h
rename to wpimath/src/main/native/include/wpi/math/controller/struct/ArmFeedforwardStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/struct/DifferentialDriveFeedforwardStruct.h b/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/struct/DifferentialDriveFeedforwardStruct.h
rename to wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/struct/DifferentialDriveWheelVoltagesStruct.h b/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/struct/DifferentialDriveWheelVoltagesStruct.h
rename to wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/struct/ElevatorFeedforwardStruct.h b/wpimath/src/main/native/include/wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/struct/ElevatorFeedforwardStruct.h
rename to wpimath/src/main/native/include/wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.h b/wpimath/src/main/native/include/wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.h
rename to wpimath/src/main/native/include/wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/AngleStatistics.h b/wpimath/src/main/native/include/wpi/math/estimator/AngleStatistics.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/AngleStatistics.h
rename to wpimath/src/main/native/include/wpi/math/estimator/AngleStatistics.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/DifferentialDrivePoseEstimator.h b/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/DifferentialDrivePoseEstimator.h
rename to wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/DifferentialDrivePoseEstimator3d.h b/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/DifferentialDrivePoseEstimator3d.h
rename to wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/ExtendedKalmanFilter.h b/wpimath/src/main/native/include/wpi/math/estimator/ExtendedKalmanFilter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/ExtendedKalmanFilter.h
rename to wpimath/src/main/native/include/wpi/math/estimator/ExtendedKalmanFilter.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/KalmanFilter.h b/wpimath/src/main/native/include/wpi/math/estimator/KalmanFilter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/KalmanFilter.h
rename to wpimath/src/main/native/include/wpi/math/estimator/KalmanFilter.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/KalmanFilterLatencyCompensator.h b/wpimath/src/main/native/include/wpi/math/estimator/KalmanFilterLatencyCompensator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/KalmanFilterLatencyCompensator.h
rename to wpimath/src/main/native/include/wpi/math/estimator/KalmanFilterLatencyCompensator.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/MecanumDrivePoseEstimator.h b/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/MecanumDrivePoseEstimator.h
rename to wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/MecanumDrivePoseEstimator3d.h b/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/MecanumDrivePoseEstimator3d.h
rename to wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/MerweScaledSigmaPoints.h b/wpimath/src/main/native/include/wpi/math/estimator/MerweScaledSigmaPoints.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/MerweScaledSigmaPoints.h
rename to wpimath/src/main/native/include/wpi/math/estimator/MerweScaledSigmaPoints.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/MerweUKF.h b/wpimath/src/main/native/include/wpi/math/estimator/MerweUKF.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/MerweUKF.h
rename to wpimath/src/main/native/include/wpi/math/estimator/MerweUKF.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/PoseEstimator.h b/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/PoseEstimator.h
rename to wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/PoseEstimator3d.h b/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/PoseEstimator3d.h
rename to wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator3d.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/S3SigmaPoints.h b/wpimath/src/main/native/include/wpi/math/estimator/S3SigmaPoints.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/S3SigmaPoints.h
rename to wpimath/src/main/native/include/wpi/math/estimator/S3SigmaPoints.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/S3UKF.h b/wpimath/src/main/native/include/wpi/math/estimator/S3UKF.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/S3UKF.h
rename to wpimath/src/main/native/include/wpi/math/estimator/S3UKF.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/SigmaPoints.h b/wpimath/src/main/native/include/wpi/math/estimator/SigmaPoints.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/SigmaPoints.h
rename to wpimath/src/main/native/include/wpi/math/estimator/SigmaPoints.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/SteadyStateKalmanFilter.h b/wpimath/src/main/native/include/wpi/math/estimator/SteadyStateKalmanFilter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/SteadyStateKalmanFilter.h
rename to wpimath/src/main/native/include/wpi/math/estimator/SteadyStateKalmanFilter.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/SwerveDrivePoseEstimator.h b/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/SwerveDrivePoseEstimator.h
rename to wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/SwerveDrivePoseEstimator3d.h b/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/SwerveDrivePoseEstimator3d.h
rename to wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/UnscentedKalmanFilter.h b/wpimath/src/main/native/include/wpi/math/estimator/UnscentedKalmanFilter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/UnscentedKalmanFilter.h
rename to wpimath/src/main/native/include/wpi/math/estimator/UnscentedKalmanFilter.hpp
diff --git a/wpimath/src/main/native/include/frc/estimator/UnscentedTransform.h b/wpimath/src/main/native/include/wpi/math/estimator/UnscentedTransform.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/estimator/UnscentedTransform.h
rename to wpimath/src/main/native/include/wpi/math/estimator/UnscentedTransform.hpp
diff --git a/wpimath/src/main/native/include/frc/filter/Debouncer.h b/wpimath/src/main/native/include/wpi/math/filter/Debouncer.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/filter/Debouncer.h
rename to wpimath/src/main/native/include/wpi/math/filter/Debouncer.hpp
diff --git a/wpimath/src/main/native/include/frc/filter/LinearFilter.h b/wpimath/src/main/native/include/wpi/math/filter/LinearFilter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/filter/LinearFilter.h
rename to wpimath/src/main/native/include/wpi/math/filter/LinearFilter.hpp
diff --git a/wpimath/src/main/native/include/frc/filter/MedianFilter.h b/wpimath/src/main/native/include/wpi/math/filter/MedianFilter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/filter/MedianFilter.h
rename to wpimath/src/main/native/include/wpi/math/filter/MedianFilter.hpp
diff --git a/wpimath/src/main/native/include/frc/filter/SlewRateLimiter.h b/wpimath/src/main/native/include/wpi/math/filter/SlewRateLimiter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/filter/SlewRateLimiter.h
rename to wpimath/src/main/native/include/wpi/math/filter/SlewRateLimiter.hpp
diff --git a/wpimath/src/main/native/include/frc/fmt/Eigen.h b/wpimath/src/main/native/include/wpi/math/fmt/Eigen.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/fmt/Eigen.h
rename to wpimath/src/main/native/include/wpi/math/fmt/Eigen.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/CoordinateAxis.h b/wpimath/src/main/native/include/wpi/math/geometry/CoordinateAxis.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/CoordinateAxis.h
rename to wpimath/src/main/native/include/wpi/math/geometry/CoordinateAxis.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/CoordinateSystem.h b/wpimath/src/main/native/include/wpi/math/geometry/CoordinateSystem.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/CoordinateSystem.h
rename to wpimath/src/main/native/include/wpi/math/geometry/CoordinateSystem.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Ellipse2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Ellipse2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Ellipse2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Ellipse2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Pose2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Pose2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Pose2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Pose2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Pose3d.h b/wpimath/src/main/native/include/wpi/math/geometry/Pose3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Pose3d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Pose3d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Quaternion.h b/wpimath/src/main/native/include/wpi/math/geometry/Quaternion.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Quaternion.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Quaternion.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Rectangle2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Rectangle2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Rectangle2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Rectangle2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Rotation2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Rotation2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Rotation2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Rotation2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Rotation3d.h b/wpimath/src/main/native/include/wpi/math/geometry/Rotation3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Rotation3d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Rotation3d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Transform2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Transform2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Transform2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Transform2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Transform3d.h b/wpimath/src/main/native/include/wpi/math/geometry/Transform3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Transform3d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Transform3d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Translation2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Translation2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Translation2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Translation2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Translation3d.h b/wpimath/src/main/native/include/wpi/math/geometry/Translation3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Translation3d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Translation3d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Twist2d.h b/wpimath/src/main/native/include/wpi/math/geometry/Twist2d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Twist2d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Twist2d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/Twist3d.h b/wpimath/src/main/native/include/wpi/math/geometry/Twist3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/Twist3d.h
rename to wpimath/src/main/native/include/wpi/math/geometry/Twist3d.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/detail/RotationVectorToMatrix.h b/wpimath/src/main/native/include/wpi/math/geometry/detail/RotationVectorToMatrix.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/detail/RotationVectorToMatrix.h
rename to wpimath/src/main/native/include/wpi/math/geometry/detail/RotationVectorToMatrix.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Ellipse2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Ellipse2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Ellipse2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Ellipse2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Pose2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Pose2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Pose2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Pose3dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose3dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Pose3dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Pose3dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/QuaternionProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/QuaternionProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/QuaternionProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/QuaternionProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Rectangle2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rectangle2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Rectangle2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Rectangle2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Rotation2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Rotation2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Rotation3dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation3dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Rotation3dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation3dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Transform2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Transform2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Transform2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Transform3dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform3dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Transform3dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Transform3dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Translation2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Translation2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Translation2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Translation3dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation3dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Translation3dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Translation3dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Twist2dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist2dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Twist2dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Twist2dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/proto/Twist3dProto.h b/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist3dProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/proto/Twist3dProto.h
rename to wpimath/src/main/native/include/wpi/math/geometry/proto/Twist3dProto.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Ellipse2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Ellipse2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Ellipse2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Ellipse2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Pose2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Pose2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Pose2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Pose3dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose3dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Pose3dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Pose3dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/QuaternionStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/QuaternionStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/QuaternionStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/QuaternionStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Rectangle2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rectangle2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Rectangle2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Rectangle2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Rotation2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Rotation2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Rotation3dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation3dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Rotation3dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation3dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Transform2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Transform2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Transform2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Transform3dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform3dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Transform3dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Transform3dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Translation2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Translation2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Translation2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Translation3dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation3dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Translation3dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Translation3dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Twist2dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist2dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Twist2dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Twist2dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/geometry/struct/Twist3dStruct.h b/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist3dStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/geometry/struct/Twist3dStruct.h
rename to wpimath/src/main/native/include/wpi/math/geometry/struct/Twist3dStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/interpolation/TimeInterpolatableBuffer.h b/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/interpolation/TimeInterpolatableBuffer.h
rename to wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/ChassisSpeeds.h b/wpimath/src/main/native/include/wpi/math/kinematics/ChassisSpeeds.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/ChassisSpeeds.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/ChassisSpeeds.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/DifferentialDriveKinematics.h b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveKinematics.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/DifferentialDriveKinematics.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveKinematics.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/DifferentialDriveOdometry.h b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/DifferentialDriveOdometry.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/DifferentialDriveOdometry3d.h b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/DifferentialDriveOdometry3d.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry3d.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/DifferentialDriveWheelPositions.h b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelPositions.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/DifferentialDriveWheelPositions.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelPositions.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/DifferentialDriveWheelSpeeds.h b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/DifferentialDriveWheelSpeeds.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/Kinematics.h b/wpimath/src/main/native/include/wpi/math/kinematics/Kinematics.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/Kinematics.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/Kinematics.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/MecanumDriveKinematics.h b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveKinematics.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/MecanumDriveKinematics.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveKinematics.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/MecanumDriveOdometry.h b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/MecanumDriveOdometry.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/MecanumDriveOdometry3d.h b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/MecanumDriveOdometry3d.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry3d.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/MecanumDriveWheelPositions.h b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelPositions.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/MecanumDriveWheelPositions.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelPositions.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/MecanumDriveWheelSpeeds.h b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/MecanumDriveWheelSpeeds.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/Odometry.h b/wpimath/src/main/native/include/wpi/math/kinematics/Odometry.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/Odometry.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/Odometry.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/Odometry3d.h b/wpimath/src/main/native/include/wpi/math/kinematics/Odometry3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/Odometry3d.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/Odometry3d.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/SwerveDriveKinematics.h b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveKinematics.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/SwerveDriveKinematics.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveKinematics.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/SwerveDriveOdometry.h b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/SwerveDriveOdometry.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/SwerveDriveOdometry3d.h b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry3d.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/SwerveDriveOdometry3d.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry3d.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/SwerveModulePosition.h b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModulePosition.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/SwerveModulePosition.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/SwerveModulePosition.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/SwerveModuleState.h b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModuleState.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/SwerveModuleState.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/SwerveModuleState.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/ChassisSpeedsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/ChassisSpeedsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/ChassisSpeedsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/ChassisSpeedsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/DifferentialDriveKinematicsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/DifferentialDriveKinematicsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/DifferentialDriveWheelPositionsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/DifferentialDriveWheelPositionsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/DifferentialDriveWheelSpeedsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/DifferentialDriveWheelSpeedsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/MecanumDriveKinematicsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/MecanumDriveKinematicsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/MecanumDriveWheelPositionsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/MecanumDriveWheelPositionsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/MecanumDriveWheelSpeedsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/MecanumDriveWheelSpeedsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/SwerveDriveKinematicsProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/SwerveDriveKinematicsProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/SwerveModulePositionProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModulePositionProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/SwerveModulePositionProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModulePositionProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/SwerveModuleStateProto.h b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModuleStateProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/proto/SwerveModuleStateProto.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModuleStateProto.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/ChassisSpeedsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/ChassisSpeedsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/DifferentialDriveKinematicsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/DifferentialDriveKinematicsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/DifferentialDriveWheelPositionsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/DifferentialDriveWheelPositionsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/DifferentialDriveWheelSpeedsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/DifferentialDriveWheelSpeedsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/MecanumDriveKinematicsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/MecanumDriveKinematicsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/MecanumDriveWheelPositionsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/MecanumDriveWheelPositionsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/MecanumDriveWheelSpeedsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/MecanumDriveWheelSpeedsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/SwerveDriveKinematicsStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/SwerveDriveKinematicsStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/SwerveModulePositionStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/SwerveModulePositionStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/kinematics/struct/SwerveModuleStateStruct.h b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/kinematics/struct/SwerveModuleStateStruct.h
rename to wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/DARE.h b/wpimath/src/main/native/include/wpi/math/linalg/DARE.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/DARE.h
rename to wpimath/src/main/native/include/wpi/math/linalg/DARE.hpp
diff --git a/wpimath/src/main/native/include/frc/EigenCore.h b/wpimath/src/main/native/include/wpi/math/linalg/EigenCore.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/EigenCore.h
rename to wpimath/src/main/native/include/wpi/math/linalg/EigenCore.hpp
diff --git a/wpimath/src/main/native/include/frc/ct_matrix.h b/wpimath/src/main/native/include/wpi/math/linalg/ct_matrix.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/ct_matrix.h
rename to wpimath/src/main/native/include/wpi/math/linalg/ct_matrix.hpp
diff --git a/wpimath/src/main/native/include/frc/proto/MatrixProto.h b/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/proto/MatrixProto.h
rename to wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp
diff --git a/wpimath/src/main/native/include/frc/proto/VectorProto.h b/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/proto/VectorProto.h
rename to wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp
diff --git a/wpimath/src/main/native/include/frc/struct/MatrixStruct.h b/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/struct/MatrixStruct.h
rename to wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp
diff --git a/wpimath/src/main/native/include/frc/struct/VectorStruct.h b/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/struct/VectorStruct.h
rename to wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/optimization/SimulatedAnnealing.h b/wpimath/src/main/native/include/wpi/math/optimization/SimulatedAnnealing.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/optimization/SimulatedAnnealing.h
rename to wpimath/src/main/native/include/wpi/math/optimization/SimulatedAnnealing.hpp
diff --git a/wpimath/src/main/native/include/frc/path/TravelingSalesman.h b/wpimath/src/main/native/include/wpi/math/path/TravelingSalesman.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/path/TravelingSalesman.h
rename to wpimath/src/main/native/include/wpi/math/path/TravelingSalesman.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/CubicHermiteSpline.h b/wpimath/src/main/native/include/wpi/math/spline/CubicHermiteSpline.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/CubicHermiteSpline.h
rename to wpimath/src/main/native/include/wpi/math/spline/CubicHermiteSpline.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/QuinticHermiteSpline.h b/wpimath/src/main/native/include/wpi/math/spline/QuinticHermiteSpline.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/QuinticHermiteSpline.h
rename to wpimath/src/main/native/include/wpi/math/spline/QuinticHermiteSpline.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/Spline.h b/wpimath/src/main/native/include/wpi/math/spline/Spline.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/Spline.h
rename to wpimath/src/main/native/include/wpi/math/spline/Spline.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/SplineHelper.h b/wpimath/src/main/native/include/wpi/math/spline/SplineHelper.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/SplineHelper.h
rename to wpimath/src/main/native/include/wpi/math/spline/SplineHelper.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/SplineParameterizer.h b/wpimath/src/main/native/include/wpi/math/spline/SplineParameterizer.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/SplineParameterizer.h
rename to wpimath/src/main/native/include/wpi/math/spline/SplineParameterizer.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/proto/CubicHermiteSplineProto.h b/wpimath/src/main/native/include/wpi/math/spline/proto/CubicHermiteSplineProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/proto/CubicHermiteSplineProto.h
rename to wpimath/src/main/native/include/wpi/math/spline/proto/CubicHermiteSplineProto.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/proto/QuinticHermiteSplineProto.h b/wpimath/src/main/native/include/wpi/math/spline/proto/QuinticHermiteSplineProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/proto/QuinticHermiteSplineProto.h
rename to wpimath/src/main/native/include/wpi/math/spline/proto/QuinticHermiteSplineProto.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/struct/CubicHermiteSplineStruct.h b/wpimath/src/main/native/include/wpi/math/spline/struct/CubicHermiteSplineStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/struct/CubicHermiteSplineStruct.h
rename to wpimath/src/main/native/include/wpi/math/spline/struct/CubicHermiteSplineStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/spline/struct/QuinticHermiteSplineStruct.h b/wpimath/src/main/native/include/wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/spline/struct/QuinticHermiteSplineStruct.h
rename to wpimath/src/main/native/include/wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/system/Discretization.h b/wpimath/src/main/native/include/wpi/math/system/Discretization.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/Discretization.h
rename to wpimath/src/main/native/include/wpi/math/system/Discretization.hpp
diff --git a/wpimath/src/main/native/include/frc/system/LinearSystem.h b/wpimath/src/main/native/include/wpi/math/system/LinearSystem.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/LinearSystem.h
rename to wpimath/src/main/native/include/wpi/math/system/LinearSystem.hpp
diff --git a/wpimath/src/main/native/include/frc/system/LinearSystemLoop.h b/wpimath/src/main/native/include/wpi/math/system/LinearSystemLoop.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/LinearSystemLoop.h
rename to wpimath/src/main/native/include/wpi/math/system/LinearSystemLoop.hpp
diff --git a/wpimath/src/main/native/include/frc/system/NumericalIntegration.h b/wpimath/src/main/native/include/wpi/math/system/NumericalIntegration.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/NumericalIntegration.h
rename to wpimath/src/main/native/include/wpi/math/system/NumericalIntegration.hpp
diff --git a/wpimath/src/main/native/include/frc/system/NumericalJacobian.h b/wpimath/src/main/native/include/wpi/math/system/NumericalJacobian.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/NumericalJacobian.h
rename to wpimath/src/main/native/include/wpi/math/system/NumericalJacobian.hpp
diff --git a/wpimath/src/main/native/include/frc/system/plant/DCMotor.h b/wpimath/src/main/native/include/wpi/math/system/plant/DCMotor.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/plant/DCMotor.h
rename to wpimath/src/main/native/include/wpi/math/system/plant/DCMotor.hpp
diff --git a/wpimath/src/main/native/include/frc/system/plant/LinearSystemId.h b/wpimath/src/main/native/include/wpi/math/system/plant/LinearSystemId.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/plant/LinearSystemId.h
rename to wpimath/src/main/native/include/wpi/math/system/plant/LinearSystemId.hpp
diff --git a/wpimath/src/main/native/include/frc/system/plant/proto/DCMotorProto.h b/wpimath/src/main/native/include/wpi/math/system/plant/proto/DCMotorProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/plant/proto/DCMotorProto.h
rename to wpimath/src/main/native/include/wpi/math/system/plant/proto/DCMotorProto.hpp
diff --git a/wpimath/src/main/native/include/frc/system/plant/struct/DCMotorStruct.h b/wpimath/src/main/native/include/wpi/math/system/plant/struct/DCMotorStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/plant/struct/DCMotorStruct.h
rename to wpimath/src/main/native/include/wpi/math/system/plant/struct/DCMotorStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/system/proto/LinearSystemProto.h b/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/proto/LinearSystemProto.h
rename to wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp
diff --git a/wpimath/src/main/native/include/frc/system/struct/LinearSystemStruct.h b/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/system/struct/LinearSystemStruct.h
rename to wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/ExponentialProfile.h b/wpimath/src/main/native/include/wpi/math/trajectory/ExponentialProfile.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/ExponentialProfile.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/ExponentialProfile.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/Trajectory.h b/wpimath/src/main/native/include/wpi/math/trajectory/Trajectory.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/Trajectory.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/Trajectory.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/TrajectoryConfig.h b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryConfig.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/TrajectoryConfig.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryConfig.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/TrajectoryGenerator.h b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryGenerator.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/TrajectoryGenerator.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryGenerator.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/TrajectoryParameterizer.h b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryParameterizer.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/TrajectoryParameterizer.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryParameterizer.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/TrapezoidProfile.h b/wpimath/src/main/native/include/wpi/math/trajectory/TrapezoidProfile.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/TrapezoidProfile.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/TrapezoidProfile.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/CentripetalAccelerationConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/CentripetalAccelerationConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/DifferentialDriveKinematicsConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/DifferentialDriveKinematicsConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/DifferentialDriveVoltageConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/DifferentialDriveVoltageConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/EllipticalRegionConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/EllipticalRegionConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/EllipticalRegionConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/EllipticalRegionConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/MaxVelocityConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/MaxVelocityConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/MecanumDriveKinematicsConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/MecanumDriveKinematicsConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/RectangularRegionConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/RectangularRegionConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/RectangularRegionConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/RectangularRegionConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/SwerveDriveKinematicsConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/SwerveDriveKinematicsConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/SwerveDriveKinematicsConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/SwerveDriveKinematicsConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/constraint/TrajectoryConstraint.h b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/TrajectoryConstraint.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/constraint/TrajectoryConstraint.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/constraint/TrajectoryConstraint.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/proto/TrajectoryProto.h b/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/proto/TrajectoryProto.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryProto.hpp
diff --git a/wpimath/src/main/native/include/frc/trajectory/proto/TrajectoryStateProto.h b/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryStateProto.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/trajectory/proto/TrajectoryStateProto.h
rename to wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryStateProto.hpp
diff --git a/wpimath/src/main/native/include/frc/ComputerVisionUtil.h b/wpimath/src/main/native/include/wpi/math/util/ComputerVisionUtil.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/ComputerVisionUtil.h
rename to wpimath/src/main/native/include/wpi/math/util/ComputerVisionUtil.hpp
diff --git a/wpimath/src/main/native/include/wpimath/MathShared.h b/wpimath/src/main/native/include/wpi/math/util/MathShared.hpp
similarity index 100%
rename from wpimath/src/main/native/include/wpimath/MathShared.h
rename to wpimath/src/main/native/include/wpi/math/util/MathShared.hpp
diff --git a/wpimath/src/main/native/include/frc/MathUtil.h b/wpimath/src/main/native/include/wpi/math/util/MathUtil.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/MathUtil.h
rename to wpimath/src/main/native/include/wpi/math/util/MathUtil.hpp
diff --git a/wpimath/src/main/native/include/frc/StateSpaceUtil.h b/wpimath/src/main/native/include/wpi/math/util/StateSpaceUtil.hpp
similarity index 100%
rename from wpimath/src/main/native/include/frc/StateSpaceUtil.h
rename to wpimath/src/main/native/include/wpi/math/util/StateSpaceUtil.hpp
diff --git a/wpimath/src/main/native/include/units/acceleration.h b/wpimath/src/main/native/include/wpi/units/acceleration.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/acceleration.h
rename to wpimath/src/main/native/include/wpi/units/acceleration.hpp
diff --git a/wpimath/src/main/native/include/units/angle.h b/wpimath/src/main/native/include/wpi/units/angle.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/angle.h
rename to wpimath/src/main/native/include/wpi/units/angle.hpp
diff --git a/wpimath/src/main/native/include/units/angular_acceleration.h b/wpimath/src/main/native/include/wpi/units/angular_acceleration.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/angular_acceleration.h
rename to wpimath/src/main/native/include/wpi/units/angular_acceleration.hpp
diff --git a/wpimath/src/main/native/include/units/angular_jerk.h b/wpimath/src/main/native/include/wpi/units/angular_jerk.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/angular_jerk.h
rename to wpimath/src/main/native/include/wpi/units/angular_jerk.hpp
diff --git a/wpimath/src/main/native/include/units/angular_velocity.h b/wpimath/src/main/native/include/wpi/units/angular_velocity.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/angular_velocity.h
rename to wpimath/src/main/native/include/wpi/units/angular_velocity.hpp
diff --git a/wpimath/src/main/native/include/units/area.h b/wpimath/src/main/native/include/wpi/units/area.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/area.h
rename to wpimath/src/main/native/include/wpi/units/area.hpp
diff --git a/wpimath/src/main/native/include/units/base.h b/wpimath/src/main/native/include/wpi/units/base.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/base.h
rename to wpimath/src/main/native/include/wpi/units/base.hpp
diff --git a/wpimath/src/main/native/include/units/capacitance.h b/wpimath/src/main/native/include/wpi/units/capacitance.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/capacitance.h
rename to wpimath/src/main/native/include/wpi/units/capacitance.hpp
diff --git a/wpimath/src/main/native/include/units/charge.h b/wpimath/src/main/native/include/wpi/units/charge.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/charge.h
rename to wpimath/src/main/native/include/wpi/units/charge.hpp
diff --git a/wpimath/src/main/native/include/units/concentration.h b/wpimath/src/main/native/include/wpi/units/concentration.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/concentration.h
rename to wpimath/src/main/native/include/wpi/units/concentration.hpp
diff --git a/wpimath/src/main/native/include/units/conductance.h b/wpimath/src/main/native/include/wpi/units/conductance.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/conductance.h
rename to wpimath/src/main/native/include/wpi/units/conductance.hpp
diff --git a/wpimath/src/main/native/include/units/constants.h b/wpimath/src/main/native/include/wpi/units/constants.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/constants.h
rename to wpimath/src/main/native/include/wpi/units/constants.hpp
diff --git a/wpimath/src/main/native/include/units/current.h b/wpimath/src/main/native/include/wpi/units/current.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/current.h
rename to wpimath/src/main/native/include/wpi/units/current.hpp
diff --git a/wpimath/src/main/native/include/units/curvature.h b/wpimath/src/main/native/include/wpi/units/curvature.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/curvature.h
rename to wpimath/src/main/native/include/wpi/units/curvature.hpp
diff --git a/wpimath/src/main/native/include/units/data.h b/wpimath/src/main/native/include/wpi/units/data.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/data.h
rename to wpimath/src/main/native/include/wpi/units/data.hpp
diff --git a/wpimath/src/main/native/include/units/data_transfer_rate.h b/wpimath/src/main/native/include/wpi/units/data_transfer_rate.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/data_transfer_rate.h
rename to wpimath/src/main/native/include/wpi/units/data_transfer_rate.hpp
diff --git a/wpimath/src/main/native/include/units/density.h b/wpimath/src/main/native/include/wpi/units/density.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/density.h
rename to wpimath/src/main/native/include/wpi/units/density.hpp
diff --git a/wpimath/src/main/native/include/units/dimensionless.h b/wpimath/src/main/native/include/wpi/units/dimensionless.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/dimensionless.h
rename to wpimath/src/main/native/include/wpi/units/dimensionless.hpp
diff --git a/wpimath/src/main/native/include/units/energy.h b/wpimath/src/main/native/include/wpi/units/energy.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/energy.h
rename to wpimath/src/main/native/include/wpi/units/energy.hpp
diff --git a/wpimath/src/main/native/include/units/force.h b/wpimath/src/main/native/include/wpi/units/force.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/force.h
rename to wpimath/src/main/native/include/wpi/units/force.hpp
diff --git a/wpimath/src/main/native/include/units/formatter.h b/wpimath/src/main/native/include/wpi/units/formatter.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/formatter.h
rename to wpimath/src/main/native/include/wpi/units/formatter.hpp
diff --git a/wpimath/src/main/native/include/units/frequency.h b/wpimath/src/main/native/include/wpi/units/frequency.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/frequency.h
rename to wpimath/src/main/native/include/wpi/units/frequency.hpp
diff --git a/wpimath/src/main/native/include/units/illuminance.h b/wpimath/src/main/native/include/wpi/units/illuminance.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/illuminance.h
rename to wpimath/src/main/native/include/wpi/units/illuminance.hpp
diff --git a/wpimath/src/main/native/include/units/impedance.h b/wpimath/src/main/native/include/wpi/units/impedance.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/impedance.h
rename to wpimath/src/main/native/include/wpi/units/impedance.hpp
diff --git a/wpimath/src/main/native/include/units/inductance.h b/wpimath/src/main/native/include/wpi/units/inductance.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/inductance.h
rename to wpimath/src/main/native/include/wpi/units/inductance.hpp
diff --git a/wpimath/src/main/native/include/units/length.h b/wpimath/src/main/native/include/wpi/units/length.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/length.h
rename to wpimath/src/main/native/include/wpi/units/length.hpp
diff --git a/wpimath/src/main/native/include/units/luminous_flux.h b/wpimath/src/main/native/include/wpi/units/luminous_flux.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/luminous_flux.h
rename to wpimath/src/main/native/include/wpi/units/luminous_flux.hpp
diff --git a/wpimath/src/main/native/include/units/luminous_intensity.h b/wpimath/src/main/native/include/wpi/units/luminous_intensity.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/luminous_intensity.h
rename to wpimath/src/main/native/include/wpi/units/luminous_intensity.hpp
diff --git a/wpimath/src/main/native/include/units/magnetic_field_strength.h b/wpimath/src/main/native/include/wpi/units/magnetic_field_strength.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/magnetic_field_strength.h
rename to wpimath/src/main/native/include/wpi/units/magnetic_field_strength.hpp
diff --git a/wpimath/src/main/native/include/units/magnetic_flux.h b/wpimath/src/main/native/include/wpi/units/magnetic_flux.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/magnetic_flux.h
rename to wpimath/src/main/native/include/wpi/units/magnetic_flux.hpp
diff --git a/wpimath/src/main/native/include/units/mass.h b/wpimath/src/main/native/include/wpi/units/mass.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/mass.h
rename to wpimath/src/main/native/include/wpi/units/mass.hpp
diff --git a/wpimath/src/main/native/include/units/math.h b/wpimath/src/main/native/include/wpi/units/math.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/math.h
rename to wpimath/src/main/native/include/wpi/units/math.hpp
diff --git a/wpimath/src/main/native/include/units/moment_of_inertia.h b/wpimath/src/main/native/include/wpi/units/moment_of_inertia.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/moment_of_inertia.h
rename to wpimath/src/main/native/include/wpi/units/moment_of_inertia.hpp
diff --git a/wpimath/src/main/native/include/units/power.h b/wpimath/src/main/native/include/wpi/units/power.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/power.h
rename to wpimath/src/main/native/include/wpi/units/power.hpp
diff --git a/wpimath/src/main/native/include/units/pressure.h b/wpimath/src/main/native/include/wpi/units/pressure.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/pressure.h
rename to wpimath/src/main/native/include/wpi/units/pressure.hpp
diff --git a/wpimath/src/main/native/include/units/radiation.h b/wpimath/src/main/native/include/wpi/units/radiation.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/radiation.h
rename to wpimath/src/main/native/include/wpi/units/radiation.hpp
diff --git a/wpimath/src/main/native/include/units/solid_angle.h b/wpimath/src/main/native/include/wpi/units/solid_angle.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/solid_angle.h
rename to wpimath/src/main/native/include/wpi/units/solid_angle.hpp
diff --git a/wpimath/src/main/native/include/units/substance.h b/wpimath/src/main/native/include/wpi/units/substance.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/substance.h
rename to wpimath/src/main/native/include/wpi/units/substance.hpp
diff --git a/wpimath/src/main/native/include/units/temperature.h b/wpimath/src/main/native/include/wpi/units/temperature.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/temperature.h
rename to wpimath/src/main/native/include/wpi/units/temperature.hpp
diff --git a/wpimath/src/main/native/include/units/time.h b/wpimath/src/main/native/include/wpi/units/time.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/time.h
rename to wpimath/src/main/native/include/wpi/units/time.hpp
diff --git a/wpimath/src/main/native/include/units/torque.h b/wpimath/src/main/native/include/wpi/units/torque.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/torque.h
rename to wpimath/src/main/native/include/wpi/units/torque.hpp
diff --git a/wpimath/src/main/native/include/units/velocity.h b/wpimath/src/main/native/include/wpi/units/velocity.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/velocity.h
rename to wpimath/src/main/native/include/wpi/units/velocity.hpp
diff --git a/wpimath/src/main/native/include/units/voltage.h b/wpimath/src/main/native/include/wpi/units/voltage.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/voltage.h
rename to wpimath/src/main/native/include/wpi/units/voltage.hpp
diff --git a/wpimath/src/main/native/include/units/volume.h b/wpimath/src/main/native/include/wpi/units/volume.hpp
similarity index 100%
rename from wpimath/src/main/native/include/units/volume.h
rename to wpimath/src/main/native/include/wpi/units/volume.hpp
diff --git a/wpimath/src/test/native/cpp/ProtoTestBase.h b/wpimath/src/test/native/cpp/ProtoTestBase.hpp
similarity index 100%
rename from wpimath/src/test/native/cpp/ProtoTestBase.h
rename to wpimath/src/test/native/cpp/ProtoTestBase.hpp
diff --git a/wpimath/src/test/native/cpp/StructTestBase.h b/wpimath/src/test/native/cpp/StructTestBase.hpp
similarity index 100%
rename from wpimath/src/test/native/cpp/StructTestBase.h
rename to wpimath/src/test/native/cpp/StructTestBase.hpp
diff --git a/wpimath/src/test/native/include/trajectory/TestTrajectory.h b/wpimath/src/test/native/include/wpi/math/trajectory/TestTrajectory.hpp
similarity index 100%
rename from wpimath/src/test/native/include/trajectory/TestTrajectory.h
rename to wpimath/src/test/native/include/wpi/math/trajectory/TestTrajectory.hpp
diff --git a/wpinet/src/main/native/cpp/MulticastHandleManager.h b/wpinet/src/main/native/cpp/MulticastHandleManager.hpp
similarity index 100%
rename from wpinet/src/main/native/cpp/MulticastHandleManager.h
rename to wpinet/src/main/native/cpp/MulticastHandleManager.hpp
diff --git a/wpinet/src/main/native/cpp/WebSocketDebug.h b/wpinet/src/main/native/cpp/WebSocketDebug.hpp
similarity index 100%
rename from wpinet/src/main/native/cpp/WebSocketDebug.h
rename to wpinet/src/main/native/cpp/WebSocketDebug.hpp
diff --git a/wpinet/src/main/native/cpp/WebSocketSerializer.h b/wpinet/src/main/native/cpp/WebSocketSerializer.hpp
similarity index 100%
rename from wpinet/src/main/native/cpp/WebSocketSerializer.h
rename to wpinet/src/main/native/cpp/WebSocketSerializer.hpp
diff --git a/wpinet/src/main/native/include/wpinet/DsClient.h b/wpinet/src/main/native/include/wpi/net/DsClient.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/DsClient.h
rename to wpinet/src/main/native/include/wpi/net/DsClient.hpp
diff --git a/wpinet/src/main/native/include/wpinet/EventLoopRunner.h b/wpinet/src/main/native/include/wpi/net/EventLoopRunner.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/EventLoopRunner.h
rename to wpinet/src/main/native/include/wpi/net/EventLoopRunner.hpp
diff --git a/wpinet/src/main/native/include/wpinet/HttpParser.h b/wpinet/src/main/native/include/wpi/net/HttpParser.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/HttpParser.h
rename to wpinet/src/main/native/include/wpi/net/HttpParser.hpp
diff --git a/wpinet/src/main/native/include/wpinet/HttpServerConnection.h b/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/HttpServerConnection.h
rename to wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp
diff --git a/wpinet/src/main/native/include/wpinet/HttpUtil.h b/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/HttpUtil.h
rename to wpinet/src/main/native/include/wpi/net/HttpUtil.hpp
diff --git a/wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.h b/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/HttpWebSocketServerConnection.h
rename to wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp
diff --git a/wpinet/src/main/native/include/wpinet/MimeTypes.h b/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/MimeTypes.h
rename to wpinet/src/main/native/include/wpi/net/MimeTypes.hpp
diff --git a/wpinet/src/main/native/include/wpinet/MulticastServiceAnnouncer.h b/wpinet/src/main/native/include/wpi/net/MulticastServiceAnnouncer.h
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/MulticastServiceAnnouncer.h
rename to wpinet/src/main/native/include/wpi/net/MulticastServiceAnnouncer.h
diff --git a/wpinet/src/main/native/include/wpinet/MulticastServiceResolver.h b/wpinet/src/main/native/include/wpi/net/MulticastServiceResolver.h
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/MulticastServiceResolver.h
rename to wpinet/src/main/native/include/wpi/net/MulticastServiceResolver.h
diff --git a/wpinet/src/main/native/include/wpinet/NetworkAcceptor.h b/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/NetworkAcceptor.h
rename to wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp
diff --git a/wpinet/src/main/native/include/wpinet/NetworkStream.h b/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/NetworkStream.h
rename to wpinet/src/main/native/include/wpi/net/NetworkStream.hpp
diff --git a/wpinet/src/main/native/include/wpinet/ParallelTcpConnector.h b/wpinet/src/main/native/include/wpi/net/ParallelTcpConnector.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/ParallelTcpConnector.h
rename to wpinet/src/main/native/include/wpi/net/ParallelTcpConnector.hpp
diff --git a/wpinet/src/main/native/include/wpinet/PortForwarder.h b/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/PortForwarder.h
rename to wpinet/src/main/native/include/wpi/net/PortForwarder.hpp
diff --git a/wpinet/src/main/native/include/wpinet/SocketError.h b/wpinet/src/main/native/include/wpi/net/SocketError.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/SocketError.h
rename to wpinet/src/main/native/include/wpi/net/SocketError.hpp
diff --git a/wpinet/src/main/native/include/wpinet/UDPClient.h b/wpinet/src/main/native/include/wpi/net/UDPClient.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/UDPClient.h
rename to wpinet/src/main/native/include/wpi/net/UDPClient.hpp
diff --git a/wpinet/src/main/native/include/wpinet/UrlParser.h b/wpinet/src/main/native/include/wpi/net/UrlParser.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/UrlParser.h
rename to wpinet/src/main/native/include/wpi/net/UrlParser.hpp
diff --git a/wpinet/src/main/native/include/wpinet/WebServer.h b/wpinet/src/main/native/include/wpi/net/WebServer.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/WebServer.h
rename to wpinet/src/main/native/include/wpi/net/WebServer.hpp
diff --git a/wpinet/src/main/native/include/wpinet/WebSocket.h b/wpinet/src/main/native/include/wpi/net/WebSocket.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/WebSocket.h
rename to wpinet/src/main/native/include/wpi/net/WebSocket.hpp
diff --git a/wpinet/src/main/native/include/wpinet/WebSocketServer.h b/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/WebSocketServer.h
rename to wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp
diff --git a/wpinet/src/main/native/include/wpinet/WorkerThread.h b/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/WorkerThread.h
rename to wpinet/src/main/native/include/wpi/net/WorkerThread.hpp
diff --git a/wpinet/src/main/native/include/wpinet/hostname.h b/wpinet/src/main/native/include/wpi/net/hostname.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/hostname.h
rename to wpinet/src/main/native/include/wpi/net/hostname.hpp
diff --git a/wpinet/src/main/native/include/wpinet/http_parser.h b/wpinet/src/main/native/include/wpi/net/http_parser.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/http_parser.h
rename to wpinet/src/main/native/include/wpi/net/http_parser.hpp
diff --git a/wpinet/src/main/native/include/wpinet/raw_socket_istream.h b/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/raw_socket_istream.h
rename to wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp
diff --git a/wpinet/src/main/native/include/wpinet/raw_socket_ostream.h b/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/raw_socket_ostream.h
rename to wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp
diff --git a/wpinet/src/main/native/include/wpinet/raw_uv_ostream.h b/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/raw_uv_ostream.h
rename to wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Async.h b/wpinet/src/main/native/include/wpi/net/uv/Async.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Async.h
rename to wpinet/src/main/native/include/wpi/net/uv/Async.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/AsyncFunction.h b/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/AsyncFunction.h
rename to wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Buffer.h b/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Buffer.h
rename to wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Check.h b/wpinet/src/main/native/include/wpi/net/uv/Check.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Check.h
rename to wpinet/src/main/native/include/wpi/net/uv/Check.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Error.h b/wpinet/src/main/native/include/wpi/net/uv/Error.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Error.h
rename to wpinet/src/main/native/include/wpi/net/uv/Error.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/FsEvent.h b/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/FsEvent.h
rename to wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/GetAddrInfo.h b/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/GetAddrInfo.h
rename to wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/GetNameInfo.h b/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/GetNameInfo.h
rename to wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Handle.h b/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Handle.h
rename to wpinet/src/main/native/include/wpi/net/uv/Handle.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Idle.h b/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Idle.h
rename to wpinet/src/main/native/include/wpi/net/uv/Idle.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Loop.h b/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Loop.h
rename to wpinet/src/main/native/include/wpi/net/uv/Loop.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/NetworkStream.h b/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/NetworkStream.h
rename to wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Pipe.h b/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Pipe.h
rename to wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Poll.h b/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Poll.h
rename to wpinet/src/main/native/include/wpi/net/uv/Poll.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Prepare.h b/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Prepare.h
rename to wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Process.h b/wpinet/src/main/native/include/wpi/net/uv/Process.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Process.h
rename to wpinet/src/main/native/include/wpi/net/uv/Process.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Request.h b/wpinet/src/main/native/include/wpi/net/uv/Request.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Request.h
rename to wpinet/src/main/native/include/wpi/net/uv/Request.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Signal.h b/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Signal.h
rename to wpinet/src/main/native/include/wpi/net/uv/Signal.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Stream.h b/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Stream.h
rename to wpinet/src/main/native/include/wpi/net/uv/Stream.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Tcp.h b/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Tcp.h
rename to wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Timer.h b/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Timer.h
rename to wpinet/src/main/native/include/wpi/net/uv/Timer.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Tty.h b/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Tty.h
rename to wpinet/src/main/native/include/wpi/net/uv/Tty.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Udp.h b/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Udp.h
rename to wpinet/src/main/native/include/wpi/net/uv/Udp.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/Work.h b/wpinet/src/main/native/include/wpi/net/uv/Work.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/Work.h
rename to wpinet/src/main/native/include/wpi/net/uv/Work.hpp
diff --git a/wpinet/src/main/native/include/wpinet/uv/util.h b/wpinet/src/main/native/include/wpi/net/uv/util.hpp
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/uv/util.h
rename to wpinet/src/main/native/include/wpi/net/uv/util.hpp
diff --git a/wpinet/src/main/native/linux/AvahiClient.h b/wpinet/src/main/native/linux/AvahiClient.hpp
similarity index 100%
rename from wpinet/src/main/native/linux/AvahiClient.h
rename to wpinet/src/main/native/linux/AvahiClient.hpp
diff --git a/wpinet/src/main/native/macOS/ResolverThread.h b/wpinet/src/main/native/macOS/ResolverThread.hpp
similarity index 100%
rename from wpinet/src/main/native/macOS/ResolverThread.h
rename to wpinet/src/main/native/macOS/ResolverThread.hpp
diff --git a/wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPAcceptor.h b/wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPAcceptor.h
similarity index 100%
rename from wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPAcceptor.h
rename to wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPAcceptor.h
diff --git a/wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPConnector.h b/wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPConnector.h
similarity index 100%
rename from wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPConnector.h
rename to wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPConnector.h
diff --git a/wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPStream.h b/wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPStream.h
similarity index 100%
rename from wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPStream.h
rename to wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPStream.h
diff --git a/wpinet/src/main/native/windows/DynamicDns.h b/wpinet/src/main/native/windows/DynamicDns.hpp
similarity index 100%
rename from wpinet/src/main/native/windows/DynamicDns.h
rename to wpinet/src/main/native/windows/DynamicDns.hpp
diff --git a/wpinet/src/test/native/cpp/WebSocketTest.h b/wpinet/src/test/native/cpp/WebSocketTest.hpp
similarity index 100%
rename from wpinet/src/test/native/cpp/WebSocketTest.h
rename to wpinet/src/test/native/cpp/WebSocketTest.hpp
diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.h b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.hpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/jni/WPIUtilJNI.h
rename to wpiutil/src/main/native/cpp/jni/WPIUtilJNI.hpp
diff --git a/wpiutil/src/main/native/include/wpi/Algorithm.h b/wpiutil/src/main/native/include/wpi/util/Algorithm.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Algorithm.h
rename to wpiutil/src/main/native/include/wpi/util/Algorithm.hpp
diff --git a/wpiutil/src/main/native/include/wpi/Base64.h b/wpiutil/src/main/native/include/wpi/util/Base64.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Base64.h
rename to wpiutil/src/main/native/include/wpi/util/Base64.hpp
diff --git a/wpiutil/src/main/native/include/wpi/CallbackManager.h b/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/CallbackManager.h
rename to wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp
diff --git a/wpiutil/src/main/native/include/wpi/DecayedDerivedFrom.h b/wpiutil/src/main/native/include/wpi/util/DecayedDerivedFrom.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/DecayedDerivedFrom.h
rename to wpiutil/src/main/native/include/wpi/util/DecayedDerivedFrom.hpp
diff --git a/wpiutil/src/main/native/include/wpi/Demangle.h b/wpiutil/src/main/native/include/wpi/util/Demangle.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Demangle.h
rename to wpiutil/src/main/native/include/wpi/util/Demangle.hpp
diff --git a/wpiutil/src/main/native/include/wpi/EventVector.h b/wpiutil/src/main/native/include/wpi/util/EventVector.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/EventVector.h
rename to wpiutil/src/main/native/include/wpi/util/EventVector.hpp
diff --git a/wpiutil/src/main/native/include/wpi/FastQueue.h b/wpiutil/src/main/native/include/wpi/util/FastQueue.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/FastQueue.h
rename to wpiutil/src/main/native/include/wpi/util/FastQueue.hpp
diff --git a/wpiutil/src/main/native/include/wpi/Logger.h b/wpiutil/src/main/native/include/wpi/util/Logger.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Logger.h
rename to wpiutil/src/main/native/include/wpi/util/Logger.hpp
diff --git a/wpiutil/src/main/native/include/wpi/MappedFileRegion.h b/wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/MappedFileRegion.h
rename to wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp
diff --git a/wpiutil/src/main/native/include/wpi/MessagePack.h b/wpiutil/src/main/native/include/wpi/util/MessagePack.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/MessagePack.h
rename to wpiutil/src/main/native/include/wpi/util/MessagePack.hpp
diff --git a/wpiutil/src/main/native/include/wpi/NullDeleter.h b/wpiutil/src/main/native/include/wpi/util/NullDeleter.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/NullDeleter.h
rename to wpiutil/src/main/native/include/wpi/util/NullDeleter.hpp
diff --git a/wpiutil/src/main/native/include/wpi/RawFrame.h b/wpiutil/src/main/native/include/wpi/util/RawFrame.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/RawFrame.h
rename to wpiutil/src/main/native/include/wpi/util/RawFrame.h
diff --git a/wpiutil/src/main/native/include/wpi/RuntimeCheck.h b/wpiutil/src/main/native/include/wpi/util/RuntimeCheck.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/RuntimeCheck.h
rename to wpiutil/src/main/native/include/wpi/util/RuntimeCheck.h
diff --git a/wpiutil/src/main/native/include/wpi/SafeThread.h b/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SafeThread.h
rename to wpiutil/src/main/native/include/wpi/util/SafeThread.hpp
diff --git a/wpiutil/src/main/native/include/wpi/SpanExtras.h b/wpiutil/src/main/native/include/wpi/util/SpanExtras.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SpanExtras.h
rename to wpiutil/src/main/native/include/wpi/util/SpanExtras.hpp
diff --git a/wpiutil/src/main/native/include/wpi/StackTrace.h b/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/StackTrace.h
rename to wpiutil/src/main/native/include/wpi/util/StackTrace.hpp
diff --git a/wpiutil/src/main/native/include/wpi/StringMap.h b/wpiutil/src/main/native/include/wpi/util/StringMap.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/StringMap.h
rename to wpiutil/src/main/native/include/wpi/util/StringMap.hpp
diff --git a/wpiutil/src/main/native/include/wpi/SymbolExports.h b/wpiutil/src/main/native/include/wpi/util/SymbolExports.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SymbolExports.h
rename to wpiutil/src/main/native/include/wpi/util/SymbolExports.hpp
diff --git a/wpiutil/src/main/native/include/wpi/Synchronization.h b/wpiutil/src/main/native/include/wpi/util/Synchronization.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Synchronization.h
rename to wpiutil/src/main/native/include/wpi/util/Synchronization.h
diff --git a/wpiutil/src/main/native/include/wpi/UidVector.h b/wpiutil/src/main/native/include/wpi/util/UidVector.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/UidVector.h
rename to wpiutil/src/main/native/include/wpi/util/UidVector.hpp
diff --git a/wpiutil/src/main/native/include/wpi/array.h b/wpiutil/src/main/native/include/wpi/util/array.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/array.h
rename to wpiutil/src/main/native/include/wpi/util/array.hpp
diff --git a/wpiutil/src/main/native/include/wpi/circular_buffer.h b/wpiutil/src/main/native/include/wpi/util/circular_buffer.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/circular_buffer.h
rename to wpiutil/src/main/native/include/wpi/util/circular_buffer.hpp
diff --git a/wpiutil/src/main/native/include/wpi/condition_variable.h b/wpiutil/src/main/native/include/wpi/util/condition_variable.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/condition_variable.h
rename to wpiutil/src/main/native/include/wpi/util/condition_variable.hpp
diff --git a/wpiutil/src/main/native/include/wpi/ct_string.h b/wpiutil/src/main/native/include/wpi/util/ct_string.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/ct_string.h
rename to wpiutil/src/main/native/include/wpi/util/ct_string.hpp
diff --git a/wpiutil/src/main/native/include/wpi/deprecated.h b/wpiutil/src/main/native/include/wpi/util/deprecated.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/deprecated.h
rename to wpiutil/src/main/native/include/wpi/util/deprecated.hpp
diff --git a/wpiutil/src/main/native/include/wpi/fmt/raw_ostream.h b/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/fmt/raw_ostream.h
rename to wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp
diff --git a/wpiutil/src/main/native/include/wpi/fs.h b/wpiutil/src/main/native/include/wpi/util/fs.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/fs.h
rename to wpiutil/src/main/native/include/wpi/util/fs.hpp
diff --git a/wpiutil/src/main/native/include/wpi/future.h b/wpiutil/src/main/native/include/wpi/util/future.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/future.h
rename to wpiutil/src/main/native/include/wpi/util/future.hpp
diff --git a/wpiutil/src/main/native/include/wpi/interpolating_map.h b/wpiutil/src/main/native/include/wpi/util/interpolating_map.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/interpolating_map.h
rename to wpiutil/src/main/native/include/wpi/util/interpolating_map.hpp
diff --git a/wpiutil/src/main/native/include/wpi/jni_util.h b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/jni_util.h
rename to wpiutil/src/main/native/include/wpi/util/jni_util.hpp
diff --git a/wpiutil/src/main/native/include/wpi/mutex.h b/wpiutil/src/main/native/include/wpi/util/mutex.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/mutex.h
rename to wpiutil/src/main/native/include/wpi/util/mutex.hpp
diff --git a/wpiutil/src/main/native/include/wpi/nodiscard.h b/wpiutil/src/main/native/include/wpi/util/nodiscard.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/nodiscard.h
rename to wpiutil/src/main/native/include/wpi/util/nodiscard.h
diff --git a/wpiutil/src/main/native/include/wpi/print.h b/wpiutil/src/main/native/include/wpi/util/print.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/print.h
rename to wpiutil/src/main/native/include/wpi/util/print.hpp
diff --git a/wpiutil/src/main/native/include/wpi/priority_mutex.h b/wpiutil/src/main/native/include/wpi/util/priority_mutex.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/priority_mutex.h
rename to wpiutil/src/main/native/include/wpi/util/priority_mutex.hpp
diff --git a/wpiutil/src/main/native/include/wpi/priority_queue.h b/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/priority_queue.h
rename to wpiutil/src/main/native/include/wpi/util/priority_queue.hpp
diff --git a/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h b/wpiutil/src/main/native/include/wpi/util/protobuf/Protobuf.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h
rename to wpiutil/src/main/native/include/wpi/util/protobuf/Protobuf.hpp
diff --git a/wpiutil/src/main/native/include/wpi/protobuf/ProtobufCallbacks.h b/wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/protobuf/ProtobufCallbacks.h
rename to wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp
diff --git a/wpiutil/src/main/native/include/wpi/raw_istream.h b/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/raw_istream.h
rename to wpiutil/src/main/native/include/wpi/util/raw_istream.hpp
diff --git a/wpiutil/src/main/native/include/wpi/rotated_span.h b/wpiutil/src/main/native/include/wpi/util/rotated_span.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/rotated_span.h
rename to wpiutil/src/main/native/include/wpi/util/rotated_span.hpp
diff --git a/wpiutil/src/main/native/include/wpi/scope b/wpiutil/src/main/native/include/wpi/util/scope
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/scope
rename to wpiutil/src/main/native/include/wpi/util/scope
diff --git a/wpiutil/src/main/native/include/wpi/sendable/Sendable.h b/wpiutil/src/main/native/include/wpi/util/sendable/Sendable.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/sendable/Sendable.h
rename to wpiutil/src/main/native/include/wpi/util/sendable/Sendable.hpp
diff --git a/wpiutil/src/main/native/include/wpi/sendable/SendableBuilder.h b/wpiutil/src/main/native/include/wpi/util/sendable/SendableBuilder.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/sendable/SendableBuilder.h
rename to wpiutil/src/main/native/include/wpi/util/sendable/SendableBuilder.hpp
diff --git a/wpiutil/src/main/native/include/wpi/sendable/SendableHelper.h b/wpiutil/src/main/native/include/wpi/util/sendable/SendableHelper.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/sendable/SendableHelper.h
rename to wpiutil/src/main/native/include/wpi/util/sendable/SendableHelper.hpp
diff --git a/wpiutil/src/main/native/include/wpi/sendable/SendableRegistry.h b/wpiutil/src/main/native/include/wpi/util/sendable/SendableRegistry.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/sendable/SendableRegistry.h
rename to wpiutil/src/main/native/include/wpi/util/sendable/SendableRegistry.hpp
diff --git a/wpiutil/src/main/native/include/wpi/sha1.h b/wpiutil/src/main/native/include/wpi/util/sha1.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/sha1.h
rename to wpiutil/src/main/native/include/wpi/util/sha1.hpp
diff --git a/wpiutil/src/main/native/include/wpi/spinlock.h b/wpiutil/src/main/native/include/wpi/util/spinlock.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/spinlock.h
rename to wpiutil/src/main/native/include/wpi/util/spinlock.hpp
diff --git a/wpiutil/src/main/native/include/wpi/static_circular_buffer.h b/wpiutil/src/main/native/include/wpi/util/static_circular_buffer.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/static_circular_buffer.h
rename to wpiutil/src/main/native/include/wpi/util/static_circular_buffer.hpp
diff --git a/wpiutil/src/main/native/include/wpi/string.h b/wpiutil/src/main/native/include/wpi/util/string.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/string.h
rename to wpiutil/src/main/native/include/wpi/util/string.h
diff --git a/wpiutil/src/main/native/include/wpi/struct/DynamicStruct.h b/wpiutil/src/main/native/include/wpi/util/struct/DynamicStruct.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/struct/DynamicStruct.h
rename to wpiutil/src/main/native/include/wpi/util/struct/DynamicStruct.hpp
diff --git a/wpiutil/src/main/native/include/wpi/struct/SchemaParser.h b/wpiutil/src/main/native/include/wpi/util/struct/SchemaParser.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/struct/SchemaParser.h
rename to wpiutil/src/main/native/include/wpi/util/struct/SchemaParser.hpp
diff --git a/wpiutil/src/main/native/include/wpi/struct/Struct.h b/wpiutil/src/main/native/include/wpi/util/struct/Struct.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/struct/Struct.h
rename to wpiutil/src/main/native/include/wpi/util/struct/Struct.hpp
diff --git a/wpiutil/src/main/native/include/wpi/timestamp.h b/wpiutil/src/main/native/include/wpi/util/timestamp.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/timestamp.h
rename to wpiutil/src/main/native/include/wpi/util/timestamp.h
diff --git a/wpiutil/src/main/native/thirdparty/argparse/include/wpi/argparse.h b/wpiutil/src/main/native/thirdparty/argparse/include/wpi/util/argparse.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/argparse/include/wpi/argparse.h
rename to wpiutil/src/main/native/thirdparty/argparse/include/wpi/util/argparse.hpp
diff --git a/wpiutil/src/main/native/thirdparty/expected/include/wpi/expected b/wpiutil/src/main/native/thirdparty/expected/include/wpi/util/expected
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/expected/include/wpi/expected
rename to wpiutil/src/main/native/thirdparty/expected/include/wpi/util/expected
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/adl_serializer.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/adl_serializer.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/byte_container_with_subtype.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/byte_container_with_subtype.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/abi_macros.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/abi_macros.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/abi_macros.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/abi_macros.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/conversions/from_json.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/conversions/from_json.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/conversions/to_chars.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/conversions/to_chars.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/conversions/to_json.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/conversions/to_json.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/exceptions.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/exceptions.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/hash.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/hash.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/binary_reader.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/binary_reader.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/input_adapters.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/input_adapters.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/json_sax.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/json_sax.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/lexer.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/lexer.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/parser.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/parser.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/position_t.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/input/position_t.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/internal_iterator.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/internal_iterator.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/iter_impl.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/iter_impl.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/iteration_proxy.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/iteration_proxy.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/iterator_traits.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/iterator_traits.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/json_reverse_iterator.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/json_reverse_iterator.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/primitive_iterator.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/iterators/primitive_iterator.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/json_custom_base_class.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/json_custom_base_class.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/json_pointer.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/json_pointer.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/json_ref.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/json_ref.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/macro_scope.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/macro_scope.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/macro_unscope.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/macro_unscope.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/call_std/begin.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/call_std/begin.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/call_std/end.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/call_std/end.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/cpp_future.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/cpp_future.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/detected.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/detected.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/identity_tag.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/identity_tag.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/is_sax.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/is_sax.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/std_fs.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/std_fs.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/type_traits.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/type_traits.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/void_t.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/meta/void_t.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/output/binary_writer.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/output/binary_writer.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/output/output_adapters.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/output/output_adapters.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/output/serializer.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/output/serializer.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/string_concat.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/string_concat.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/string_escape.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/string_escape.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/detail/value_t.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/detail/value_t.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/json.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/json.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/json_fwd.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/json_fwd.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/ordered_map.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/ordered_map.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/thirdparty/hedley/hedley.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/thirdparty/hedley/hedley.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/thirdparty/hedley/hedley.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/thirdparty/hedley/hedley.hpp
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/thirdparty/hedley/hedley_undef.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/thirdparty/hedley/hedley_undef.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/json/include/wpi/thirdparty/hedley/hedley_undef.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/util/thirdparty/hedley/hedley_undef.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/WindowsSupport.h b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/WindowsSupport.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/WindowsSupport.h
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/WindowsSupport.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ADL.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ADL.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/ADL.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ADL.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/AlignOf.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/AlignOf.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/AlignOf.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/AlignOf.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/AllocatorBase.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/AllocatorBase.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/AllocatorBase.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/AllocatorBase.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Casting.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Casting.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/Casting.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Casting.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Chrono.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Chrono.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/Chrono.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Chrono.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Compiler.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Compiler.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/Compiler.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Compiler.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ConvertUTF.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ConvertUTF.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/ConvertUTF.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ConvertUTF.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/DenseMap.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/DenseMap.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMapInfo.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/DenseMapInfo.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMapInfo.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/DenseMapInfo.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMapInfoVariant.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/DenseMapInfoVariant.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMapInfoVariant.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/DenseMapInfoVariant.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Endian.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Endian.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/Endian.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Endian.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/EpochTracker.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/EpochTracker.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errc.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Errc.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errc.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Errc.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errno.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Errno.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errno.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/Errno.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ErrorHandling.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ErrorHandling.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/ErrorHandling.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ErrorHandling.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/FunctionExtras.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/FunctionExtras.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/FunctionExtras.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/FunctionExtras.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MathExtras.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/MathExtras.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/MathExtras.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/MathExtras.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemAlloc.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/MemAlloc.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemAlloc.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/MemAlloc.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemoryBuffer.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/MemoryBuffer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemoryBuffer.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/MemoryBuffer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerIntPair.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/PointerIntPair.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerIntPair.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/PointerIntPair.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerLikeTypeTraits.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/PointerLikeTypeTraits.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerLikeTypeTraits.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/PointerLikeTypeTraits.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerUnion.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/PointerUnion.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerUnion.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/PointerUnion.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ReverseIteration.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ReverseIteration.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/ReverseIteration.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/ReverseIteration.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/STLForwardCompat.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/STLForwardCompat.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/STLForwardCompat.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/STLForwardCompat.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallPtrSet.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallPtrSet.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallPtrSet.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallPtrSet.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallSet.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallSet.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallSet.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallSet.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallString.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallString.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallString.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallString.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVector.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallVector.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVector.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallVector.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVectorMemoryBuffer.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallVectorMemoryBuffer.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVectorMemoryBuffer.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SmallVectorMemoryBuffer.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringExtras.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/StringExtras.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringExtras.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/StringExtras.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SwapByteOrder.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SwapByteOrder.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/SwapByteOrder.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/SwapByteOrder.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/VersionTuple.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/VersionTuple.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/VersionTuple.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/VersionTuple.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/WindowsError.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/WindowsError.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/WindowsError.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/WindowsError.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/bit.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/bit.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/bit.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/bit.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/function_ref.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/function_ref.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/function_ref.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/function_ref.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/iterator.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/iterator.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator_range.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/iterator_range.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator_range.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/iterator_range.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_os_ostream.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_os_ostream.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_os_ostream.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_os_ostream.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_ostream.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_ostream.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_ostream.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/raw_ostream.hpp
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/type_traits.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/type_traits.hpp
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/llvm/include/wpi/type_traits.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/util/type_traits.hpp
diff --git a/wpiutil/src/main/native/thirdparty/mpack/include/wpi/mpack.h b/wpiutil/src/main/native/thirdparty/mpack/include/wpi/util/mpack.h
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/mpack/include/wpi/mpack.h
rename to wpiutil/src/main/native/thirdparty/mpack/include/wpi/util/mpack.h
diff --git a/wpiutil/src/main/native/thirdparty/sigslot/include/wpi/Signal.h b/wpiutil/src/main/native/thirdparty/sigslot/include/wpi/util/Signal.h
similarity index 100%
rename from wpiutil/src/main/native/thirdparty/sigslot/include/wpi/Signal.h
rename to wpiutil/src/main/native/thirdparty/sigslot/include/wpi/util/Signal.h
diff --git a/wpiutil/src/test/native/cpp/llvm/CountCopyAndMove.h b/wpiutil/src/test/native/cpp/llvm/CountCopyAndMove.hpp
similarity index 100%
rename from wpiutil/src/test/native/cpp/llvm/CountCopyAndMove.h
rename to wpiutil/src/test/native/cpp/llvm/CountCopyAndMove.hpp
diff --git a/wpiutil/src/test/native/cpp/proto/TestProtoInner.h b/wpiutil/src/test/native/cpp/proto/TestProtoInner.hpp
similarity index 100%
rename from wpiutil/src/test/native/cpp/proto/TestProtoInner.h
rename to wpiutil/src/test/native/cpp/proto/TestProtoInner.hpp
diff --git a/wpiutil/src/test/native/include/wpi/SpanMatcher.h b/wpiutil/src/test/native/include/wpi/util/SpanMatcher.hpp
similarity index 100%
rename from wpiutil/src/test/native/include/wpi/SpanMatcher.h
rename to wpiutil/src/test/native/include/wpi/util/SpanMatcher.hpp
diff --git a/wpiutil/src/test/native/include/wpi/TestPrinters.h b/wpiutil/src/test/native/include/wpi/util/TestPrinters.hpp
similarity index 100%
rename from wpiutil/src/test/native/include/wpi/TestPrinters.h
rename to wpiutil/src/test/native/include/wpi/util/TestPrinters.hpp
diff --git a/xrpVendordep/src/main/native/include/frc/xrp/XRPGyro.h b/xrpVendordep/src/main/native/include/wpi/xrp/XRPGyro.hpp
similarity index 100%
rename from xrpVendordep/src/main/native/include/frc/xrp/XRPGyro.h
rename to xrpVendordep/src/main/native/include/wpi/xrp/XRPGyro.hpp
diff --git a/xrpVendordep/src/main/native/include/frc/xrp/XRPMotor.h b/xrpVendordep/src/main/native/include/wpi/xrp/XRPMotor.hpp
similarity index 100%
rename from xrpVendordep/src/main/native/include/frc/xrp/XRPMotor.h
rename to xrpVendordep/src/main/native/include/wpi/xrp/XRPMotor.hpp
diff --git a/xrpVendordep/src/main/native/include/frc/xrp/XRPOnBoardIO.h b/xrpVendordep/src/main/native/include/wpi/xrp/XRPOnBoardIO.hpp
similarity index 100%
rename from xrpVendordep/src/main/native/include/frc/xrp/XRPOnBoardIO.h
rename to xrpVendordep/src/main/native/include/wpi/xrp/XRPOnBoardIO.hpp
diff --git a/xrpVendordep/src/main/native/include/frc/xrp/XRPRangefinder.h b/xrpVendordep/src/main/native/include/wpi/xrp/XRPRangefinder.hpp
similarity index 100%
rename from xrpVendordep/src/main/native/include/frc/xrp/XRPRangefinder.h
rename to xrpVendordep/src/main/native/include/wpi/xrp/XRPRangefinder.hpp
diff --git a/xrpVendordep/src/main/native/include/frc/xrp/XRPReflectanceSensor.h b/xrpVendordep/src/main/native/include/wpi/xrp/XRPReflectanceSensor.hpp
similarity index 100%
rename from xrpVendordep/src/main/native/include/frc/xrp/XRPReflectanceSensor.h
rename to xrpVendordep/src/main/native/include/wpi/xrp/XRPReflectanceSensor.hpp
diff --git a/xrpVendordep/src/main/native/include/frc/xrp/XRPServo.h b/xrpVendordep/src/main/native/include/wpi/xrp/XRPServo.hpp
similarity index 100%
rename from xrpVendordep/src/main/native/include/frc/xrp/XRPServo.h
rename to xrpVendordep/src/main/native/include/wpi/xrp/XRPServo.hpp