From 7ca1be9bae35950bfea216ffafa3fa9fe9529f20 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Fri, 7 Nov 2025 19:55:39 -0500
Subject: [PATCH] SCRIPT Move cc files

---
 .../{frc/apriltag/AprilTag.h => wpi/apriltag/AprilTag.hpp}        | 0
 .../AprilTagDetection.h => wpi/apriltag/AprilTagDetection.hpp}    | 0
 .../AprilTagDetector.h => wpi/apriltag/AprilTagDetector.hpp}      | 0
 .../apriltag/AprilTagDetector_cv.hpp}                             | 0
 .../apriltag/AprilTagFieldLayout.hpp}                             | 0
 .../apriltag/AprilTagFields.h => wpi/apriltag/AprilTagFields.hpp} | 0
 .../apriltag/AprilTagPoseEstimate.hpp}                            | 0
 .../apriltag/AprilTagPoseEstimator.hpp}                           | 0
 .../CameraServer.h => wpi/cameraserver/CameraServer.hpp}          | 0
 .../cameraserver/CameraServerShared.hpp}                          | 0
 .../{vision/VisionPipeline.h => wpi/vision/VisionPipeline.hpp}    | 0
 .../{vision/VisionRunner.h => wpi/vision/VisionRunner.hpp}        | 0
 .../commands2/button/CommandPS4Controller.hpp}                    | 0
 .../commands2/button/CommandPS5Controller.hpp}                    | 0
 .../commands2/button/CommandStadiaController.hpp}                 | 0
 .../commands2/button/CommandXboxController.hpp}                   | 0
 .../include/{frc2/command/Command.h => wpi/commands2/Command.hpp} | 0
 .../command/CommandHelper.h => wpi/commands2/CommandHelper.hpp}   | 0
 .../{frc2/command/CommandPtr.h => wpi/commands2/CommandPtr.hpp}   | 0
 .../CommandScheduler.h => wpi/commands2/CommandScheduler.hpp}     | 0
 .../{frc2/command/Commands.h => wpi/commands2/Commands.hpp}       | 0
 .../ConditionalCommand.h => wpi/commands2/ConditionalCommand.hpp} | 0
 .../DeferredCommand.h => wpi/commands2/DeferredCommand.hpp}       | 0
 .../FunctionalCommand.h => wpi/commands2/FunctionalCommand.hpp}   | 0
 .../command/InstantCommand.h => wpi/commands2/InstantCommand.hpp} | 0
 .../NotifierCommand.h => wpi/commands2/NotifierCommand.hpp}       | 0
 .../commands2/ParallelCommandGroup.hpp}                           | 0
 .../commands2/ParallelDeadlineGroup.hpp}                          | 0
 .../ParallelRaceGroup.h => wpi/commands2/ParallelRaceGroup.hpp}   | 0
 .../command/PrintCommand.h => wpi/commands2/PrintCommand.hpp}     | 0
 .../command/ProxyCommand.h => wpi/commands2/ProxyCommand.hpp}     | 0
 .../command/RepeatCommand.h => wpi/commands2/RepeatCommand.hpp}   | 0
 .../command/Requirements.h => wpi/commands2/Requirements.hpp}     | 0
 .../{frc2/command/RunCommand.h => wpi/commands2/RunCommand.hpp}   | 0
 .../ScheduleCommand.h => wpi/commands2/ScheduleCommand.hpp}       | 0
 .../command/SelectCommand.h => wpi/commands2/SelectCommand.hpp}   | 0
 .../commands2/SequentialCommandGroup.hpp}                         | 0
 .../StartEndCommand.h => wpi/commands2/StartEndCommand.hpp}       | 0
 .../{frc2/command/Subsystem.h => wpi/commands2/Subsystem.hpp}     | 0
 .../command/SubsystemBase.h => wpi/commands2/SubsystemBase.hpp}   | 0
 .../{frc2/command/WaitCommand.h => wpi/commands2/WaitCommand.hpp} | 0
 .../WaitUntilCommand.h => wpi/commands2/WaitUntilCommand.hpp}     | 0
 .../command/WrapperCommand.h => wpi/commands2/WrapperCommand.hpp} | 0
 .../CommandGamepad.h => wpi/commands2/button/CommandGamepad.hpp}  | 0
 .../commands2/button/CommandGenericHID.hpp}                       | 0
 .../commands2/button/CommandJoystick.hpp}                         | 0
 .../JoystickButton.h => wpi/commands2/button/JoystickButton.hpp}  | 0
 .../NetworkButton.h => wpi/commands2/button/NetworkButton.hpp}    | 0
 .../button/POVButton.h => wpi/commands2/button/POVButton.hpp}     | 0
 .../commands2/button/RobotModeTriggers.hpp}                       | 0
 .../command/button/Trigger.h => wpi/commands2/button/Trigger.hpp} | 0
 .../sysid/SysIdRoutine.h => wpi/commands2/sysid/SysIdRoutine.hpp} | 0
 .../cpp/frc2/command/{CommandTestBase.h => CommandTestBase.hpp}   | 0
 .../command/{CompositionTestBase.h => CompositionTestBase.hpp}    | 0
 .../native/cpp/frc2/command/{make_vector.h => make_vector.hpp}    | 0
 .../cpp/{ConfigurableSourceImpl.h => ConfigurableSourceImpl.hpp}  | 0
 cscore/src/main/native/cpp/{Frame.h => Frame.hpp}                 | 0
 cscore/src/main/native/cpp/{Handle.h => Handle.hpp}               | 0
 .../src/main/native/cpp/{HttpCameraImpl.h => HttpCameraImpl.hpp}  | 0
 cscore/src/main/native/cpp/{Image.h => Image.hpp}                 | 0
 cscore/src/main/native/cpp/{Instance.h => Instance.hpp}           | 0
 cscore/src/main/native/cpp/{JpegUtil.h => JpegUtil.hpp}           | 0
 cscore/src/main/native/cpp/{Log.h => Log.hpp}                     | 0
 .../main/native/cpp/{MjpegServerImpl.h => MjpegServerImpl.hpp}    | 0
 .../main/native/cpp/{NetworkListener.h => NetworkListener.hpp}    | 0
 cscore/src/main/native/cpp/{Notifier.h => Notifier.hpp}           | 0
 .../native/cpp/{PropertyContainer.h => PropertyContainer.hpp}     | 0
 cscore/src/main/native/cpp/{PropertyImpl.h => PropertyImpl.hpp}   | 0
 cscore/src/main/native/cpp/{RawSinkImpl.h => RawSinkImpl.hpp}     | 0
 cscore/src/main/native/cpp/{RawSourceImpl.h => RawSourceImpl.hpp} | 0
 cscore/src/main/native/cpp/{SinkImpl.h => SinkImpl.hpp}           | 0
 cscore/src/main/native/cpp/{SourceImpl.h => SourceImpl.hpp}       | 0
 cscore/src/main/native/cpp/{Telemetry.h => Telemetry.hpp}         | 0
 .../{UnlimitedHandleResource.h => UnlimitedHandleResource.hpp}    | 0
 .../native/cpp/{UsbCameraListener.h => UsbCameraListener.hpp}     | 0
 cscore/src/main/native/cpp/{c_util.h => c_util.hpp}               | 0
 .../cpp/{default_init_allocator.h => default_init_allocator.hpp}  | 0
 cscore/src/main/native/include/{ => wpi/cs}/cscore.h              | 0
 cscore/src/main/native/include/{ => wpi/cs}/cscore_c.h            | 0
 .../main/native/include/{cscore_cpp.h => wpi/cs/cscore_cpp.hpp}   | 0
 .../src/main/native/include/{cscore_cv.h => wpi/cs/cscore_cv.hpp} | 0
 .../src/main/native/include/{cscore_oo.h => wpi/cs/cscore_oo.hpp} | 0
 cscore/src/main/native/include/{ => wpi/cs}/cscore_raw.h          | 0
 .../include/{cscore_runloop.h => wpi/cs/cscore_runloop.hpp}       | 0
 .../main/native/linux/{UsbCameraBuffer.h => UsbCameraBuffer.hpp}  | 0
 .../src/main/native/linux/{UsbCameraImpl.h => UsbCameraImpl.hpp}  | 0
 .../native/linux/{UsbCameraProperty.h => UsbCameraProperty.hpp}   | 0
 cscore/src/main/native/linux/{UsbUtil.h => UsbUtil.hpp}           | 0
 .../native/objcpp/{UsbCameraDelegate.h => UsbCameraDelegate.hpp}  | 0
 .../src/main/native/objcpp/{UsbCameraImpl.h => UsbCameraImpl.hpp} | 0
 .../native/objcpp/{UsbCameraImplObjc.h => UsbCameraImplObjc.hpp}  | 0
 .../main/native/objcpp/{UvcControlImpl.h => UvcControlImpl.hpp}   | 0
 cscore/src/main/native/windows/{COMCreators.h => COMCreators.hpp} | 0
 cscore/src/main/native/windows/{ComPtr.h => ComPtr.hpp}           | 0
 .../main/native/windows/{UsbCameraImpl.h => UsbCameraImpl.hpp}    | 0
 .../native/windows/{UsbCameraProperty.h => UsbCameraProperty.hpp} | 0
 .../windows/{WindowsMessagePump.h => WindowsMessagePump.hpp}      | 0
 datalog/src/main/native/cpp/jni/{DataLogJNI.h => DataLogJNI.hpp}  | 0
 .../main/native/include/wpi/datalog/{DataLog.h => DataLog.hpp}    | 0
 .../{DataLogBackgroundWriter.h => DataLogBackgroundWriter.hpp}    | 0
 .../include/wpi/datalog/{DataLogReader.h => DataLogReader.hpp}    | 0
 .../datalog/{DataLogReaderThread.h => DataLogReaderThread.hpp}    | 0
 .../include/wpi/datalog/{DataLogWriter.h => DataLogWriter.hpp}    | 0
 .../native/include/wpi/datalog/{FileLogger.h => FileLogger.hpp}   | 0
 .../{fields/2018-powerup.h => wpi/fields/2018-powerup.hpp}        | 0
 .../{fields/2019-deepspace.h => wpi/fields/2019-deepspace.hpp}    | 0
 .../fields/2020-infiniterecharge.hpp}                             | 0
 .../include/{fields/2021-barrel.h => wpi/fields/2021-barrel.hpp}  | 0
 .../include/{fields/2021-bounce.h => wpi/fields/2021-bounce.hpp}  | 0
 .../fields/2021-galacticsearcha.hpp}                              | 0
 .../fields/2021-galacticsearchb.hpp}                              | 0
 .../fields/2021-infiniterecharge.hpp}                             | 0
 .../include/{fields/2021-slalom.h => wpi/fields/2021-slalom.hpp}  | 0
 .../{fields/2022-rapidreact.h => wpi/fields/2022-rapidreact.hpp}  | 0
 .../{fields/2023-chargedup.h => wpi/fields/2023-chargedup.hpp}    | 0
 .../{fields/2024-crescendo.h => wpi/fields/2024-crescendo.hpp}    | 0
 .../{fields/2025-reefscape.h => wpi/fields/2025-reefscape.hpp}    | 0
 .../native/include/{fields/fields.h => wpi/fields/fields.hpp}     | 0
 glass/src/app/native/cpp/{camerasupport.h => camerasupport.hpp}   | 0
 .../lib/native/include/{glass/Context.h => wpi/glass/Context.hpp} | 0
 .../{glass/ContextInternal.h => wpi/glass/ContextInternal.hpp}    | 0
 .../include/{glass/DataSource.h => wpi/glass/DataSource.hpp}      | 0
 .../include/{glass/MainMenuBar.h => wpi/glass/MainMenuBar.hpp}    | 0
 .../src/lib/native/include/{glass/Model.h => wpi/glass/Model.hpp} | 0
 .../native/include/{glass/Provider.h => wpi/glass/Provider.hpp}   | 0
 .../lib/native/include/{glass/Storage.h => wpi/glass/Storage.hpp} | 0
 glass/src/lib/native/include/{glass/View.h => wpi/glass/View.hpp} | 0
 .../lib/native/include/{glass/Window.h => wpi/glass/Window.hpp}   | 0
 .../{glass/WindowManager.h => wpi/glass/WindowManager.hpp}        | 0
 .../hardware/AnalogInput.h => wpi/glass/hardware/AnalogInput.hpp} | 0
 .../include/{glass/hardware/DIO.h => wpi/glass/hardware/DIO.hpp}  | 0
 .../{glass/hardware/Encoder.h => wpi/glass/hardware/Encoder.hpp}  | 0
 .../{glass/hardware/Gyro.h => wpi/glass/hardware/Gyro.hpp}        | 0
 .../hardware/LEDDisplay.h => wpi/glass/hardware/LEDDisplay.hpp}   | 0
 .../MotorController.h => wpi/glass/hardware/MotorController.hpp}  | 0
 .../include/{glass/hardware/PWM.h => wpi/glass/hardware/PWM.hpp}  | 0
 .../hardware/Pneumatic.h => wpi/glass/hardware/Pneumatic.hpp}     | 0
 .../glass/hardware/PowerDistribution.hpp}                         | 0
 .../{glass/hardware/RoboRio.h => wpi/glass/hardware/RoboRio.hpp}  | 0
 .../include/{glass/other/Alerts.h => wpi/glass/other/Alerts.hpp}  | 0
 .../CommandScheduler.h => wpi/glass/other/CommandScheduler.hpp}   | 0
 .../CommandSelector.h => wpi/glass/other/CommandSelector.hpp}     | 0
 .../{glass/other/DeviceTree.h => wpi/glass/other/DeviceTree.hpp}  | 0
 .../include/{glass/other/Drive.h => wpi/glass/other/Drive.hpp}    | 0
 .../native/include/{glass/other/FMS.h => wpi/glass/other/FMS.hpp} | 0
 .../{glass/other/Field2D.h => wpi/glass/other/Field2D.hpp}        | 0
 .../native/include/{glass/other/Log.h => wpi/glass/other/Log.hpp} | 0
 .../other/Mechanism2D.h => wpi/glass/other/Mechanism2D.hpp}       | 0
 .../other/PIDController.h => wpi/glass/other/PIDController.hpp}   | 0
 .../include/{glass/other/Plot.h => wpi/glass/other/Plot.hpp}      | 0
 .../glass/other/ProfiledPIDController.hpp}                        | 0
 .../other/StringChooser.h => wpi/glass/other/StringChooser.hpp}   | 0
 .../{glass/other/Subsystem.h => wpi/glass/other/Subsystem.hpp}    | 0
 .../support/ColorSetting.h => wpi/glass/support/ColorSetting.hpp} | 0
 .../support/EnumSetting.h => wpi/glass/support/EnumSetting.hpp}   | 0
 .../ExpressionParser.h => wpi/glass/support/ExpressionParser.hpp} | 0
 .../ExtraGuiWidgets.h => wpi/glass/support/ExtraGuiWidgets.hpp}   | 0
 .../support/NameSetting.h => wpi/glass/support/NameSetting.hpp}   | 0
 .../NTAlerts.h => wpi/glass/networktables/NTAlerts.hpp}           | 0
 .../glass/networktables/NTCommandScheduler.hpp}                   | 0
 .../glass/networktables/NTCommandSelector.hpp}                    | 0
 .../glass/networktables/NTDifferentialDrive.hpp}                  | 0
 .../glass/networktables/NTDigitalInput.hpp}                       | 0
 .../glass/networktables/NTDigitalOutput.hpp}                      | 0
 .../networktables/NTFMS.h => wpi/glass/networktables/NTFMS.hpp}   | 0
 .../NTField2D.h => wpi/glass/networktables/NTField2D.hpp}         | 0
 .../networktables/NTGyro.h => wpi/glass/networktables/NTGyro.hpp} | 0
 .../glass/networktables/NTMecanumDrive.hpp}                       | 0
 .../NTMechanism2D.h => wpi/glass/networktables/NTMechanism2D.hpp} | 0
 .../glass/networktables/NTMotorController.hpp}                    | 0
 .../glass/networktables/NTPIDController.hpp}                      | 0
 .../glass/networktables/NTProfiledPIDController.hpp}              | 0
 .../glass/networktables/NTStringChooser.hpp}                      | 0
 .../NTSubsystem.h => wpi/glass/networktables/NTSubsystem.hpp}     | 0
 .../NetworkTables.h => wpi/glass/networktables/NetworkTables.hpp} | 0
 .../glass/networktables/NetworkTablesProvider.hpp}                | 0
 .../glass/networktables/NetworkTablesSettings.hpp}                | 0
 hal/src/main/native/include/{ => wpi}/hal/.clang-tidy             | 0
 hal/src/main/native/include/{ => wpi}/hal/AddressableLED.h        | 0
 hal/src/main/native/include/{ => wpi}/hal/AddressableLEDTypes.h   | 0
 hal/src/main/native/include/{ => wpi}/hal/AnalogInput.h           | 0
 hal/src/main/native/include/{ => wpi}/hal/CAN.h                   | 0
 hal/src/main/native/include/{ => wpi}/hal/CANAPI.h                | 0
 hal/src/main/native/include/{ => wpi}/hal/CANAPITypes.h           | 0
 hal/src/main/native/include/{ => wpi}/hal/CTREPCM.h               | 0
 hal/src/main/native/include/{ => wpi}/hal/Constants.h             | 0
 hal/src/main/native/include/{ => wpi}/hal/Counter.h               | 0
 hal/src/main/native/include/{ => wpi}/hal/DIO.h                   | 0
 hal/src/main/native/include/{ => wpi}/hal/DriverStation.h         | 0
 hal/src/main/native/include/{ => wpi}/hal/DriverStationTypes.h    | 0
 hal/src/main/native/include/{ => wpi}/hal/DutyCycle.h             | 0
 hal/src/main/native/include/{ => wpi}/hal/Encoder.h               | 0
 hal/src/main/native/include/{ => wpi}/hal/Errors.h                | 0
 hal/src/main/native/include/{ => wpi}/hal/Extensions.h            | 0
 hal/src/main/native/include/{ => wpi}/hal/HAL.h                   | 0
 hal/src/main/native/include/{ => wpi}/hal/HALBase.h               | 0
 hal/src/main/native/include/{ => wpi}/hal/I2C.h                   | 0
 hal/src/main/native/include/{ => wpi}/hal/I2CTypes.h              | 0
 hal/src/main/native/include/{ => wpi}/hal/IMU.h                   | 0
 hal/src/main/native/include/{ => wpi}/hal/IMUTypes.h              | 0
 hal/src/main/native/include/{ => wpi}/hal/Main.h                  | 0
 hal/src/main/native/include/{ => wpi}/hal/Notifier.h              | 0
 hal/src/main/native/include/{ => wpi}/hal/PWM.h                   | 0
 hal/src/main/native/include/{ => wpi}/hal/Ports.h                 | 0
 hal/src/main/native/include/{ => wpi}/hal/Power.h                 | 0
 hal/src/main/native/include/{ => wpi}/hal/PowerDistribution.h     | 0
 hal/src/main/native/include/{ => wpi}/hal/REVPH.h                 | 0
 hal/src/main/native/include/{ => wpi}/hal/SerialPort.h            | 0
 hal/src/main/native/include/{ => wpi}/hal/SimDevice.h             | 0
 hal/src/main/native/include/{ => wpi}/hal/SystemServer.h          | 0
 hal/src/main/native/include/{ => wpi}/hal/Threads.h               | 0
 hal/src/main/native/include/{ => wpi}/hal/Types.h                 | 0
 hal/src/main/native/include/{ => wpi}/hal/UsageReporting.h        | 0
 hal/src/main/native/include/{ => wpi}/hal/Value.h                 | 0
 hal/src/main/native/include/{ => wpi}/hal/cpp/fpga_clock.h        | 0
 .../native/include/{ => wpi}/hal/handles/DigitalHandleResource.h  | 0
 .../main/native/include/{ => wpi}/hal/handles/HandlesInternal.h   | 0
 .../include/{ => wpi}/hal/handles/IndexedClassedHandleResource.h  | 0
 .../native/include/{ => wpi}/hal/handles/IndexedHandleResource.h  | 0
 .../include/{ => wpi}/hal/handles/LimitedClassedHandleResource.h  | 0
 .../native/include/{ => wpi}/hal/handles/LimitedHandleResource.h  | 0
 .../include/{ => wpi}/hal/handles/UnlimitedHandleResource.h       | 0
 hal/src/main/native/include/{ => wpi}/hal/proto/ControlData.h     | 0
 hal/src/main/native/include/{ => wpi}/hal/proto/ErrorInfo.h       | 0
 .../main/native/include/{ => wpi}/hal/proto/JoystickDescriptor.h  | 0
 .../main/native/include/{ => wpi}/hal/proto/JoystickRumbleData.h  | 0
 hal/src/main/native/include/{ => wpi}/hal/proto/MatchInfo.h       | 0
 hal/src/main/native/include/{ => wpi}/hal/proto/OpMode.h          | 0
 hal/src/main/native/include/{ => wpi}/hal/proto/VersionInfo.h     | 0
 .../native/include/{ => wpi}/hal/simulation/AddressableLEDData.h  | 0
 .../main/native/include/{ => wpi}/hal/simulation/AnalogInData.h   | 0
 .../main/native/include/{ => wpi}/hal/simulation/CTREPCMData.h    | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/CanData.h    | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/DIOData.h    | 0
 .../main/native/include/{ => wpi}/hal/simulation/DigitalPWMData.h | 0
 .../native/include/{ => wpi}/hal/simulation/DriverStationData.h   | 0
 .../main/native/include/{ => wpi}/hal/simulation/DutyCycleData.h  | 0
 .../main/native/include/{ => wpi}/hal/simulation/EncoderData.h    | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/I2CData.h    | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/MockHooks.h  | 0
 .../main/native/include/{ => wpi}/hal/simulation/NotifierData.h   | 0
 .../main/native/include/{ => wpi}/hal/simulation/NotifyListener.h | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/PWMData.h    | 0
 .../include/{ => wpi}/hal/simulation/PowerDistributionData.h      | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/REVPHData.h  | 0
 hal/src/main/native/include/{ => wpi}/hal/simulation/Reset.h      | 0
 .../main/native/include/{ => wpi}/hal/simulation/RoboRioData.h    | 0
 .../native/include/{ => wpi}/hal/simulation/SimCallbackRegistry.h | 0
 .../main/native/include/{ => wpi}/hal/simulation/SimDataValue.h   | 0
 .../main/native/include/{ => wpi}/hal/simulation/SimDeviceData.h  | 0
 .../BooleanArrayTopic.h => wpi/nt/BooleanArrayTopic.hpp}          | 0
 .../{networktables/BooleanTopic.h => wpi/nt/BooleanTopic.hpp}     | 0
 .../DoubleArrayTopic.h => wpi/nt/DoubleArrayTopic.hpp}            | 0
 .../{networktables/DoubleTopic.h => wpi/nt/DoubleTopic.hpp}       | 0
 .../FloatArrayTopic.h => wpi/nt/FloatArrayTopic.hpp}              | 0
 .../include/{networktables/FloatTopic.h => wpi/nt/FloatTopic.hpp} | 0
 .../IntegerArrayTopic.h => wpi/nt/IntegerArrayTopic.hpp}          | 0
 .../{networktables/IntegerTopic.h => wpi/nt/IntegerTopic.hpp}     | 0
 .../include/{networktables/RawTopic.h => wpi/nt/RawTopic.hpp}     | 0
 .../StringArrayTopic.h => wpi/nt/StringArrayTopic.hpp}            | 0
 .../{networktables/StringTopic.h => wpi/nt/StringTopic.hpp}       | 0
 .../generated/main/native/include/{ => wpi/nt}/ntcore_c_types.h   | 0
 .../include/{ntcore_cpp_types.h => wpi/nt/ntcore_cpp_types.hpp}   | 0
 .../src/main/native/cpp/{ConnectionList.h => ConnectionList.hpp}  | 0
 ntcore/src/main/native/cpp/{Handle.h => Handle.hpp}               | 0
 ntcore/src/main/native/cpp/{HandleMap.h => HandleMap.hpp}         | 0
 .../main/native/cpp/{IConnectionList.h => IConnectionList.hpp}    | 0
 .../main/native/cpp/{IListenerStorage.h => IListenerStorage.hpp}  | 0
 .../src/main/native/cpp/{INetworkClient.h => INetworkClient.hpp}  | 0
 ntcore/src/main/native/cpp/{InstanceImpl.h => InstanceImpl.hpp}   | 0
 .../main/native/cpp/{ListenerStorage.h => ListenerStorage.hpp}    | 0
 ntcore/src/main/native/cpp/{LocalStorage.h => LocalStorage.hpp}   | 0
 ntcore/src/main/native/cpp/{Log.h => Log.hpp}                     | 0
 ntcore/src/main/native/cpp/{LoggerImpl.h => LoggerImpl.hpp}       | 0
 ntcore/src/main/native/cpp/{NetworkClient.h => NetworkClient.hpp} | 0
 ntcore/src/main/native/cpp/{NetworkServer.h => NetworkServer.hpp} | 0
 ntcore/src/main/native/cpp/{PubSubOptions.h => PubSubOptions.hpp} | 0
 .../src/main/native/cpp/{Types_internal.h => Types_internal.hpp}  | 0
 .../native/cpp/{ValueCircularBuffer.h => ValueCircularBuffer.hpp} | 0
 .../src/main/native/cpp/{Value_internal.h => Value_internal.hpp}  | 0
 ntcore/src/main/native/cpp/{VectorSet.h => VectorSet.hpp}         | 0
 .../native/cpp/local/{LocalDataLogger.h => LocalDataLogger.hpp}   | 0
 .../local/{LocalDataLoggerEntry.h => LocalDataLoggerEntry.hpp}    | 0
 ntcore/src/main/native/cpp/local/{LocalEntry.h => LocalEntry.hpp} | 0
 .../main/native/cpp/local/{LocalListener.h => LocalListener.hpp}  | 0
 .../local/{LocalMultiSubscriber.h => LocalMultiSubscriber.hpp}    | 0
 .../native/cpp/local/{LocalPublisher.h => LocalPublisher.hpp}     | 0
 .../native/cpp/local/{LocalStorageImpl.h => LocalStorageImpl.hpp} | 0
 .../native/cpp/local/{LocalSubscriber.h => LocalSubscriber.hpp}   | 0
 ntcore/src/main/native/cpp/local/{LocalTopic.h => LocalTopic.hpp} | 0
 .../main/native/cpp/local/{PubSubConfig.h => PubSubConfig.hpp}    | 0
 ntcore/src/main/native/cpp/net/{ClientImpl.h => ClientImpl.hpp}   | 0
 .../cpp/net/{ClientMessageQueue.h => ClientMessageQueue.hpp}      | 0
 ntcore/src/main/native/cpp/net/{Message.h => Message.hpp}         | 0
 .../main/native/cpp/net/{MessageHandler.h => MessageHandler.hpp}  | 0
 .../native/cpp/net/{NetworkInterface.h => NetworkInterface.hpp}   | 0
 .../cpp/net/{NetworkOutgoingQueue.h => NetworkOutgoingQueue.hpp}  | 0
 ntcore/src/main/native/cpp/net/{NetworkPing.h => NetworkPing.hpp} | 0
 .../cpp/net/{WebSocketConnection.h => WebSocketConnection.hpp}    | 0
 .../main/native/cpp/net/{WireConnection.h => WireConnection.hpp}  | 0
 ntcore/src/main/native/cpp/net/{WireDecoder.h => WireDecoder.hpp} | 0
 ntcore/src/main/native/cpp/net/{WireEncoder.h => WireEncoder.hpp} | 0
 ntcore/src/main/native/cpp/server/{Constants.h => Constants.hpp}  | 0
 ntcore/src/main/native/cpp/server/{Functions.h => Functions.hpp}  | 0
 .../cpp/server/{MessagePackWriter.h => MessagePackWriter.hpp}     | 0
 .../main/native/cpp/server/{ServerClient.h => ServerClient.hpp}   | 0
 .../main/native/cpp/server/{ServerClient4.h => ServerClient4.hpp} | 0
 .../cpp/server/{ServerClient4Base.h => ServerClient4Base.hpp}     | 0
 .../cpp/server/{ServerClientLocal.h => ServerClientLocal.hpp}     | 0
 .../src/main/native/cpp/server/{ServerImpl.h => ServerImpl.hpp}   | 0
 .../native/cpp/server/{ServerPublisher.h => ServerPublisher.hpp}  | 0
 .../main/native/cpp/server/{ServerStorage.h => ServerStorage.hpp} | 0
 .../cpp/server/{ServerSubscriber.h => ServerSubscriber.hpp}       | 0
 .../src/main/native/cpp/server/{ServerTopic.h => ServerTopic.hpp} | 0
 .../{networktables/GenericEntry.h => wpi/nt/GenericEntry.hpp}     | 0
 .../MultiSubscriber.h => wpi/nt/MultiSubscriber.hpp}              | 0
 .../include/{networktables/NTSendable.h => wpi/nt/NTSendable.hpp} | 0
 .../NTSendableBuilder.h => wpi/nt/NTSendableBuilder.hpp}          | 0
 .../{networktables/NetworkTable.h => wpi/nt/NetworkTable.hpp}     | 0
 .../NetworkTableEntry.h => wpi/nt/NetworkTableEntry.hpp}          | 0
 .../NetworkTableInstance.h => wpi/nt/NetworkTableInstance.hpp}    | 0
 .../NetworkTableListener.h => wpi/nt/NetworkTableListener.hpp}    | 0
 .../NetworkTableType.h => wpi/nt/NetworkTableType.hpp}            | 0
 .../NetworkTableValue.h => wpi/nt/NetworkTableValue.hpp}          | 0
 .../{networktables/ProtobufTopic.h => wpi/nt/ProtobufTopic.hpp}   | 0
 .../StructArrayTopic.h => wpi/nt/StructArrayTopic.hpp}            | 0
 .../{networktables/StructTopic.h => wpi/nt/StructTopic.hpp}       | 0
 .../native/include/{networktables/Topic.h => wpi/nt/Topic.hpp}    | 0
 .../include/{networktables/UnitTopic.h => wpi/nt/UnitTopic.hpp}   | 0
 ntcore/src/main/native/include/{ => wpi/nt}/ntcore.h              | 0
 ntcore/src/main/native/include/{ => wpi/nt}/ntcore_c.h            | 0
 .../main/native/include/{ntcore_cpp.h => wpi/nt/ntcore_cpp.hpp}   | 0
 .../main/native/include/{ntcore_test.h => wpi/nt/ntcore_test.hpp} | 0
 .../native/cpp/{MockConnectionList.h => MockConnectionList.hpp}   | 0
 .../native/cpp/{MockListenerStorage.h => MockListenerStorage.hpp} | 0
 ntcore/src/test/native/cpp/{MockLogger.h => MockLogger.hpp}       | 0
 .../cpp/{PubSubOptionsMatcher.h => PubSubOptionsMatcher.hpp}      | 0
 ntcore/src/test/native/cpp/{StorageTest.h => StorageTest.hpp}     | 0
 ntcore/src/test/native/cpp/{TestPrinters.h => TestPrinters.hpp}   | 0
 ntcore/src/test/native/cpp/{ValueMatcher.h => ValueMatcher.hpp}   | 0
 .../net/{MockClientMessageQueue.h => MockClientMessageQueue.hpp}  | 0
 .../cpp/net/{MockMessageHandler.h => MockMessageHandler.hpp}      | 0
 .../cpp/net/{MockNetworkInterface.h => MockNetworkInterface.hpp}  | 0
 .../cpp/net/{MockWireConnection.h => MockWireConnection.hpp}      | 0
 .../include/{frc/romi/OnBoardIO.h => wpi/romi/OnBoardIO.hpp}      | 0
 .../native/include/{frc/romi/RomiGyro.h => wpi/romi/RomiGyro.hpp} | 0
 .../include/{frc/romi/RomiMotor.h => wpi/romi/RomiMotor.hpp}      | 0
 .../halsim/ds_socket/DSCommJoystickPacket.hpp}                    | 0
 .../{DSCommPacket.h => wpi/halsim/ds_socket/DSCommPacket.hpp}     | 0
 .../native/cpp/{AddressableLEDGui.h => AddressableLEDGui.hpp}     | 0
 .../native/cpp/{AnalogInputSimGui.h => AnalogInputSimGui.hpp}     | 0
 .../halsim_gui/src/main/native/cpp/{DIOSimGui.h => DIOSimGui.hpp} | 0
 .../main/native/cpp/{DriverStationGui.h => DriverStationGui.hpp}  | 0
 .../src/main/native/cpp/{EncoderSimGui.h => EncoderSimGui.hpp}    | 0
 .../native/cpp/{NetworkTablesSimGui.h => NetworkTablesSimGui.hpp} | 0
 .../halsim_gui/src/main/native/cpp/{PCMSimGui.h => PCMSimGui.hpp} | 0
 .../halsim_gui/src/main/native/cpp/{PHSimGui.h => PHSimGui.hpp}   | 0
 .../halsim_gui/src/main/native/cpp/{PWMSimGui.h => PWMSimGui.hpp} | 0
 .../{PowerDistributionSimGui.h => PowerDistributionSimGui.hpp}    | 0
 .../src/main/native/cpp/{RoboRioSimGui.h => RoboRioSimGui.hpp}    | 0
 .../halsim_gui/src/main/native/cpp/{TimingGui.h => TimingGui.hpp} | 0
 .../include/{HALDataSource.h => wpi/halsim/gui/HALDataSource.hpp} | 0
 .../include/{HALProvider.h => wpi/halsim/gui/HALProvider.hpp}     | 0
 .../native/include/{HALSimGui.h => wpi/halsim/gui/HALSimGui.hpp}  | 0
 .../include/{HALSimGuiExt.h => wpi/halsim/gui/HALSimGuiExt.hpp}   | 0
 .../include/{SimDeviceGui.h => wpi/halsim/gui/SimDeviceGui.hpp}   | 0
 .../include/{HALSimWS.h => wpi/halsim/ws_client/HALSimWS.hpp}     | 0
 .../{HALSimWSClient.h => wpi/halsim/ws_client/HALSimWSClient.hpp} | 0
 .../halsim/ws_client/HALSimWSClientConnection.hpp}                | 0
 .../halsim/ws_core/HALSimBaseWebSocketConnection.hpp}             | 0
 .../{WSBaseProvider.h => wpi/halsim/ws_core/WSBaseProvider.hpp}   | 0
 .../{WSHalProviders.h => wpi/halsim/ws_core/WSHalProviders.hpp}   | 0
 .../halsim/ws_core/WSProviderContainer.hpp}                       | 0
 .../halsim/ws_core/WSProvider_AddressableLED.hpp}                 | 0
 .../halsim/ws_core/WSProvider_Analog.hpp}                         | 0
 .../{WSProvider_DIO.h => wpi/halsim/ws_core/WSProvider_DIO.hpp}   | 0
 .../halsim/ws_core/WSProvider_DriverStation.hpp}                  | 0
 .../halsim/ws_core/WSProvider_Encoder.hpp}                        | 0
 .../{WSProvider_HAL.h => wpi/halsim/ws_core/WSProvider_HAL.hpp}   | 0
 .../halsim/ws_core/WSProvider_Joystick.hpp}                       | 0
 .../{WSProvider_PCM.h => wpi/halsim/ws_core/WSProvider_PCM.hpp}   | 0
 .../{WSProvider_PWM.h => wpi/halsim/ws_core/WSProvider_PWM.hpp}   | 0
 .../halsim/ws_core/WSProvider_RoboRIO.hpp}                        | 0
 .../halsim/ws_core/WSProvider_SimDevice.hpp}                      | 0
 .../halsim/ws_core/WSProvider_Solenoid.hpp}                       | 0
 .../{WSProvider_dPWM.h => wpi/halsim/ws_core/WSProvider_dPWM.hpp} | 0
 .../halsim/ws_server/HALSimHttpConnection.hpp}                    | 0
 .../{HALSimWSServer.h => wpi/halsim/ws_server/HALSimWSServer.hpp} | 0
 .../include/{HALSimWeb.h => wpi/halsim/ws_server/HALSimWeb.hpp}   | 0
 .../include/{WebServerClientTest.h => WebServerClientTest.hpp}    | 0
 .../native/include/{HALSimXRP.h => wpi/halsim/xrp/HALSimXRP.hpp}  | 0
 .../{HALSimXRPClient.h => wpi/halsim/xrp/HALSimXRPClient.hpp}     | 0
 .../src/main/native/include/{XRP.h => wpi/halsim/xrp/XRP.hpp}     | 0
 tools/datalogtool/src/main/native/cpp/{App.h => App.hpp}          | 0
 .../src/main/native/cpp/{Downloader.h => Downloader.hpp}          | 0
 .../datalogtool/src/main/native/cpp/{Exporter.h => Exporter.hpp}  | 0
 tools/datalogtool/src/main/native/cpp/{Sftp.h => Sftp.hpp}        | 0
 tools/processstarter/src/main/native/linux/{main.h => main.hpp}   | 0
 tools/processstarter/src/main/native/osx/{main.h => main.hpp}     | 0
 tools/processstarter/src/main/native/windows/{main.h => main.hpp} | 0
 .../src/main/native/include/{sysid/Util.h => wpi/sysid/Util.hpp}  | 0
 .../AnalysisManager.h => wpi/sysid/analysis/AnalysisManager.hpp}  | 0
 .../AnalysisType.h => wpi/sysid/analysis/AnalysisType.hpp}        | 0
 .../{sysid/analysis/ArmSim.h => wpi/sysid/analysis/ArmSim.hpp}    | 0
 .../analysis/ElevatorSim.h => wpi/sysid/analysis/ElevatorSim.hpp} | 0
 .../sysid/analysis/FeedbackAnalysis.hpp}                          | 0
 .../sysid/analysis/FeedbackControllerPreset.hpp}                  | 0
 .../sysid/analysis/FeedforwardAnalysis.hpp}                       | 0
 .../FilteringUtils.h => wpi/sysid/analysis/FilteringUtils.hpp}    | 0
 .../include/{sysid/analysis/OLS.h => wpi/sysid/analysis/OLS.hpp}  | 0
 .../SimpleMotorSim.h => wpi/sysid/analysis/SimpleMotorSim.hpp}    | 0
 .../{sysid/analysis/Storage.h => wpi/sysid/analysis/Storage.hpp}  | 0
 .../sysid/analysis/TrackwidthAnalysis.hpp}                        | 0
 .../{sysid/view/Analyzer.h => wpi/sysid/view/Analyzer.hpp}        | 0
 .../view/AnalyzerPlot.h => wpi/sysid/view/AnalyzerPlot.hpp}       | 0
 .../view/DataSelector.h => wpi/sysid/view/DataSelector.hpp}       | 0
 .../{sysid/view/LogLoader.h => wpi/sysid/view/LogLoader.hpp}      | 0
 .../{sysid/view/UILayout.h => wpi/sysid/view/UILayout.hpp}        | 0
 .../native/include/{cameracalibration.h => cameracalibration.hpp} | 0
 .../native/include/{fieldcalibration.h => fieldcalibration.hpp}   | 0
 tools/wpical/src/main/native/include/{fieldmap.h => fieldmap.hpp} | 0
 tools/wpical/src/main/native/include/{fmap.h => fmap.hpp}         | 0
 tools/wpical/src/main/native/include/{tagpose.h => tagpose.hpp}   | 0
 .../wpical/src/test/native/cpp/{path_lookup.h => path_lookup.hpp} | 0
 .../src/main/native/include/{ => wpi/gui}/portable-file-dialogs.h | 0
 wpigui/src/main/native/include/{wpigui.h => wpi/gui/wpigui.hpp}   | 0
 .../include/{wpigui_internal.h => wpi/gui/wpigui_internal.hpp}    | 0
 .../include/{wpigui_openurl.h => wpi/gui/wpigui_openurl.hpp}      | 0
 .../main/native/cpp/{ => driverstation}/PS4Controller.cpp         | 0
 .../main/native/cpp/{ => driverstation}/PS5Controller.cpp         | 0
 .../main/native/cpp/{ => driverstation}/StadiaController.cpp      | 0
 .../main/native/cpp/{ => driverstation}/XboxController.cpp        | 0
 .../main/native/cpp/{motorcontrol => hardware/motor}/Koors40.cpp  | 0
 .../native/cpp/{motorcontrol => hardware/motor}/PWMSparkFlex.cpp  | 0
 .../native/cpp/{motorcontrol => hardware/motor}/PWMSparkMax.cpp   | 0
 .../native/cpp/{motorcontrol => hardware/motor}/PWMTalonFX.cpp    | 0
 .../native/cpp/{motorcontrol => hardware/motor}/PWMTalonSRX.cpp   | 0
 .../main/native/cpp/{motorcontrol => hardware/motor}/PWMVenom.cpp | 0
 .../native/cpp/{motorcontrol => hardware/motor}/PWMVictorSPX.cpp  | 0
 .../main/native/cpp/{motorcontrol => hardware/motor}/Spark.cpp    | 0
 .../native/cpp/{motorcontrol => hardware/motor}/SparkMini.cpp     | 0
 .../main/native/cpp/{motorcontrol => hardware/motor}/Talon.cpp    | 0
 .../main/native/cpp/{motorcontrol => hardware/motor}/VictorSP.cpp | 0
 .../{frc/PS4Controller.h => wpi/driverstation/PS4Controller.hpp}  | 0
 .../{frc/PS5Controller.h => wpi/driverstation/PS5Controller.hpp}  | 0
 .../StadiaController.h => wpi/driverstation/StadiaController.hpp} | 0
 .../XboxController.h => wpi/driverstation/XboxController.hpp}     | 0
 .../motorcontrol/Koors40.h => wpi/hardware/motor/Koors40.hpp}     | 0
 .../PWMSparkFlex.h => wpi/hardware/motor/PWMSparkFlex.hpp}        | 0
 .../PWMSparkMax.h => wpi/hardware/motor/PWMSparkMax.hpp}          | 0
 .../PWMTalonFX.h => wpi/hardware/motor/PWMTalonFX.hpp}            | 0
 .../PWMTalonSRX.h => wpi/hardware/motor/PWMTalonSRX.hpp}          | 0
 .../motorcontrol/PWMVenom.h => wpi/hardware/motor/PWMVenom.hpp}   | 0
 .../PWMVictorSPX.h => wpi/hardware/motor/PWMVictorSPX.hpp}        | 0
 .../{frc/motorcontrol/Spark.h => wpi/hardware/motor/Spark.hpp}    | 0
 .../motorcontrol/SparkMini.h => wpi/hardware/motor/SparkMini.hpp} | 0
 .../{frc/motorcontrol/Talon.h => wpi/hardware/motor/Talon.hpp}    | 0
 .../motorcontrol/VictorSP.h => wpi/hardware/motor/VictorSP.hpp}   | 0
 .../PS4ControllerSim.h => wpi/simulation/PS4ControllerSim.hpp}    | 0
 .../PS5ControllerSim.h => wpi/simulation/PS5ControllerSim.hpp}    | 0
 .../simulation/StadiaControllerSim.hpp}                           | 0
 .../XboxControllerSim.h => wpi/simulation/XboxControllerSim.hpp}  | 0
 wpilibc/src/main/native/cpp/{ => driverstation}/DSControlWord.cpp | 0
 wpilibc/src/main/native/cpp/{ => driverstation}/DriverStation.cpp | 0
 wpilibc/src/main/native/cpp/{ => driverstation}/Gamepad.cpp       | 0
 wpilibc/src/main/native/cpp/{ => driverstation}/GenericHID.cpp    | 0
 wpilibc/src/main/native/cpp/{ => driverstation}/Joystick.cpp      | 0
 .../main/native/cpp/{ => hardware/accelerometer}/ADXL345_I2C.cpp  | 0
 .../cpp/{ => hardware/accelerometer}/AnalogAccelerometer.cpp      | 0
 wpilibc/src/main/native/cpp/{ => hardware/bus}/CAN.cpp            | 0
 wpilibc/src/main/native/cpp/{ => hardware/bus}/I2C.cpp            | 0
 wpilibc/src/main/native/cpp/{ => hardware/bus}/SerialPort.cpp     | 0
 .../src/main/native/cpp/{ => hardware/discrete}/AnalogInput.cpp   | 0
 .../src/main/native/cpp/{ => hardware/discrete}/DigitalInput.cpp  | 0
 .../src/main/native/cpp/{ => hardware/discrete}/DigitalOutput.cpp | 0
 wpilibc/src/main/native/cpp/{ => hardware/discrete}/PWM.cpp       | 0
 wpilibc/src/main/native/cpp/{ => hardware/imu}/OnboardIMU.cpp     | 0
 wpilibc/src/main/native/cpp/{ => hardware/led}/AddressableLED.cpp | 0
 wpilibc/src/main/native/cpp/{ => hardware/led}/LEDPattern.cpp     | 0
 wpilibc/src/main/native/cpp/{ => hardware/motor}/MotorSafety.cpp  | 0
 .../src/main/native/cpp/{ => hardware/pneumatic}/Compressor.cpp   | 0
 .../main/native/cpp/{ => hardware/pneumatic}/DoubleSolenoid.cpp   | 0
 .../src/main/native/cpp/{ => hardware/pneumatic}/PneumaticHub.cpp | 0
 .../main/native/cpp/{ => hardware/pneumatic}/PneumaticsBase.cpp   | 0
 .../cpp/{ => hardware/pneumatic}/PneumaticsControlModule.cpp      | 0
 wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/Solenoid.cpp | 0
 .../main/native/cpp/{ => hardware/power}/PowerDistribution.cpp    | 0
 wpilibc/src/main/native/cpp/{ => hardware/range}/SharpIR.cpp      | 0
 .../src/main/native/cpp/{ => hardware/rotation}/AnalogEncoder.cpp | 0
 .../native/cpp/{ => hardware/rotation}/AnalogPotentiometer.cpp    | 0
 wpilibc/src/main/native/cpp/{ => hardware/rotation}/DutyCycle.cpp | 0
 .../main/native/cpp/{ => hardware/rotation}/DutyCycleEncoder.cpp  | 0
 wpilibc/src/main/native/cpp/{ => hardware/rotation}/Encoder.cpp   | 0
 wpilibc/src/main/native/cpp/{ => opmode}/IterativeRobotBase.cpp   | 0
 wpilibc/src/main/native/cpp/{ => opmode}/RobotState.cpp           | 0
 wpilibc/src/main/native/cpp/{ => opmode}/TimedRobot.cpp           | 0
 wpilibc/src/main/native/cpp/{ => opmode}/TimesliceRobot.cpp       | 0
 wpilibc/src/main/native/cpp/{ => system}/DataLogManager.cpp       | 0
 wpilibc/src/main/native/cpp/{ => system}/Errors.cpp               | 0
 wpilibc/src/main/native/cpp/{ => system}/Filesystem.cpp           | 0
 wpilibc/src/main/native/cpp/{ => system}/Notifier.cpp             | 0
 wpilibc/src/main/native/cpp/{ => system}/Resource.cpp             | 0
 wpilibc/src/main/native/cpp/{ => system}/RobotController.cpp      | 0
 wpilibc/src/main/native/cpp/{ => system}/ScopedTracer.cpp         | 0
 wpilibc/src/main/native/cpp/{ => system}/SystemServer.cpp         | 0
 wpilibc/src/main/native/cpp/{ => system}/Threads.cpp              | 0
 wpilibc/src/main/native/cpp/{ => system}/Timer.cpp                | 0
 wpilibc/src/main/native/cpp/{ => system}/Tracer.cpp               | 0
 wpilibc/src/main/native/cpp/{ => system}/Watchdog.cpp             | 0
 wpilibc/src/main/native/cpp/{ => util}/Alert.cpp                  | 0
 wpilibc/src/main/native/cpp/{ => util}/Preferences.cpp            | 0
 wpilibc/src/main/native/cpp/{ => util}/SensorUtil.cpp             | 0
 .../native/include/{frc/ExpansionHub.h => wpi/ExpansionHub.hpp}   | 0
 .../{frc/ExpansionHubMotor.h => wpi/ExpansionHubMotor.hpp}        | 0
 .../ExpansionHubPidConstants.hpp}                                 | 0
 .../{frc/ExpansionHubServo.h => wpi/ExpansionHubServo.hpp}        | 0
 .../EdgeConfiguration.h => wpi/counter/EdgeConfiguration.hpp}     | 0
 .../{frc/counter/Tachometer.h => wpi/counter/Tachometer.hpp}      | 0
 .../counter/UpDownCounter.h => wpi/counter/UpDownCounter.hpp}     | 0
 .../drive/DifferentialDrive.h => wpi/drive/DifferentialDrive.hpp} | 0
 .../{frc/drive/MecanumDrive.h => wpi/drive/MecanumDrive.hpp}      | 0
 .../{frc/drive/RobotDriveBase.h => wpi/drive/RobotDriveBase.hpp}  | 0
 .../{frc/DSControlWord.h => wpi/driverstation/DSControlWord.hpp}  | 0
 .../{frc/DriverStation.h => wpi/driverstation/DriverStation.hpp}  | 0
 .../include/{frc/Gamepad.h => wpi/driverstation/Gamepad.hpp}      | 0
 .../{frc/GenericHID.h => wpi/driverstation/GenericHID.hpp}        | 0
 .../include/{frc/Joystick.h => wpi/driverstation/Joystick.hpp}    | 0
 .../{frc/event/BooleanEvent.h => wpi/event/BooleanEvent.hpp}      | 0
 .../include/{frc/event/EventLoop.h => wpi/event/EventLoop.hpp}    | 0
 .../NetworkBooleanEvent.h => wpi/event/NetworkBooleanEvent.hpp}   | 0
 .../ADXL345_I2C.h => wpi/hardware/accelerometer/ADXL345_I2C.hpp}  | 0
 .../hardware/accelerometer/AnalogAccelerometer.hpp}               | 0
 .../main/native/include/{frc/CAN.h => wpi/hardware/bus/CAN.hpp}   | 0
 .../main/native/include/{frc/I2C.h => wpi/hardware/bus/I2C.hpp}   | 0
 .../include/{frc/SerialPort.h => wpi/hardware/bus/SerialPort.hpp} | 0
 .../{frc/AnalogInput.h => wpi/hardware/discrete/AnalogInput.hpp}  | 0
 .../{frc/CounterBase.h => wpi/hardware/discrete/CounterBase.hpp}  | 0
 .../DigitalInput.h => wpi/hardware/discrete/DigitalInput.hpp}     | 0
 .../DigitalOutput.h => wpi/hardware/discrete/DigitalOutput.hpp}   | 0
 .../native/include/{frc/PWM.h => wpi/hardware/discrete/PWM.hpp}   | 0
 .../include/{frc/OnboardIMU.h => wpi/hardware/imu/OnboardIMU.hpp} | 0
 .../{frc/AddressableLED.h => wpi/hardware/led/AddressableLED.hpp} | 0
 .../include/{frc/LEDPattern.h => wpi/hardware/led/LEDPattern.hpp} | 0
 .../MotorController.h => wpi/hardware/motor/MotorController.hpp}  | 0
 .../hardware/motor/MotorControllerGroup.hpp}                      | 0
 .../{frc/MotorSafety.h => wpi/hardware/motor/MotorSafety.hpp}     | 0
 .../hardware/motor/PWMMotorController.hpp}                        | 0
 .../{frc/Compressor.h => wpi/hardware/pneumatic/Compressor.hpp}   | 0
 .../hardware/pneumatic/CompressorConfigType.hpp}                  | 0
 .../hardware/pneumatic/DoubleSolenoid.hpp}                        | 0
 .../PneumaticHub.h => wpi/hardware/pneumatic/PneumaticHub.hpp}    | 0
 .../hardware/pneumatic/PneumaticsBase.hpp}                        | 0
 .../hardware/pneumatic/PneumaticsControlModule.hpp}               | 0
 .../hardware/pneumatic/PneumaticsModuleType.hpp}                  | 0
 .../{frc/Solenoid.h => wpi/hardware/pneumatic/Solenoid.hpp}       | 0
 .../hardware/power/PowerDistribution.hpp}                         | 0
 .../include/{frc/SharpIR.h => wpi/hardware/range/SharpIR.hpp}     | 0
 .../AnalogEncoder.h => wpi/hardware/rotation/AnalogEncoder.hpp}   | 0
 .../hardware/rotation/AnalogPotentiometer.hpp}                    | 0
 .../{frc/DutyCycle.h => wpi/hardware/rotation/DutyCycle.hpp}      | 0
 .../hardware/rotation/DutyCycleEncoder.hpp}                       | 0
 .../include/{frc/Encoder.h => wpi/hardware/rotation/Encoder.hpp}  | 0
 .../internal/DriverStationModeThread.hpp}                         | 0
 .../IterativeRobotBase.h => wpi/opmode/IterativeRobotBase.hpp}    | 0
 .../native/include/{frc/RobotBase.h => wpi/opmode/RobotBase.hpp}  | 0
 .../include/{frc/RobotState.h => wpi/opmode/RobotState.hpp}       | 0
 .../include/{frc/TimedRobot.h => wpi/opmode/TimedRobot.hpp}       | 0
 .../{frc/TimesliceRobot.h => wpi/opmode/TimesliceRobot.hpp}       | 0
 .../simulation/ADXL345Sim.h => wpi/simulation/ADXL345Sim.hpp}     | 0
 .../AddressableLEDSim.h => wpi/simulation/AddressableLEDSim.hpp}  | 0
 .../AnalogEncoderSim.h => wpi/simulation/AnalogEncoderSim.hpp}    | 0
 .../AnalogInputSim.h => wpi/simulation/AnalogInputSim.hpp}        | 0
 .../simulation/BatterySim.h => wpi/simulation/BatterySim.hpp}     | 0
 .../simulation/CTREPCMSim.h => wpi/simulation/CTREPCMSim.hpp}     | 0
 .../CallbackStore.h => wpi/simulation/CallbackStore.hpp}          | 0
 .../simulation/DCMotorSim.h => wpi/simulation/DCMotorSim.hpp}     | 0
 .../{frc/simulation/DIOSim.h => wpi/simulation/DIOSim.hpp}        | 0
 .../simulation/DifferentialDrivetrainSim.hpp}                     | 0
 .../DigitalPWMSim.h => wpi/simulation/DigitalPWMSim.hpp}          | 0
 .../DoubleSolenoidSim.h => wpi/simulation/DoubleSolenoidSim.hpp}  | 0
 .../DriverStationSim.h => wpi/simulation/DriverStationSim.hpp}    | 0
 .../simulation/DutyCycleEncoderSim.hpp}                           | 0
 .../simulation/DutyCycleSim.h => wpi/simulation/DutyCycleSim.hpp} | 0
 .../simulation/ElevatorSim.h => wpi/simulation/ElevatorSim.hpp}   | 0
 .../simulation/EncoderSim.h => wpi/simulation/EncoderSim.hpp}     | 0
 .../simulation/FlywheelSim.h => wpi/simulation/FlywheelSim.hpp}   | 0
 .../simulation/GamepadSim.h => wpi/simulation/GamepadSim.hpp}     | 0
 .../GenericHIDSim.h => wpi/simulation/GenericHIDSim.hpp}          | 0
 .../simulation/JoystickSim.h => wpi/simulation/JoystickSim.hpp}   | 0
 .../LinearSystemSim.h => wpi/simulation/LinearSystemSim.hpp}      | 0
 .../simulation/PWMMotorControllerSim.hpp}                         | 0
 .../{frc/simulation/PWMSim.h => wpi/simulation/PWMSim.hpp}        | 0
 .../PneumaticsBaseSim.h => wpi/simulation/PneumaticsBaseSim.hpp}  | 0
 .../simulation/PowerDistributionSim.hpp}                          | 0
 .../{frc/simulation/REVPHSim.h => wpi/simulation/REVPHSim.hpp}    | 0
 .../simulation/RoboRioSim.h => wpi/simulation/RoboRioSim.hpp}     | 0
 .../simulation/SendableChooserSim.hpp}                            | 0
 .../simulation/SharpIRSim.h => wpi/simulation/SharpIRSim.hpp}     | 0
 .../simulation/SimDeviceSim.h => wpi/simulation/SimDeviceSim.hpp} | 0
 .../{frc/simulation/SimHooks.h => wpi/simulation/SimHooks.hpp}    | 0
 .../simulation/SingleJointedArmSim.hpp}                           | 0
 .../simulation/SolenoidSim.h => wpi/simulation/SolenoidSim.hpp}   | 0
 .../smartdashboard/Field2d.h => wpi/smartdashboard/Field2d.hpp}   | 0
 .../FieldObject2d.h => wpi/smartdashboard/FieldObject2d.hpp}      | 0
 .../smartdashboard/ListenerExecutor.hpp}                          | 0
 .../Mechanism2d.h => wpi/smartdashboard/Mechanism2d.hpp}          | 0
 .../smartdashboard/MechanismLigament2d.hpp}                       | 0
 .../smartdashboard/MechanismObject2d.hpp}                         | 0
 .../MechanismRoot2d.h => wpi/smartdashboard/MechanismRoot2d.hpp}  | 0
 .../smartdashboard/SendableBuilderImpl.hpp}                       | 0
 .../SendableChooser.h => wpi/smartdashboard/SendableChooser.hpp}  | 0
 .../smartdashboard/SendableChooserBase.hpp}                       | 0
 .../SmartDashboard.h => wpi/smartdashboard/SmartDashboard.hpp}    | 0
 .../sysid/SysIdRoutineLog.h => wpi/sysid/SysIdRoutineLog.hpp}     | 0
 .../{frc/DataLogManager.h => wpi/system/DataLogManager.hpp}       | 0
 .../main/native/include/{frc/Errors.h => wpi/system/Errors.hpp}   | 0
 .../include/{frc/Filesystem.h => wpi/system/Filesystem.hpp}       | 0
 .../native/include/{frc/Notifier.h => wpi/system/Notifier.hpp}    | 0
 .../native/include/{frc/Resource.h => wpi/system/Resource.hpp}    | 0
 .../{frc/RobotController.h => wpi/system/RobotController.hpp}     | 0
 .../include/{frc/RuntimeType.h => wpi/system/RuntimeType.hpp}     | 0
 .../include/{frc/ScopedTracer.h => wpi/system/ScopedTracer.hpp}   | 0
 .../include/{frc/SystemServer.h => wpi/system/SystemServer.hpp}   | 0
 .../main/native/include/{frc/Threads.h => wpi/system/Threads.hpp} | 0
 .../src/main/native/include/{frc/Timer.h => wpi/system/Timer.hpp} | 0
 .../main/native/include/{frc/Tracer.h => wpi/system/Tracer.hpp}   | 0
 wpilibc/src/main/native/include/{frc => wpi/system}/WPIErrors.mac | 0
 .../include/{WPILibVersion.h => wpi/system/WPILibVersion.hpp}     | 0
 .../src/main/native/include/{frc => wpi/system}/WPIWarnings.mac   | 0
 .../native/include/{frc/Watchdog.h => wpi/system/Watchdog.hpp}    | 0
 .../src/main/native/include/{frc/Alert.h => wpi/util/Alert.hpp}   | 0
 .../main/native/include/{frc/util/Color.h => wpi/util/Color.hpp}  | 0
 .../include/{frc/util/Color8Bit.h => wpi/util/Color8Bit.hpp}      | 0
 .../include/{frc/Preferences.h => wpi/util/Preferences.hpp}       | 0
 .../native/include/{frc/SensorUtil.h => wpi/util/SensorUtil.hpp}  | 0
 .../native/cpp/{JoystickTestMacros.h => JoystickTestMacros.hpp}   | 0
 .../{TestCallbackHelpers.h => TestCallbackHelpers.hpp}            | 0
 .../{MockMotorController.h => MockMotorController.hpp}            | 0
 .../{MockPWMMotorController.h => MockPWMMotorController.hpp}      | 0
 .../command2/{ReplaceMeCommand2.h => ReplaceMeCommand2.hpp}       | 0
 .../emptyclass/{ReplaceMeEmptyClass.h => ReplaceMeEmptyClass.hpp} | 0
 .../{ReplaceMeInstantCommand2.h => ReplaceMeInstantCommand2.hpp}  | 0
 ...MeParallelCommandGroup.h => ReplaceMeParallelCommandGroup.hpp} | 0
 ...ParallelDeadlineGroup.h => ReplaceMeParallelDeadlineGroup.hpp} | 0
 ...eplaceMeParallelRaceGroup.h => ReplaceMeParallelRaceGroup.hpp} | 0
 ...quentialCommandGroup.h => ReplaceMeSequentialCommandGroup.hpp} | 0
 .../subsystem2/{ReplaceMeSubsystem2.h => ReplaceMeSubsystem2.hpp} | 0
 .../cpp/examples/AddressableLED/include/{Robot.h => Robot.hpp}    | 0
 .../examples/ArmSimulation/include/{Constants.h => Constants.hpp} | 0
 .../cpp/examples/ArmSimulation/include/{Robot.h => Robot.hpp}     | 0
 .../examples/ArmSimulation/include/subsystems/{Arm.h => Arm.hpp}  | 0
 .../DifferentialDriveBot/include/{Drivetrain.h => Drivetrain.hpp} | 0
 .../include/{Drivetrain.h => Drivetrain.hpp}                      | 0
 ...obalMeasurementSensor.h => ExampleGlobalMeasurementSensor.hpp} | 0
 .../examples/DigitalCommunication/include/{Robot.h => Robot.hpp}  | 0
 .../DriveDistanceOffboard/include/{Constants.h => Constants.hpp}  | 0
 ...mpleSmartMotorController.h => ExampleSmartMotorController.hpp} | 0
 .../examples/DriveDistanceOffboard/include/{Robot.h => Robot.hpp} | 0
 .../include/{RobotContainer.h => RobotContainer.hpp}              | 0
 .../include/subsystems/{DriveSubsystem.h => DriveSubsystem.hpp}   | 0
 ...mpleSmartMotorController.h => ExampleSmartMotorController.hpp} | 0
 .../include/{Constants.h => Constants.hpp}                        | 0
 .../ElevatorExponentialSimulation/include/{Robot.h => Robot.hpp}  | 0
 .../include/subsystems/{Elevator.h => Elevator.hpp}               | 0
 .../ElevatorSimulation/include/{Constants.h => Constants.hpp}     | 0
 .../examples/ElevatorSimulation/include/{Robot.h => Robot.hpp}    | 0
 .../include/subsystems/{Elevator.h => Elevator.hpp}               | 0
 ...mpleSmartMotorController.h => ExampleSmartMotorController.hpp} | 0
 .../HatchbotInlined/include/{Constants.h => Constants.hpp}        | 0
 .../cpp/examples/HatchbotInlined/include/{Robot.h => Robot.hpp}   | 0
 .../include/{RobotContainer.h => RobotContainer.hpp}              | 0
 .../HatchbotInlined/include/commands/{Autos.h => Autos.hpp}       | 0
 .../include/subsystems/{DriveSubsystem.h => DriveSubsystem.hpp}   | 0
 .../include/subsystems/{HatchSubsystem.h => HatchSubsystem.hpp}   | 0
 .../HatchbotTraditional/include/{Constants.h => Constants.hpp}    | 0
 .../examples/HatchbotTraditional/include/{Robot.h => Robot.hpp}   | 0
 .../include/{RobotContainer.h => RobotContainer.hpp}              | 0
 .../include/commands/{ComplexAuto.h => ComplexAuto.hpp}           | 0
 .../include/commands/{DefaultDrive.h => DefaultDrive.hpp}         | 0
 .../include/commands/{DriveDistance.h => DriveDistance.hpp}       | 0
 .../include/commands/{GrabHatch.h => GrabHatch.hpp}               | 0
 .../include/commands/{HalveDriveSpeed.h => HalveDriveSpeed.hpp}   | 0
 .../include/commands/{ReleaseHatch.h => ReleaseHatch.hpp}         | 0
 .../include/subsystems/{DriveSubsystem.h => DriveSubsystem.hpp}   | 0
 .../include/subsystems/{HatchSubsystem.h => HatchSubsystem.hpp}   | 0
 .../cpp/examples/I2CCommunication/include/{Robot.h => Robot.hpp}  | 0
 .../examples/MecanumBot/include/{Drivetrain.h => Drivetrain.hpp}  | 0
 .../include/{Drivetrain.h => Drivetrain.hpp}                      | 0
 ...obalMeasurementSensor.h => ExampleGlobalMeasurementSensor.hpp} | 0
 .../cpp/examples/PotentiometerPID/include/{Robot.h => Robot.hpp}  | 0
 .../RapidReactCommandBot/include/{Constants.h => Constants.hpp}   | 0
 .../include/{RapidReactCommandBot.h => RapidReactCommandBot.hpp}  | 0
 .../examples/RapidReactCommandBot/include/{Robot.h => Robot.hpp}  | 0
 .../include/subsystems/{Drive.h => Drive.hpp}                     | 0
 .../include/subsystems/{Intake.h => Intake.hpp}                   | 0
 .../include/subsystems/{Pneumatics.h => Pneumatics.hpp}           | 0
 .../include/subsystems/{Shooter.h => Shooter.hpp}                 | 0
 .../include/subsystems/{Storage.h => Storage.hpp}                 | 0
 .../examples/RomiReference/include/{Constants.h => Constants.hpp} | 0
 .../cpp/examples/RomiReference/include/{Robot.h => Robot.hpp}     | 0
 .../include/{RobotContainer.h => RobotContainer.hpp}              | 0
 .../commands/{AutonomousDistance.h => AutonomousDistance.hpp}     | 0
 .../include/commands/{AutonomousTime.h => AutonomousTime.hpp}     | 0
 .../include/commands/{DriveDistance.h => DriveDistance.hpp}       | 0
 .../RomiReference/include/commands/{DriveTime.h => DriveTime.hpp} | 0
 .../commands/{TeleopArcadeDrive.h => TeleopArcadeDrive.hpp}       | 0
 .../include/commands/{TurnDegrees.h => TurnDegrees.hpp}           | 0
 .../RomiReference/include/commands/{TurnTime.h => TurnTime.hpp}   | 0
 .../include/subsystems/{Drivetrain.h => Drivetrain.hpp}           | 0
 .../examples/SelectCommand/include/{Constants.h => Constants.hpp} | 0
 .../cpp/examples/SelectCommand/include/{Robot.h => Robot.hpp}     | 0
 .../include/{RobotContainer.h => RobotContainer.hpp}              | 0
 .../include/{Drivetrain.h => Drivetrain.hpp}                      | 0
 .../src/main/cpp/examples/Solenoid/include/{Robot.h => Robot.hpp} | 0
 .../examples/SwerveBot/include/{Drivetrain.h => Drivetrain.hpp}   | 0
 .../SwerveBot/include/{SwerveModule.h => SwerveModule.hpp}        | 0
 .../include/{Drivetrain.h => Drivetrain.hpp}                      | 0
 ...obalMeasurementSensor.h => ExampleGlobalMeasurementSensor.hpp} | 0
 .../include/{SwerveModule.h => SwerveModule.hpp}                  | 0
 .../examples/SysIdRoutine/include/{Constants.h => Constants.hpp}  | 0
 .../main/cpp/examples/SysIdRoutine/include/{Robot.h => Robot.hpp} | 0
 .../include/{SysIdRoutineBot.h => SysIdRoutineBot.hpp}            | 0
 .../SysIdRoutine/include/subsystems/{Drive.h => Drive.hpp}        | 0
 .../SysIdRoutine/include/subsystems/{Shooter.h => Shooter.hpp}    | 0
 .../cpp/examples/UnitTest/include/{Constants.h => Constants.hpp}  | 0
 .../src/main/cpp/examples/UnitTest/include/{Robot.h => Robot.hpp} | 0
 .../examples/UnitTest/include/subsystems/{Intake.h => Intake.hpp} | 0
 .../examples/XRPReference/include/{Constants.h => Constants.hpp}  | 0
 .../main/cpp/examples/XRPReference/include/{Robot.h => Robot.hpp} | 0
 .../XRPReference/include/{RobotContainer.h => RobotContainer.hpp} | 0
 .../commands/{AutonomousDistance.h => AutonomousDistance.hpp}     | 0
 .../include/commands/{AutonomousTime.h => AutonomousTime.hpp}     | 0
 .../include/commands/{DriveDistance.h => DriveDistance.hpp}       | 0
 .../XRPReference/include/commands/{DriveTime.h => DriveTime.hpp}  | 0
 .../commands/{TeleopArcadeDrive.h => TeleopArcadeDrive.hpp}       | 0
 .../include/commands/{TurnDegrees.h => TurnDegrees.hpp}           | 0
 .../XRPReference/include/commands/{TurnTime.h => TurnTime.hpp}    | 0
 .../examples/XRPReference/include/subsystems/{Arm.h => Arm.hpp}   | 0
 .../include/subsystems/{Drivetrain.h => Drivetrain.hpp}           | 0
 .../templates/commandbased/include/{Constants.h => Constants.hpp} | 0
 .../cpp/templates/commandbased/include/{Robot.h => Robot.hpp}     | 0
 .../commandbased/include/{RobotContainer.h => RobotContainer.hpp} | 0
 .../commandbased/include/commands/{Autos.h => Autos.hpp}          | 0
 .../include/commands/{ExampleCommand.h => ExampleCommand.hpp}     | 0
 .../subsystems/{ExampleSubsystem.h => ExampleSubsystem.hpp}       | 0
 .../templates/commandbasedskeleton/include/{Robot.h => Robot.hpp} | 0
 .../include/{RobotContainer.h => RobotContainer.hpp}              | 0
 .../templates/robotbaseskeleton/include/{Robot.h => Robot.hpp}    | 0
 .../src/main/cpp/templates/timed/include/{Robot.h => Robot.hpp}   | 0
 .../cpp/templates/timedskeleton/include/{Robot.h => Robot.hpp}    | 0
 .../main/cpp/templates/timeslice/include/{Robot.h => Robot.hpp}   | 0
 .../templates/timesliceskeleton/include/{Robot.h => Robot.hpp}    | 0
 wpimath/src/main/native/cpp/jni/{Exceptions.h => Exceptions.hpp}  | 0
 wpimath/src/main/native/cpp/{ => util}/MathShared.cpp             | 0
 wpimath/src/main/native/cpp/{ => util}/StateSpaceUtil.cpp         | 0
 .../ArmFeedforward.h => wpi/math/controller/ArmFeedforward.hpp}   | 0
 .../math/controller/BangBangController.hpp}                       | 0
 .../math/controller/ControlAffinePlantInversionFeedforward.hpp}   | 0
 .../math/controller/DifferentialDriveAccelerationLimiter.hpp}     | 0
 .../math/controller/DifferentialDriveFeedforward.hpp}             | 0
 .../math/controller/DifferentialDriveWheelVoltages.hpp}           | 0
 .../math/controller/ElevatorFeedforward.hpp}                      | 0
 .../math/controller/ImplicitModelFollower.hpp}                    | 0
 .../math/controller/LTVDifferentialDriveController.hpp}           | 0
 .../math/controller/LTVUnicycleController.hpp}                    | 0
 .../math/controller/LinearPlantInversionFeedforward.hpp}          | 0
 .../math/controller/LinearQuadraticRegulator.hpp}                 | 0
 .../PIDController.h => wpi/math/controller/PIDController.hpp}     | 0
 .../math/controller/ProfiledPIDController.hpp}                    | 0
 .../math/controller/SimpleMotorFeedforward.hpp}                   | 0
 .../math/controller/proto/ArmFeedforwardProto.hpp}                | 0
 .../math/controller/proto/DifferentialDriveFeedforwardProto.hpp}  | 0
 .../controller/proto/DifferentialDriveWheelVoltagesProto.hpp}     | 0
 .../math/controller/proto/ElevatorFeedforwardProto.hpp}           | 0
 .../math/controller/proto/SimpleMotorFeedforwardProto.hpp}        | 0
 .../math/controller/struct/ArmFeedforwardStruct.hpp}              | 0
 .../controller/struct/DifferentialDriveFeedforwardStruct.hpp}     | 0
 .../controller/struct/DifferentialDriveWheelVoltagesStruct.hpp}   | 0
 .../math/controller/struct/ElevatorFeedforwardStruct.hpp}         | 0
 .../math/controller/struct/SimpleMotorFeedforwardStruct.hpp}      | 0
 .../AngleStatistics.h => wpi/math/estimator/AngleStatistics.hpp}  | 0
 .../math/estimator/DifferentialDrivePoseEstimator.hpp}            | 0
 .../math/estimator/DifferentialDrivePoseEstimator3d.hpp}          | 0
 .../math/estimator/ExtendedKalmanFilter.hpp}                      | 0
 .../KalmanFilter.h => wpi/math/estimator/KalmanFilter.hpp}        | 0
 .../math/estimator/KalmanFilterLatencyCompensator.hpp}            | 0
 .../math/estimator/MecanumDrivePoseEstimator.hpp}                 | 0
 .../math/estimator/MecanumDrivePoseEstimator3d.hpp}               | 0
 .../math/estimator/MerweScaledSigmaPoints.hpp}                    | 0
 .../{frc/estimator/MerweUKF.h => wpi/math/estimator/MerweUKF.hpp} | 0
 .../PoseEstimator.h => wpi/math/estimator/PoseEstimator.hpp}      | 0
 .../PoseEstimator3d.h => wpi/math/estimator/PoseEstimator3d.hpp}  | 0
 .../S3SigmaPoints.h => wpi/math/estimator/S3SigmaPoints.hpp}      | 0
 .../{frc/estimator/S3UKF.h => wpi/math/estimator/S3UKF.hpp}       | 0
 .../SigmaPoints.h => wpi/math/estimator/SigmaPoints.hpp}          | 0
 .../math/estimator/SteadyStateKalmanFilter.hpp}                   | 0
 .../math/estimator/SwerveDrivePoseEstimator.hpp}                  | 0
 .../math/estimator/SwerveDrivePoseEstimator3d.hpp}                | 0
 .../math/estimator/UnscentedKalmanFilter.hpp}                     | 0
 .../math/estimator/UnscentedTransform.hpp}                        | 0
 .../{frc/filter/Debouncer.h => wpi/math/filter/Debouncer.hpp}     | 0
 .../filter/LinearFilter.h => wpi/math/filter/LinearFilter.hpp}    | 0
 .../filter/MedianFilter.h => wpi/math/filter/MedianFilter.hpp}    | 0
 .../SlewRateLimiter.h => wpi/math/filter/SlewRateLimiter.hpp}     | 0
 .../native/include/{frc/fmt/Eigen.h => wpi/math/fmt/Eigen.hpp}    | 0
 .../CoordinateAxis.h => wpi/math/geometry/CoordinateAxis.hpp}     | 0
 .../CoordinateSystem.h => wpi/math/geometry/CoordinateSystem.hpp} | 0
 .../{frc/geometry/Ellipse2d.h => wpi/math/geometry/Ellipse2d.hpp} | 0
 .../{frc/geometry/Pose2d.h => wpi/math/geometry/Pose2d.hpp}       | 0
 .../{frc/geometry/Pose3d.h => wpi/math/geometry/Pose3d.hpp}       | 0
 .../geometry/Quaternion.h => wpi/math/geometry/Quaternion.hpp}    | 0
 .../geometry/Rectangle2d.h => wpi/math/geometry/Rectangle2d.hpp}  | 0
 .../geometry/Rotation2d.h => wpi/math/geometry/Rotation2d.hpp}    | 0
 .../geometry/Rotation3d.h => wpi/math/geometry/Rotation3d.hpp}    | 0
 .../geometry/Transform2d.h => wpi/math/geometry/Transform2d.hpp}  | 0
 .../geometry/Transform3d.h => wpi/math/geometry/Transform3d.hpp}  | 0
 .../Translation2d.h => wpi/math/geometry/Translation2d.hpp}       | 0
 .../Translation3d.h => wpi/math/geometry/Translation3d.hpp}       | 0
 .../{frc/geometry/Twist2d.h => wpi/math/geometry/Twist2d.hpp}     | 0
 .../{frc/geometry/Twist3d.h => wpi/math/geometry/Twist3d.hpp}     | 0
 .../math/geometry/detail/RotationVectorToMatrix.hpp}              | 0
 .../math/geometry/proto/Ellipse2dProto.hpp}                       | 0
 .../Pose2dProto.h => wpi/math/geometry/proto/Pose2dProto.hpp}     | 0
 .../Pose3dProto.h => wpi/math/geometry/proto/Pose3dProto.hpp}     | 0
 .../math/geometry/proto/QuaternionProto.hpp}                      | 0
 .../math/geometry/proto/Rectangle2dProto.hpp}                     | 0
 .../math/geometry/proto/Rotation2dProto.hpp}                      | 0
 .../math/geometry/proto/Rotation3dProto.hpp}                      | 0
 .../math/geometry/proto/Transform2dProto.hpp}                     | 0
 .../math/geometry/proto/Transform3dProto.hpp}                     | 0
 .../math/geometry/proto/Translation2dProto.hpp}                   | 0
 .../math/geometry/proto/Translation3dProto.hpp}                   | 0
 .../Twist2dProto.h => wpi/math/geometry/proto/Twist2dProto.hpp}   | 0
 .../Twist3dProto.h => wpi/math/geometry/proto/Twist3dProto.hpp}   | 0
 .../math/geometry/struct/Ellipse2dStruct.hpp}                     | 0
 .../Pose2dStruct.h => wpi/math/geometry/struct/Pose2dStruct.hpp}  | 0
 .../Pose3dStruct.h => wpi/math/geometry/struct/Pose3dStruct.hpp}  | 0
 .../math/geometry/struct/QuaternionStruct.hpp}                    | 0
 .../math/geometry/struct/Rectangle2dStruct.hpp}                   | 0
 .../math/geometry/struct/Rotation2dStruct.hpp}                    | 0
 .../math/geometry/struct/Rotation3dStruct.hpp}                    | 0
 .../math/geometry/struct/Transform2dStruct.hpp}                   | 0
 .../math/geometry/struct/Transform3dStruct.hpp}                   | 0
 .../math/geometry/struct/Translation2dStruct.hpp}                 | 0
 .../math/geometry/struct/Translation3dStruct.hpp}                 | 0
 .../math/geometry/struct/Twist2dStruct.hpp}                       | 0
 .../math/geometry/struct/Twist3dStruct.hpp}                       | 0
 .../math/interpolation/TimeInterpolatableBuffer.hpp}              | 0
 .../ChassisSpeeds.h => wpi/math/kinematics/ChassisSpeeds.hpp}     | 0
 .../math/kinematics/DifferentialDriveKinematics.hpp}              | 0
 .../math/kinematics/DifferentialDriveOdometry.hpp}                | 0
 .../math/kinematics/DifferentialDriveOdometry3d.hpp}              | 0
 .../math/kinematics/DifferentialDriveWheelPositions.hpp}          | 0
 .../math/kinematics/DifferentialDriveWheelSpeeds.hpp}             | 0
 .../Kinematics.h => wpi/math/kinematics/Kinematics.hpp}           | 0
 .../math/kinematics/MecanumDriveKinematics.hpp}                   | 0
 .../math/kinematics/MecanumDriveOdometry.hpp}                     | 0
 .../math/kinematics/MecanumDriveOdometry3d.hpp}                   | 0
 .../math/kinematics/MecanumDriveWheelPositions.hpp}               | 0
 .../math/kinematics/MecanumDriveWheelSpeeds.hpp}                  | 0
 .../kinematics/Odometry.h => wpi/math/kinematics/Odometry.hpp}    | 0
 .../Odometry3d.h => wpi/math/kinematics/Odometry3d.hpp}           | 0
 .../math/kinematics/SwerveDriveKinematics.hpp}                    | 0
 .../math/kinematics/SwerveDriveOdometry.hpp}                      | 0
 .../math/kinematics/SwerveDriveOdometry3d.hpp}                    | 0
 .../math/kinematics/SwerveModulePosition.hpp}                     | 0
 .../math/kinematics/SwerveModuleState.hpp}                        | 0
 .../math/kinematics/proto/ChassisSpeedsProto.hpp}                 | 0
 .../math/kinematics/proto/DifferentialDriveKinematicsProto.hpp}   | 0
 .../kinematics/proto/DifferentialDriveWheelPositionsProto.hpp}    | 0
 .../math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp}  | 0
 .../math/kinematics/proto/MecanumDriveKinematicsProto.hpp}        | 0
 .../math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp}    | 0
 .../math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp}       | 0
 .../math/kinematics/proto/SwerveDriveKinematicsProto.hpp}         | 0
 .../math/kinematics/proto/SwerveModulePositionProto.hpp}          | 0
 .../math/kinematics/proto/SwerveModuleStateProto.hpp}             | 0
 .../math/kinematics/struct/ChassisSpeedsStruct.hpp}               | 0
 .../math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp} | 0
 .../kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp}  | 0
 .../kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp}     | 0
 .../math/kinematics/struct/MecanumDriveKinematicsStruct.hpp}      | 0
 .../math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp}  | 0
 .../math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp}     | 0
 .../math/kinematics/struct/SwerveDriveKinematicsStruct.hpp}       | 0
 .../math/kinematics/struct/SwerveModulePositionStruct.hpp}        | 0
 .../math/kinematics/struct/SwerveModuleStateStruct.hpp}           | 0
 .../main/native/include/{frc/DARE.h => wpi/math/linalg/DARE.hpp}  | 0
 .../include/{frc/EigenCore.h => wpi/math/linalg/EigenCore.hpp}    | 0
 .../include/{frc/ct_matrix.h => wpi/math/linalg/ct_matrix.hpp}    | 0
 .../proto/MatrixProto.h => wpi/math/linalg/proto/MatrixProto.hpp} | 0
 .../proto/VectorProto.h => wpi/math/linalg/proto/VectorProto.hpp} | 0
 .../MatrixStruct.h => wpi/math/linalg/struct/StructProto.hpp}     | 0
 .../VectorStruct.h => wpi/math/linalg/struct/VectorStruct.hpp}    | 0
 .../math/optimization/SimulatedAnnealing.hpp}                     | 0
 .../TravelingSalesman.h => wpi/math/path/TravelingSalesman.hpp}   | 0
 .../math/spline/CubicHermiteSpline.hpp}                           | 0
 .../math/spline/QuinticHermiteSpline.hpp}                         | 0
 .../include/{frc/spline/Spline.h => wpi/math/spline/Spline.hpp}   | 0
 .../spline/SplineHelper.h => wpi/math/spline/SplineHelper.hpp}    | 0
 .../math/spline/SplineParameterizer.hpp}                          | 0
 .../math/spline/proto/CubicHermiteSplineProto.hpp}                | 0
 .../math/spline/proto/QuinticHermiteSplineProto.hpp}              | 0
 .../math/spline/struct/CubicHermiteSplineStruct.hpp}              | 0
 .../math/spline/struct/QuinticHermiteSplineStruct.hpp}            | 0
 .../Discretization.h => wpi/math/system/Discretization.hpp}       | 0
 .../system/LinearSystem.h => wpi/math/system/LinearSystem.hpp}    | 0
 .../LinearSystemLoop.h => wpi/math/system/LinearSystemLoop.hpp}   | 0
 .../math/system/NumericalIntegration.hpp}                         | 0
 .../NumericalJacobian.h => wpi/math/system/NumericalJacobian.hpp} | 0
 .../system/plant/DCMotor.h => wpi/math/system/plant/DCMotor.hpp}  | 0
 .../LinearSystemId.h => wpi/math/system/plant/LinearSystemId.hpp} | 0
 .../math/system/plant/proto/DCMotorProto.hpp}                     | 0
 .../math/system/plant/struct/DCMotorStruct.hpp}                   | 0
 .../math/system/proto/LinearSystemProto.hpp}                      | 0
 .../math/system/struct/LinearSystemStruct.hpp}                    | 0
 .../math/trajectory/ExponentialProfile.hpp}                       | 0
 .../Trajectory.h => wpi/math/trajectory/Trajectory.hpp}           | 0
 .../math/trajectory/TrajectoryConfig.hpp}                         | 0
 .../math/trajectory/TrajectoryGenerator.hpp}                      | 0
 .../math/trajectory/TrajectoryParameterizer.hpp}                  | 0
 .../math/trajectory/TrapezoidProfile.hpp}                         | 0
 .../trajectory/constraint/CentripetalAccelerationConstraint.hpp}  | 0
 .../constraint/DifferentialDriveKinematicsConstraint.hpp}         | 0
 .../trajectory/constraint/DifferentialDriveVoltageConstraint.hpp} | 0
 .../math/trajectory/constraint/EllipticalRegionConstraint.hpp}    | 0
 .../math/trajectory/constraint/MaxVelocityConstraint.hpp}         | 0
 .../trajectory/constraint/MecanumDriveKinematicsConstraint.hpp}   | 0
 .../math/trajectory/constraint/RectangularRegionConstraint.hpp}   | 0
 .../trajectory/constraint/SwerveDriveKinematicsConstraint.hpp}    | 0
 .../math/trajectory/constraint/TrajectoryConstraint.hpp}          | 0
 .../math/trajectory/proto/TrajectoryProto.hpp}                    | 0
 .../math/trajectory/proto/TrajectoryStateProto.hpp}               | 0
 .../ComputerVisionUtil.h => wpi/math/util/ComputerVisionUtil.hpp} | 0
 .../{wpimath/MathShared.h => wpi/math/util/MathShared.hpp}        | 0
 .../native/include/{frc/MathUtil.h => wpi/math/util/MathUtil.hpp} | 0
 .../{frc/StateSpaceUtil.h => wpi/math/util/StateSpaceUtil.hpp}    | 0
 .../include/{units/acceleration.h => wpi/units/acceleration.hpp}  | 0
 .../main/native/include/{units/angle.h => wpi/units/angle.hpp}    | 0
 .../angular_acceleration.h => wpi/units/angular_acceleration.hpp} | 0
 .../include/{units/angular_jerk.h => wpi/units/angular_jerk.hpp}  | 0
 .../{units/angular_velocity.h => wpi/units/angular_velocity.hpp}  | 0
 .../src/main/native/include/{units/area.h => wpi/units/area.hpp}  | 0
 .../src/main/native/include/{units/base.h => wpi/units/base.hpp}  | 0
 .../include/{units/capacitance.h => wpi/units/capacitance.hpp}    | 0
 .../main/native/include/{units/charge.h => wpi/units/charge.hpp}  | 0
 .../{units/concentration.h => wpi/units/concentration.hpp}        | 0
 .../include/{units/conductance.h => wpi/units/conductance.hpp}    | 0
 .../native/include/{units/constants.h => wpi/units/constants.hpp} | 0
 .../native/include/{units/current.h => wpi/units/current.hpp}     | 0
 .../native/include/{units/curvature.h => wpi/units/curvature.hpp} | 0
 .../src/main/native/include/{units/data.h => wpi/units/data.hpp}  | 0
 .../data_transfer_rate.h => wpi/units/data_transfer_rate.hpp}     | 0
 .../native/include/{units/density.h => wpi/units/density.hpp}     | 0
 .../{units/dimensionless.h => wpi/units/dimensionless.hpp}        | 0
 .../main/native/include/{units/energy.h => wpi/units/energy.hpp}  | 0
 .../main/native/include/{units/force.h => wpi/units/force.hpp}    | 0
 .../native/include/{units/formatter.h => wpi/units/formatter.hpp} | 0
 .../native/include/{units/frequency.h => wpi/units/frequency.hpp} | 0
 .../include/{units/illuminance.h => wpi/units/illuminance.hpp}    | 0
 .../native/include/{units/impedance.h => wpi/units/impedance.hpp} | 0
 .../include/{units/inductance.h => wpi/units/inductance.hpp}      | 0
 .../main/native/include/{units/length.h => wpi/units/length.hpp}  | 0
 .../{units/luminous_flux.h => wpi/units/luminous_flux.hpp}        | 0
 .../luminous_intensity.h => wpi/units/luminous_intensity.hpp}     | 0
 .../units/magnetic_field_strength.hpp}                            | 0
 .../{units/magnetic_flux.h => wpi/units/magnetic_flux.hpp}        | 0
 .../src/main/native/include/{units/mass.h => wpi/units/mass.hpp}  | 0
 .../src/main/native/include/{units/math.h => wpi/units/math.hpp}  | 0
 .../moment_of_inertia.h => wpi/units/moment_of_inertia.hpp}       | 0
 .../main/native/include/{units/power.h => wpi/units/power.hpp}    | 0
 .../native/include/{units/pressure.h => wpi/units/pressure.hpp}   | 0
 .../native/include/{units/radiation.h => wpi/units/radiation.hpp} | 0
 .../include/{units/solid_angle.h => wpi/units/solid_angle.hpp}    | 0
 .../native/include/{units/substance.h => wpi/units/substance.hpp} | 0
 .../include/{units/temperature.h => wpi/units/temperature.hpp}    | 0
 .../src/main/native/include/{units/time.h => wpi/units/time.hpp}  | 0
 .../main/native/include/{units/torque.h => wpi/units/torque.hpp}  | 0
 .../native/include/{units/velocity.h => wpi/units/velocity.hpp}   | 0
 .../native/include/{units/voltage.h => wpi/units/voltage.hpp}     | 0
 .../main/native/include/{units/volume.h => wpi/units/volume.hpp}  | 0
 .../src/test/native/cpp/{ProtoTestBase.h => ProtoTestBase.hpp}    | 0
 .../src/test/native/cpp/{StructTestBase.h => StructTestBase.hpp}  | 0
 .../TestTrajectory.h => wpi/math/trajectory/TestTrajectory.hpp}   | 0
 .../cpp/{MulticastHandleManager.h => MulticastHandleManager.hpp}  | 0
 .../src/main/native/cpp/{WebSocketDebug.h => WebSocketDebug.hpp}  | 0
 .../native/cpp/{WebSocketSerializer.h => WebSocketSerializer.hpp} | 0
 .../native/include/{wpinet/DsClient.h => wpi/net/DsClient.hpp}    | 0
 .../{wpinet/EventLoopRunner.h => wpi/net/EventLoopRunner.hpp}     | 0
 .../include/{wpinet/HttpParser.h => wpi/net/HttpParser.hpp}       | 0
 .../HttpServerConnection.h => wpi/net/HttpServerConnection.hpp}   | 0
 .../native/include/{wpinet/HttpUtil.h => wpi/net/HttpUtil.hpp}    | 0
 .../net/HttpWebSocketServerConnection.hpp}                        | 0
 .../native/include/{wpinet/MimeTypes.h => wpi/net/MimeTypes.hpp}  | 0
 .../include/{wpinet => wpi/net}/MulticastServiceAnnouncer.h       | 0
 .../native/include/{wpinet => wpi/net}/MulticastServiceResolver.h | 0
 .../{wpinet/NetworkAcceptor.h => wpi/net/NetworkAcceptor.hpp}     | 0
 .../include/{wpinet/NetworkStream.h => wpi/net/NetworkStream.hpp} | 0
 .../ParallelTcpConnector.h => wpi/net/ParallelTcpConnector.hpp}   | 0
 .../include/{wpinet/PortForwarder.h => wpi/net/PortForwarder.hpp} | 0
 .../include/{wpinet/SocketError.h => wpi/net/SocketError.hpp}     | 0
 .../native/include/{wpinet/UDPClient.h => wpi/net/UDPClient.hpp}  | 0
 .../native/include/{wpinet/UrlParser.h => wpi/net/UrlParser.hpp}  | 0
 .../native/include/{wpinet/WebServer.h => wpi/net/WebServer.hpp}  | 0
 .../native/include/{wpinet/WebSocket.h => wpi/net/WebSocket.hpp}  | 0
 .../{wpinet/WebSocketServer.h => wpi/net/WebSocketServer.hpp}     | 0
 .../include/{wpinet/WorkerThread.h => wpi/net/WorkerThread.hpp}   | 0
 .../native/include/{wpinet/hostname.h => wpi/net/hostname.hpp}    | 0
 .../include/{wpinet/http_parser.h => wpi/net/http_parser.hpp}     | 0
 .../raw_socket_istream.h => wpi/net/raw_socket_istream.hpp}       | 0
 .../raw_socket_ostream.h => wpi/net/raw_socket_ostream.hpp}       | 0
 .../{wpinet/raw_uv_ostream.h => wpi/net/raw_uv_ostream.hpp}       | 0
 .../native/include/{wpinet/uv/Async.h => wpi/net/uv/Async.hpp}    | 0
 .../{wpinet/uv/AsyncFunction.h => wpi/net/uv/AsyncFunction.hpp}   | 0
 .../native/include/{wpinet/uv/Buffer.h => wpi/net/uv/Buffer.hpp}  | 0
 .../native/include/{wpinet/uv/Check.h => wpi/net/uv/Check.hpp}    | 0
 .../native/include/{wpinet/uv/Error.h => wpi/net/uv/Error.hpp}    | 0
 .../include/{wpinet/uv/FsEvent.h => wpi/net/uv/FsEvent.hpp}       | 0
 .../{wpinet/uv/GetAddrInfo.h => wpi/net/uv/GetAddrInfo.hpp}       | 0
 .../{wpinet/uv/GetNameInfo.h => wpi/net/uv/GetNameInfo.hpp}       | 0
 .../native/include/{wpinet/uv/Handle.h => wpi/net/uv/Handle.hpp}  | 0
 .../main/native/include/{wpinet/uv/Idle.h => wpi/net/uv/Idle.hpp} | 0
 .../main/native/include/{wpinet/uv/Loop.h => wpi/net/uv/Loop.hpp} | 0
 .../{wpinet/uv/NetworkStream.h => wpi/net/uv/NetworkStream.hpp}   | 0
 .../main/native/include/{wpinet/uv/Pipe.h => wpi/net/uv/Pipe.hpp} | 0
 .../main/native/include/{wpinet/uv/Poll.h => wpi/net/uv/Poll.hpp} | 0
 .../include/{wpinet/uv/Prepare.h => wpi/net/uv/Prepare.hpp}       | 0
 .../include/{wpinet/uv/Process.h => wpi/net/uv/Process.hpp}       | 0
 .../include/{wpinet/uv/Request.h => wpi/net/uv/Request.hpp}       | 0
 .../native/include/{wpinet/uv/Signal.h => wpi/net/uv/Signal.hpp}  | 0
 .../native/include/{wpinet/uv/Stream.h => wpi/net/uv/Stream.hpp}  | 0
 .../main/native/include/{wpinet/uv/Tcp.h => wpi/net/uv/Tcp.hpp}   | 0
 .../native/include/{wpinet/uv/Timer.h => wpi/net/uv/Timer.hpp}    | 0
 .../main/native/include/{wpinet/uv/Tty.h => wpi/net/uv/Tty.hpp}   | 0
 .../main/native/include/{wpinet/uv/Udp.h => wpi/net/uv/Udp.hpp}   | 0
 .../main/native/include/{wpinet/uv/Work.h => wpi/net/uv/Work.hpp} | 0
 .../main/native/include/{wpinet/uv/util.h => wpi/net/uv/util.hpp} | 0
 wpinet/src/main/native/linux/{AvahiClient.h => AvahiClient.hpp}   | 0
 .../main/native/macOS/{ResolverThread.h => ResolverThread.hpp}    | 0
 .../tcpsockets/include/{wpinet => wpi/net}/TCPAcceptor.h          | 0
 .../tcpsockets/include/{wpinet => wpi/net}/TCPConnector.h         | 0
 .../thirdparty/tcpsockets/include/{wpinet => wpi/net}/TCPStream.h | 0
 wpinet/src/main/native/windows/{DynamicDns.h => DynamicDns.hpp}   | 0
 wpinet/src/test/native/cpp/{WebSocketTest.h => WebSocketTest.hpp} | 0
 wpiutil/src/main/native/cpp/jni/{WPIUtilJNI.h => WPIUtilJNI.hpp}  | 0
 .../main/native/include/wpi/{Algorithm.h => util/Algorithm.hpp}   | 0
 wpiutil/src/main/native/include/wpi/{Base64.h => util/Base64.hpp} | 0
 .../include/wpi/{CallbackManager.h => util/CallbackManager.hpp}   | 0
 .../wpi/{DecayedDerivedFrom.h => util/DecayedDerivedFrom.hpp}     | 0
 .../src/main/native/include/wpi/{Demangle.h => util/Demangle.hpp} | 0
 .../native/include/wpi/{EventVector.h => util/EventVector.hpp}    | 0
 .../main/native/include/wpi/{FastQueue.h => util/FastQueue.hpp}   | 0
 wpiutil/src/main/native/include/wpi/{Logger.h => util/Logger.hpp} | 0
 .../include/wpi/{MappedFileRegion.h => util/MappedFileRegion.hpp} | 0
 .../native/include/wpi/{MessagePack.h => util/MessagePack.hpp}    | 0
 .../native/include/wpi/{NullDeleter.h => util/NullDeleter.hpp}    | 0
 wpiutil/src/main/native/include/wpi/{ => util}/RawFrame.h         | 0
 wpiutil/src/main/native/include/wpi/{ => util}/RuntimeCheck.h     | 0
 .../main/native/include/wpi/{SafeThread.h => util/SafeThread.hpp} | 0
 .../main/native/include/wpi/{SpanExtras.h => util/SpanExtras.hpp} | 0
 .../main/native/include/wpi/{StackTrace.h => util/StackTrace.hpp} | 0
 .../main/native/include/wpi/{StringMap.h => util/StringMap.hpp}   | 0
 .../include/wpi/{SymbolExports.h => util/SymbolExports.hpp}       | 0
 wpiutil/src/main/native/include/wpi/{ => util}/Synchronization.h  | 0
 .../main/native/include/wpi/{UidVector.h => util/UidVector.hpp}   | 0
 wpiutil/src/main/native/include/wpi/{array.h => util/array.hpp}   | 0
 .../include/wpi/{circular_buffer.h => util/circular_buffer.hpp}   | 0
 .../wpi/{condition_variable.h => util/condition_variable.hpp}     | 0
 .../main/native/include/wpi/{ct_string.h => util/ct_string.hpp}   | 0
 .../main/native/include/wpi/{deprecated.h => util/deprecated.hpp} | 0
 .../include/wpi/{fmt/raw_ostream.h => util/fmt/raw_ostream.hpp}   | 0
 wpiutil/src/main/native/include/wpi/{fs.h => util/fs.hpp}         | 0
 wpiutil/src/main/native/include/wpi/{future.h => util/future.hpp} | 0
 .../wpi/{interpolating_map.h => util/interpolating_map.hpp}       | 0
 .../src/main/native/include/wpi/{jni_util.h => util/jni_util.hpp} | 0
 wpiutil/src/main/native/include/wpi/{mutex.h => util/mutex.hpp}   | 0
 wpiutil/src/main/native/include/wpi/{ => util}/nodiscard.h        | 0
 wpiutil/src/main/native/include/wpi/{print.h => util/print.hpp}   | 0
 .../include/wpi/{priority_mutex.h => util/priority_mutex.hpp}     | 0
 .../include/wpi/{priority_queue.h => util/priority_queue.hpp}     | 0
 .../wpi/{protobuf/Protobuf.h => util/protobuf/Protobuf.hpp}       | 0
 .../ProtobufCallbacks.h => util/protobuf/ProtobufCallbacks.hpp}   | 0
 .../native/include/wpi/{raw_istream.h => util/raw_istream.hpp}    | 0
 .../native/include/wpi/{rotated_span.h => util/rotated_span.hpp}  | 0
 wpiutil/src/main/native/include/wpi/{ => util}/scope              | 0
 .../wpi/{sendable/Sendable.h => util/sendable/Sendable.hpp}       | 0
 .../SendableBuilder.h => util/sendable/SendableBuilder.hpp}       | 0
 .../SendableHelper.h => util/sendable/SendableHelper.hpp}         | 0
 .../SendableRegistry.h => util/sendable/SendableRegistry.hpp}     | 0
 wpiutil/src/main/native/include/wpi/{sha1.h => util/sha1.hpp}     | 0
 .../src/main/native/include/wpi/{spinlock.h => util/spinlock.hpp} | 0
 .../{static_circular_buffer.h => util/static_circular_buffer.hpp} | 0
 wpiutil/src/main/native/include/wpi/{ => util}/string.h           | 0
 .../wpi/{struct/DynamicStruct.h => util/struct/DynamicStruct.hpp} | 0
 .../wpi/{struct/SchemaParser.h => util/struct/SchemaParser.hpp}   | 0
 .../include/wpi/{struct/Struct.h => util/struct/Struct.hpp}       | 0
 wpiutil/src/main/native/include/wpi/{ => util}/timestamp.h        | 0
 .../argparse/include/wpi/{argparse.h => util/argparse.hpp}        | 0
 .../native/thirdparty/expected/include/wpi/{ => util}/expected    | 0
 .../include/wpi/{adl_serializer.h => util/adl_serializer.hpp}     | 0
 .../byte_container_with_subtype.hpp}                              | 0
 .../wpi/{detail/abi_macros.h => util/detail/abi_macros.hpp}       | 0
 .../from_json.h => util/detail/conversions/from_json.hpp}         | 0
 .../to_chars.h => util/detail/conversions/to_chars.hpp}           | 0
 .../conversions/to_json.h => util/detail/conversions/to_json.hpp} | 0
 .../wpi/{detail/exceptions.h => util/detail/exceptions.hpp}       | 0
 .../json/include/wpi/{detail/hash.h => util/detail/hash.hpp}      | 0
 .../input/binary_reader.h => util/detail/input/binary_reader.hpp} | 0
 .../input_adapters.h => util/detail/input/input_adapters.hpp}     | 0
 .../{detail/input/json_sax.h => util/detail/input/json_sax.hpp}   | 0
 .../wpi/{detail/input/lexer.h => util/detail/input/lexer.hpp}     | 0
 .../wpi/{detail/input/parser.h => util/detail/input/parser.hpp}   | 0
 .../input/position_t.h => util/detail/input/position_t.hpp}       | 0
 .../detail/iterators/internal_iterator.hpp}                       | 0
 .../iterators/iter_impl.h => util/detail/iterators/iter_impl.hpp} | 0
 .../detail/iterators/iteration_proxy.hpp}                         | 0
 .../detail/iterators/iterator_traits.hpp}                         | 0
 .../detail/iterators/json_reverse_iterator.hpp}                   | 0
 .../detail/iterators/primitive_iterator.hpp}                      | 0
 .../detail/json_custom_base_class.hpp}                            | 0
 .../wpi/{detail/json_pointer.h => util/detail/json_pointer.hpp}   | 0
 .../include/wpi/{detail/json_ref.h => util/detail/json_ref.hpp}   | 0
 .../wpi/{detail/macro_scope.h => util/detail/macro_scope.hpp}     | 0
 .../wpi/{detail/macro_unscope.h => util/detail/macro_unscope.hpp} | 0
 .../meta/call_std/begin.h => util/detail/meta/call_std/begin.hpp} | 0
 .../meta/call_std/end.h => util/detail/meta/call_std/end.hpp}     | 0
 .../{detail/meta/cpp_future.h => util/detail/meta/cpp_future.hpp} | 0
 .../wpi/{detail/meta/detected.h => util/detail/meta/detected.hpp} | 0
 .../meta/identity_tag.h => util/detail/meta/identity_tag.hpp}     | 0
 .../wpi/{detail/meta/is_sax.h => util/detail/meta/is_sax.hpp}     | 0
 .../wpi/{detail/meta/std_fs.h => util/detail/meta/std_fs.hpp}     | 0
 .../meta/type_traits.h => util/detail/meta/type_traits.hpp}       | 0
 .../wpi/{detail/meta/void_t.h => util/detail/meta/void_t.hpp}     | 0
 .../binary_writer.h => util/detail/output/binary_writer.hpp}      | 0
 .../output_adapters.h => util/detail/output/output_adapters.hpp}  | 0
 .../output/serializer.h => util/detail/output/serializer.hpp}     | 0
 .../wpi/{detail/string_concat.h => util/detail/string_concat.hpp} | 0
 .../wpi/{detail/string_escape.h => util/detail/string_escape.hpp} | 0
 .../include/wpi/{detail/value_t.h => util/detail/value_t.hpp}     | 0
 .../native/thirdparty/json/include/wpi/{json.h => util/json.hpp}  | 0
 .../thirdparty/json/include/wpi/{json_fwd.h => util/json_fwd.hpp} | 0
 .../json/include/wpi/{ordered_map.h => util/ordered_map.hpp}      | 0
 .../hedley/hedley.h => util/thirdparty/hedley/hedley.hpp}         | 0
 .../hedley_undef.h => util/thirdparty/hedley/hedley_undef.hpp}    | 0
 .../cpp/llvm/Windows/{WindowsSupport.h => WindowsSupport.hpp}     | 0
 .../native/thirdparty/llvm/include/wpi/{ADL.h => util/ADL.hpp}    | 0
 .../thirdparty/llvm/include/wpi/{AlignOf.h => util/AlignOf.hpp}   | 0
 .../llvm/include/wpi/{AllocatorBase.h => util/AllocatorBase.hpp}  | 0
 .../thirdparty/llvm/include/wpi/{Casting.h => util/Casting.hpp}   | 0
 .../thirdparty/llvm/include/wpi/{Chrono.h => util/Chrono.hpp}     | 0
 .../thirdparty/llvm/include/wpi/{Compiler.h => util/Compiler.hpp} | 0
 .../llvm/include/wpi/{ConvertUTF.h => util/ConvertUTF.hpp}        | 0
 .../thirdparty/llvm/include/wpi/{DenseMap.h => util/DenseMap.hpp} | 0
 .../llvm/include/wpi/{DenseMapInfo.h => util/DenseMapInfo.hpp}    | 0
 .../wpi/{DenseMapInfoVariant.h => util/DenseMapInfoVariant.hpp}   | 0
 .../thirdparty/llvm/include/wpi/{Endian.h => util/Endian.hpp}     | 0
 .../llvm/include/wpi/{EpochTracker.h => util/EpochTracker.hpp}    | 0
 .../native/thirdparty/llvm/include/wpi/{Errc.h => util/Errc.hpp}  | 0
 .../thirdparty/llvm/include/wpi/{Errno.h => util/Errno.hpp}       | 0
 .../llvm/include/wpi/{ErrorHandling.h => util/ErrorHandling.hpp}  | 0
 .../include/wpi/{FunctionExtras.h => util/FunctionExtras.hpp}     | 0
 .../llvm/include/wpi/{MathExtras.h => util/MathExtras.hpp}        | 0
 .../thirdparty/llvm/include/wpi/{MemAlloc.h => util/MemAlloc.hpp} | 0
 .../llvm/include/wpi/{MemoryBuffer.h => util/MemoryBuffer.hpp}    | 0
 .../include/wpi/{PointerIntPair.h => util/PointerIntPair.hpp}     | 0
 .../{PointerLikeTypeTraits.h => util/PointerLikeTypeTraits.hpp}   | 0
 .../llvm/include/wpi/{PointerUnion.h => util/PointerUnion.hpp}    | 0
 .../include/wpi/{ReverseIteration.h => util/ReverseIteration.hpp} | 0
 .../include/wpi/{STLForwardCompat.h => util/STLForwardCompat.hpp} | 0
 .../llvm/include/wpi/{SmallPtrSet.h => util/SmallPtrSet.hpp}      | 0
 .../thirdparty/llvm/include/wpi/{SmallSet.h => util/SmallSet.hpp} | 0
 .../llvm/include/wpi/{SmallString.h => util/SmallString.hpp}      | 0
 .../llvm/include/wpi/{SmallVector.h => util/SmallVector.hpp}      | 0
 .../SmallVectorMemoryBuffer.hpp}                                  | 0
 .../llvm/include/wpi/{StringExtras.h => util/StringExtras.hpp}    | 0
 .../llvm/include/wpi/{SwapByteOrder.h => util/SwapByteOrder.hpp}  | 0
 .../llvm/include/wpi/{VersionTuple.h => util/VersionTuple.hpp}    | 0
 .../llvm/include/wpi/{WindowsError.h => util/WindowsError.hpp}    | 0
 .../native/thirdparty/llvm/include/wpi/{bit.h => util/bit.hpp}    | 0
 .../llvm/include/wpi/{function_ref.h => util/function_ref.hpp}    | 0
 .../thirdparty/llvm/include/wpi/{iterator.h => util/iterator.hpp} | 0
 .../include/wpi/{iterator_range.h => util/iterator_range.hpp}     | 0
 .../include/wpi/{raw_os_ostream.h => util/raw_os_ostream.hpp}     | 0
 .../llvm/include/wpi/{raw_ostream.h => util/raw_ostream.hpp}      | 0
 .../llvm/include/wpi/{type_traits.h => util/type_traits.hpp}      | 0
 .../main/native/thirdparty/mpack/include/wpi/{ => util}/mpack.h   | 0
 .../native/thirdparty/sigslot/include/wpi/{ => util}/Signal.h     | 0
 .../native/cpp/llvm/{CountCopyAndMove.h => CountCopyAndMove.hpp}  | 0
 .../native/cpp/proto/{TestProtoInner.h => TestProtoInner.hpp}     | 0
 .../native/include/wpi/{SpanMatcher.h => util/SpanMatcher.hpp}    | 0
 .../native/include/wpi/{TestPrinters.h => util/TestPrinters.hpp}  | 0
 .../native/include/{frc/xrp/XRPGyro.h => wpi/xrp/XRPGyro.hpp}     | 0
 .../native/include/{frc/xrp/XRPMotor.h => wpi/xrp/XRPMotor.hpp}   | 0
 .../include/{frc/xrp/XRPOnBoardIO.h => wpi/xrp/XRPOnBoardIO.hpp}  | 0
 .../{frc/xrp/XRPRangefinder.h => wpi/xrp/XRPRangefinder.hpp}      | 0
 .../XRPReflectanceSensor.h => wpi/xrp/XRPReflectanceSensor.hpp}   | 0
 .../native/include/{frc/xrp/XRPServo.h => wpi/xrp/XRPServo.hpp}   | 0
 1197 files changed, 0 insertions(+), 0 deletions(-)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTag.h => wpi/apriltag/AprilTag.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagDetection.h => wpi/apriltag/AprilTagDetection.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagDetector.h => wpi/apriltag/AprilTagDetector.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagDetector_cv.h => wpi/apriltag/AprilTagDetector_cv.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagFieldLayout.h => wpi/apriltag/AprilTagFieldLayout.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagFields.h => wpi/apriltag/AprilTagFields.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagPoseEstimate.h => wpi/apriltag/AprilTagPoseEstimate.hpp} (100%)
 rename apriltag/src/main/native/include/{frc/apriltag/AprilTagPoseEstimator.h => wpi/apriltag/AprilTagPoseEstimator.hpp} (100%)
 rename cameraserver/src/main/native/include/{cameraserver/CameraServer.h => wpi/cameraserver/CameraServer.hpp} (100%)
 rename cameraserver/src/main/native/include/{cameraserver/CameraServerShared.h => wpi/cameraserver/CameraServerShared.hpp} (100%)
 rename cameraserver/src/main/native/include/{vision/VisionPipeline.h => wpi/vision/VisionPipeline.hpp} (100%)
 rename cameraserver/src/main/native/include/{vision/VisionRunner.h => wpi/vision/VisionRunner.hpp} (100%)
 rename commandsv2/src/generated/main/native/include/{frc2/command/button/CommandPS4Controller.h => wpi/commands2/button/CommandPS4Controller.hpp} (100%)
 rename commandsv2/src/generated/main/native/include/{frc2/command/button/CommandPS5Controller.h => wpi/commands2/button/CommandPS5Controller.hpp} (100%)
 rename commandsv2/src/generated/main/native/include/{frc2/command/button/CommandStadiaController.h => wpi/commands2/button/CommandStadiaController.hpp} (100%)
 rename commandsv2/src/generated/main/native/include/{frc2/command/button/CommandXboxController.h => wpi/commands2/button/CommandXboxController.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/Command.h => wpi/commands2/Command.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/CommandHelper.h => wpi/commands2/CommandHelper.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/CommandPtr.h => wpi/commands2/CommandPtr.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/CommandScheduler.h => wpi/commands2/CommandScheduler.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/Commands.h => wpi/commands2/Commands.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/ConditionalCommand.h => wpi/commands2/ConditionalCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/DeferredCommand.h => wpi/commands2/DeferredCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/FunctionalCommand.h => wpi/commands2/FunctionalCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/InstantCommand.h => wpi/commands2/InstantCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/NotifierCommand.h => wpi/commands2/NotifierCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/ParallelCommandGroup.h => wpi/commands2/ParallelCommandGroup.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/ParallelDeadlineGroup.h => wpi/commands2/ParallelDeadlineGroup.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/ParallelRaceGroup.h => wpi/commands2/ParallelRaceGroup.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/PrintCommand.h => wpi/commands2/PrintCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/ProxyCommand.h => wpi/commands2/ProxyCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/RepeatCommand.h => wpi/commands2/RepeatCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/Requirements.h => wpi/commands2/Requirements.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/RunCommand.h => wpi/commands2/RunCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/ScheduleCommand.h => wpi/commands2/ScheduleCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/SelectCommand.h => wpi/commands2/SelectCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/SequentialCommandGroup.h => wpi/commands2/SequentialCommandGroup.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/StartEndCommand.h => wpi/commands2/StartEndCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/Subsystem.h => wpi/commands2/Subsystem.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/SubsystemBase.h => wpi/commands2/SubsystemBase.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/WaitCommand.h => wpi/commands2/WaitCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/WaitUntilCommand.h => wpi/commands2/WaitUntilCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/WrapperCommand.h => wpi/commands2/WrapperCommand.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/CommandGamepad.h => wpi/commands2/button/CommandGamepad.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/CommandGenericHID.h => wpi/commands2/button/CommandGenericHID.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/CommandJoystick.h => wpi/commands2/button/CommandJoystick.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/JoystickButton.h => wpi/commands2/button/JoystickButton.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/NetworkButton.h => wpi/commands2/button/NetworkButton.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/POVButton.h => wpi/commands2/button/POVButton.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/RobotModeTriggers.h => wpi/commands2/button/RobotModeTriggers.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/button/Trigger.h => wpi/commands2/button/Trigger.hpp} (100%)
 rename commandsv2/src/main/native/include/{frc2/command/sysid/SysIdRoutine.h => wpi/commands2/sysid/SysIdRoutine.hpp} (100%)
 rename commandsv2/src/test/native/cpp/frc2/command/{CommandTestBase.h => CommandTestBase.hpp} (100%)
 rename commandsv2/src/test/native/cpp/frc2/command/{CompositionTestBase.h => CompositionTestBase.hpp} (100%)
 rename commandsv2/src/test/native/cpp/frc2/command/{make_vector.h => make_vector.hpp} (100%)
 rename cscore/src/main/native/cpp/{ConfigurableSourceImpl.h => ConfigurableSourceImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{Frame.h => Frame.hpp} (100%)
 rename cscore/src/main/native/cpp/{Handle.h => Handle.hpp} (100%)
 rename cscore/src/main/native/cpp/{HttpCameraImpl.h => HttpCameraImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{Image.h => Image.hpp} (100%)
 rename cscore/src/main/native/cpp/{Instance.h => Instance.hpp} (100%)
 rename cscore/src/main/native/cpp/{JpegUtil.h => JpegUtil.hpp} (100%)
 rename cscore/src/main/native/cpp/{Log.h => Log.hpp} (100%)
 rename cscore/src/main/native/cpp/{MjpegServerImpl.h => MjpegServerImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{NetworkListener.h => NetworkListener.hpp} (100%)
 rename cscore/src/main/native/cpp/{Notifier.h => Notifier.hpp} (100%)
 rename cscore/src/main/native/cpp/{PropertyContainer.h => PropertyContainer.hpp} (100%)
 rename cscore/src/main/native/cpp/{PropertyImpl.h => PropertyImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{RawSinkImpl.h => RawSinkImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{RawSourceImpl.h => RawSourceImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{SinkImpl.h => SinkImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{SourceImpl.h => SourceImpl.hpp} (100%)
 rename cscore/src/main/native/cpp/{Telemetry.h => Telemetry.hpp} (100%)
 rename cscore/src/main/native/cpp/{UnlimitedHandleResource.h => UnlimitedHandleResource.hpp} (100%)
 rename cscore/src/main/native/cpp/{UsbCameraListener.h => UsbCameraListener.hpp} (100%)
 rename cscore/src/main/native/cpp/{c_util.h => c_util.hpp} (100%)
 rename cscore/src/main/native/cpp/{default_init_allocator.h => default_init_allocator.hpp} (100%)
 rename cscore/src/main/native/include/{ => wpi/cs}/cscore.h (100%)
 rename cscore/src/main/native/include/{ => wpi/cs}/cscore_c.h (100%)
 rename cscore/src/main/native/include/{cscore_cpp.h => wpi/cs/cscore_cpp.hpp} (100%)
 rename cscore/src/main/native/include/{cscore_cv.h => wpi/cs/cscore_cv.hpp} (100%)
 rename cscore/src/main/native/include/{cscore_oo.h => wpi/cs/cscore_oo.hpp} (100%)
 rename cscore/src/main/native/include/{ => wpi/cs}/cscore_raw.h (100%)
 rename cscore/src/main/native/include/{cscore_runloop.h => wpi/cs/cscore_runloop.hpp} (100%)
 rename cscore/src/main/native/linux/{UsbCameraBuffer.h => UsbCameraBuffer.hpp} (100%)
 rename cscore/src/main/native/linux/{UsbCameraImpl.h => UsbCameraImpl.hpp} (100%)
 rename cscore/src/main/native/linux/{UsbCameraProperty.h => UsbCameraProperty.hpp} (100%)
 rename cscore/src/main/native/linux/{UsbUtil.h => UsbUtil.hpp} (100%)
 rename cscore/src/main/native/objcpp/{UsbCameraDelegate.h => UsbCameraDelegate.hpp} (100%)
 rename cscore/src/main/native/objcpp/{UsbCameraImpl.h => UsbCameraImpl.hpp} (100%)
 rename cscore/src/main/native/objcpp/{UsbCameraImplObjc.h => UsbCameraImplObjc.hpp} (100%)
 rename cscore/src/main/native/objcpp/{UvcControlImpl.h => UvcControlImpl.hpp} (100%)
 rename cscore/src/main/native/windows/{COMCreators.h => COMCreators.hpp} (100%)
 rename cscore/src/main/native/windows/{ComPtr.h => ComPtr.hpp} (100%)
 rename cscore/src/main/native/windows/{UsbCameraImpl.h => UsbCameraImpl.hpp} (100%)
 rename cscore/src/main/native/windows/{UsbCameraProperty.h => UsbCameraProperty.hpp} (100%)
 rename cscore/src/main/native/windows/{WindowsMessagePump.h => WindowsMessagePump.hpp} (100%)
 rename datalog/src/main/native/cpp/jni/{DataLogJNI.h => DataLogJNI.hpp} (100%)
 rename datalog/src/main/native/include/wpi/datalog/{DataLog.h => DataLog.hpp} (100%)
 rename datalog/src/main/native/include/wpi/datalog/{DataLogBackgroundWriter.h => DataLogBackgroundWriter.hpp} (100%)
 rename datalog/src/main/native/include/wpi/datalog/{DataLogReader.h => DataLogReader.hpp} (100%)
 rename datalog/src/main/native/include/wpi/datalog/{DataLogReaderThread.h => DataLogReaderThread.hpp} (100%)
 rename datalog/src/main/native/include/wpi/datalog/{DataLogWriter.h => DataLogWriter.hpp} (100%)
 rename datalog/src/main/native/include/wpi/datalog/{FileLogger.h => FileLogger.hpp} (100%)
 rename fields/src/main/native/include/{fields/2018-powerup.h => wpi/fields/2018-powerup.hpp} (100%)
 rename fields/src/main/native/include/{fields/2019-deepspace.h => wpi/fields/2019-deepspace.hpp} (100%)
 rename fields/src/main/native/include/{fields/2020-infiniterecharge.h => wpi/fields/2020-infiniterecharge.hpp} (100%)
 rename fields/src/main/native/include/{fields/2021-barrel.h => wpi/fields/2021-barrel.hpp} (100%)
 rename fields/src/main/native/include/{fields/2021-bounce.h => wpi/fields/2021-bounce.hpp} (100%)
 rename fields/src/main/native/include/{fields/2021-galacticsearcha.h => wpi/fields/2021-galacticsearcha.hpp} (100%)
 rename fields/src/main/native/include/{fields/2021-galacticsearchb.h => wpi/fields/2021-galacticsearchb.hpp} (100%)
 rename fields/src/main/native/include/{fields/2021-infiniterecharge.h => wpi/fields/2021-infiniterecharge.hpp} (100%)
 rename fields/src/main/native/include/{fields/2021-slalom.h => wpi/fields/2021-slalom.hpp} (100%)
 rename fields/src/main/native/include/{fields/2022-rapidreact.h => wpi/fields/2022-rapidreact.hpp} (100%)
 rename fields/src/main/native/include/{fields/2023-chargedup.h => wpi/fields/2023-chargedup.hpp} (100%)
 rename fields/src/main/native/include/{fields/2024-crescendo.h => wpi/fields/2024-crescendo.hpp} (100%)
 rename fields/src/main/native/include/{fields/2025-reefscape.h => wpi/fields/2025-reefscape.hpp} (100%)
 rename fields/src/main/native/include/{fields/fields.h => wpi/fields/fields.hpp} (100%)
 rename glass/src/app/native/cpp/{camerasupport.h => camerasupport.hpp} (100%)
 rename glass/src/lib/native/include/{glass/Context.h => wpi/glass/Context.hpp} (100%)
 rename glass/src/lib/native/include/{glass/ContextInternal.h => wpi/glass/ContextInternal.hpp} (100%)
 rename glass/src/lib/native/include/{glass/DataSource.h => wpi/glass/DataSource.hpp} (100%)
 rename glass/src/lib/native/include/{glass/MainMenuBar.h => wpi/glass/MainMenuBar.hpp} (100%)
 rename glass/src/lib/native/include/{glass/Model.h => wpi/glass/Model.hpp} (100%)
 rename glass/src/lib/native/include/{glass/Provider.h => wpi/glass/Provider.hpp} (100%)
 rename glass/src/lib/native/include/{glass/Storage.h => wpi/glass/Storage.hpp} (100%)
 rename glass/src/lib/native/include/{glass/View.h => wpi/glass/View.hpp} (100%)
 rename glass/src/lib/native/include/{glass/Window.h => wpi/glass/Window.hpp} (100%)
 rename glass/src/lib/native/include/{glass/WindowManager.h => wpi/glass/WindowManager.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/AnalogInput.h => wpi/glass/hardware/AnalogInput.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/DIO.h => wpi/glass/hardware/DIO.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/Encoder.h => wpi/glass/hardware/Encoder.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/Gyro.h => wpi/glass/hardware/Gyro.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/LEDDisplay.h => wpi/glass/hardware/LEDDisplay.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/MotorController.h => wpi/glass/hardware/MotorController.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/PWM.h => wpi/glass/hardware/PWM.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/Pneumatic.h => wpi/glass/hardware/Pneumatic.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/PowerDistribution.h => wpi/glass/hardware/PowerDistribution.hpp} (100%)
 rename glass/src/lib/native/include/{glass/hardware/RoboRio.h => wpi/glass/hardware/RoboRio.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Alerts.h => wpi/glass/other/Alerts.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/CommandScheduler.h => wpi/glass/other/CommandScheduler.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/CommandSelector.h => wpi/glass/other/CommandSelector.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/DeviceTree.h => wpi/glass/other/DeviceTree.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Drive.h => wpi/glass/other/Drive.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/FMS.h => wpi/glass/other/FMS.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Field2D.h => wpi/glass/other/Field2D.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Log.h => wpi/glass/other/Log.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Mechanism2D.h => wpi/glass/other/Mechanism2D.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/PIDController.h => wpi/glass/other/PIDController.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Plot.h => wpi/glass/other/Plot.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/ProfiledPIDController.h => wpi/glass/other/ProfiledPIDController.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/StringChooser.h => wpi/glass/other/StringChooser.hpp} (100%)
 rename glass/src/lib/native/include/{glass/other/Subsystem.h => wpi/glass/other/Subsystem.hpp} (100%)
 rename glass/src/lib/native/include/{glass/support/ColorSetting.h => wpi/glass/support/ColorSetting.hpp} (100%)
 rename glass/src/lib/native/include/{glass/support/EnumSetting.h => wpi/glass/support/EnumSetting.hpp} (100%)
 rename glass/src/lib/native/include/{glass/support/ExpressionParser.h => wpi/glass/support/ExpressionParser.hpp} (100%)
 rename glass/src/lib/native/include/{glass/support/ExtraGuiWidgets.h => wpi/glass/support/ExtraGuiWidgets.hpp} (100%)
 rename glass/src/lib/native/include/{glass/support/NameSetting.h => wpi/glass/support/NameSetting.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTAlerts.h => wpi/glass/networktables/NTAlerts.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTCommandScheduler.h => wpi/glass/networktables/NTCommandScheduler.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTCommandSelector.h => wpi/glass/networktables/NTCommandSelector.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTDifferentialDrive.h => wpi/glass/networktables/NTDifferentialDrive.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTDigitalInput.h => wpi/glass/networktables/NTDigitalInput.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTDigitalOutput.h => wpi/glass/networktables/NTDigitalOutput.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTFMS.h => wpi/glass/networktables/NTFMS.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTField2D.h => wpi/glass/networktables/NTField2D.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTGyro.h => wpi/glass/networktables/NTGyro.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTMecanumDrive.h => wpi/glass/networktables/NTMecanumDrive.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTMechanism2D.h => wpi/glass/networktables/NTMechanism2D.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTMotorController.h => wpi/glass/networktables/NTMotorController.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTPIDController.h => wpi/glass/networktables/NTPIDController.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTProfiledPIDController.h => wpi/glass/networktables/NTProfiledPIDController.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTStringChooser.h => wpi/glass/networktables/NTStringChooser.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NTSubsystem.h => wpi/glass/networktables/NTSubsystem.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NetworkTables.h => wpi/glass/networktables/NetworkTables.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NetworkTablesProvider.h => wpi/glass/networktables/NetworkTablesProvider.hpp} (100%)
 rename glass/src/libnt/native/include/{glass/networktables/NetworkTablesSettings.h => wpi/glass/networktables/NetworkTablesSettings.hpp} (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/.clang-tidy (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/AddressableLED.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/AddressableLEDTypes.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/AnalogInput.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/CAN.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/CANAPI.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/CANAPITypes.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/CTREPCM.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Constants.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Counter.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/DIO.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/DriverStation.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/DriverStationTypes.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/DutyCycle.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Encoder.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Errors.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Extensions.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/HAL.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/HALBase.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/I2C.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/I2CTypes.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/IMU.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/IMUTypes.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Main.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Notifier.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/PWM.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Ports.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Power.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/PowerDistribution.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/REVPH.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/SerialPort.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/SimDevice.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/SystemServer.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Threads.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Types.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/UsageReporting.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/Value.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/cpp/fpga_clock.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/DigitalHandleResource.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/HandlesInternal.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/IndexedClassedHandleResource.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/IndexedHandleResource.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/LimitedClassedHandleResource.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/LimitedHandleResource.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/handles/UnlimitedHandleResource.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/ControlData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/ErrorInfo.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/JoystickDescriptor.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/JoystickRumbleData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/MatchInfo.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/OpMode.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/proto/VersionInfo.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/AddressableLEDData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/AnalogInData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/CTREPCMData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/CanData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/DIOData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/DigitalPWMData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/DriverStationData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/DutyCycleData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/EncoderData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/I2CData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/MockHooks.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/NotifierData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/NotifyListener.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/PWMData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/PowerDistributionData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/REVPHData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/Reset.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/RoboRioData.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/SimCallbackRegistry.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/SimDataValue.h (100%)
 rename hal/src/main/native/include/{ => wpi}/hal/simulation/SimDeviceData.h (100%)
 rename ntcore/src/generated/main/native/include/{networktables/BooleanArrayTopic.h => wpi/nt/BooleanArrayTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/BooleanTopic.h => wpi/nt/BooleanTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/DoubleArrayTopic.h => wpi/nt/DoubleArrayTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/DoubleTopic.h => wpi/nt/DoubleTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/FloatArrayTopic.h => wpi/nt/FloatArrayTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/FloatTopic.h => wpi/nt/FloatTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/IntegerArrayTopic.h => wpi/nt/IntegerArrayTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/IntegerTopic.h => wpi/nt/IntegerTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/RawTopic.h => wpi/nt/RawTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/StringArrayTopic.h => wpi/nt/StringArrayTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{networktables/StringTopic.h => wpi/nt/StringTopic.hpp} (100%)
 rename ntcore/src/generated/main/native/include/{ => wpi/nt}/ntcore_c_types.h (100%)
 rename ntcore/src/generated/main/native/include/{ntcore_cpp_types.h => wpi/nt/ntcore_cpp_types.hpp} (100%)
 rename ntcore/src/main/native/cpp/{ConnectionList.h => ConnectionList.hpp} (100%)
 rename ntcore/src/main/native/cpp/{Handle.h => Handle.hpp} (100%)
 rename ntcore/src/main/native/cpp/{HandleMap.h => HandleMap.hpp} (100%)
 rename ntcore/src/main/native/cpp/{IConnectionList.h => IConnectionList.hpp} (100%)
 rename ntcore/src/main/native/cpp/{IListenerStorage.h => IListenerStorage.hpp} (100%)
 rename ntcore/src/main/native/cpp/{INetworkClient.h => INetworkClient.hpp} (100%)
 rename ntcore/src/main/native/cpp/{InstanceImpl.h => InstanceImpl.hpp} (100%)
 rename ntcore/src/main/native/cpp/{ListenerStorage.h => ListenerStorage.hpp} (100%)
 rename ntcore/src/main/native/cpp/{LocalStorage.h => LocalStorage.hpp} (100%)
 rename ntcore/src/main/native/cpp/{Log.h => Log.hpp} (100%)
 rename ntcore/src/main/native/cpp/{LoggerImpl.h => LoggerImpl.hpp} (100%)
 rename ntcore/src/main/native/cpp/{NetworkClient.h => NetworkClient.hpp} (100%)
 rename ntcore/src/main/native/cpp/{NetworkServer.h => NetworkServer.hpp} (100%)
 rename ntcore/src/main/native/cpp/{PubSubOptions.h => PubSubOptions.hpp} (100%)
 rename ntcore/src/main/native/cpp/{Types_internal.h => Types_internal.hpp} (100%)
 rename ntcore/src/main/native/cpp/{ValueCircularBuffer.h => ValueCircularBuffer.hpp} (100%)
 rename ntcore/src/main/native/cpp/{Value_internal.h => Value_internal.hpp} (100%)
 rename ntcore/src/main/native/cpp/{VectorSet.h => VectorSet.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalDataLogger.h => LocalDataLogger.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalDataLoggerEntry.h => LocalDataLoggerEntry.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalEntry.h => LocalEntry.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalListener.h => LocalListener.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalMultiSubscriber.h => LocalMultiSubscriber.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalPublisher.h => LocalPublisher.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalStorageImpl.h => LocalStorageImpl.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalSubscriber.h => LocalSubscriber.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{LocalTopic.h => LocalTopic.hpp} (100%)
 rename ntcore/src/main/native/cpp/local/{PubSubConfig.h => PubSubConfig.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{ClientImpl.h => ClientImpl.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{ClientMessageQueue.h => ClientMessageQueue.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{Message.h => Message.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{MessageHandler.h => MessageHandler.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{NetworkInterface.h => NetworkInterface.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{NetworkOutgoingQueue.h => NetworkOutgoingQueue.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{NetworkPing.h => NetworkPing.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{WebSocketConnection.h => WebSocketConnection.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{WireConnection.h => WireConnection.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{WireDecoder.h => WireDecoder.hpp} (100%)
 rename ntcore/src/main/native/cpp/net/{WireEncoder.h => WireEncoder.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{Constants.h => Constants.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{Functions.h => Functions.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{MessagePackWriter.h => MessagePackWriter.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerClient.h => ServerClient.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerClient4.h => ServerClient4.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerClient4Base.h => ServerClient4Base.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerClientLocal.h => ServerClientLocal.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerImpl.h => ServerImpl.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerPublisher.h => ServerPublisher.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerStorage.h => ServerStorage.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerSubscriber.h => ServerSubscriber.hpp} (100%)
 rename ntcore/src/main/native/cpp/server/{ServerTopic.h => ServerTopic.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/GenericEntry.h => wpi/nt/GenericEntry.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/MultiSubscriber.h => wpi/nt/MultiSubscriber.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NTSendable.h => wpi/nt/NTSendable.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NTSendableBuilder.h => wpi/nt/NTSendableBuilder.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NetworkTable.h => wpi/nt/NetworkTable.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NetworkTableEntry.h => wpi/nt/NetworkTableEntry.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NetworkTableInstance.h => wpi/nt/NetworkTableInstance.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NetworkTableListener.h => wpi/nt/NetworkTableListener.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NetworkTableType.h => wpi/nt/NetworkTableType.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/NetworkTableValue.h => wpi/nt/NetworkTableValue.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/ProtobufTopic.h => wpi/nt/ProtobufTopic.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/StructArrayTopic.h => wpi/nt/StructArrayTopic.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/StructTopic.h => wpi/nt/StructTopic.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/Topic.h => wpi/nt/Topic.hpp} (100%)
 rename ntcore/src/main/native/include/{networktables/UnitTopic.h => wpi/nt/UnitTopic.hpp} (100%)
 rename ntcore/src/main/native/include/{ => wpi/nt}/ntcore.h (100%)
 rename ntcore/src/main/native/include/{ => wpi/nt}/ntcore_c.h (100%)
 rename ntcore/src/main/native/include/{ntcore_cpp.h => wpi/nt/ntcore_cpp.hpp} (100%)
 rename ntcore/src/main/native/include/{ntcore_test.h => wpi/nt/ntcore_test.hpp} (100%)
 rename ntcore/src/test/native/cpp/{MockConnectionList.h => MockConnectionList.hpp} (100%)
 rename ntcore/src/test/native/cpp/{MockListenerStorage.h => MockListenerStorage.hpp} (100%)
 rename ntcore/src/test/native/cpp/{MockLogger.h => MockLogger.hpp} (100%)
 rename ntcore/src/test/native/cpp/{PubSubOptionsMatcher.h => PubSubOptionsMatcher.hpp} (100%)
 rename ntcore/src/test/native/cpp/{StorageTest.h => StorageTest.hpp} (100%)
 rename ntcore/src/test/native/cpp/{TestPrinters.h => TestPrinters.hpp} (100%)
 rename ntcore/src/test/native/cpp/{ValueMatcher.h => ValueMatcher.hpp} (100%)
 rename ntcore/src/test/native/cpp/net/{MockClientMessageQueue.h => MockClientMessageQueue.hpp} (100%)
 rename ntcore/src/test/native/cpp/net/{MockMessageHandler.h => MockMessageHandler.hpp} (100%)
 rename ntcore/src/test/native/cpp/net/{MockNetworkInterface.h => MockNetworkInterface.hpp} (100%)
 rename ntcore/src/test/native/cpp/net/{MockWireConnection.h => MockWireConnection.hpp} (100%)
 rename romiVendordep/src/main/native/include/{frc/romi/OnBoardIO.h => wpi/romi/OnBoardIO.hpp} (100%)
 rename romiVendordep/src/main/native/include/{frc/romi/RomiGyro.h => wpi/romi/RomiGyro.hpp} (100%)
 rename romiVendordep/src/main/native/include/{frc/romi/RomiMotor.h => wpi/romi/RomiMotor.hpp} (100%)
 rename simulation/halsim_ds_socket/src/main/native/include/{DSCommJoystickPacket.h => wpi/halsim/ds_socket/DSCommJoystickPacket.hpp} (100%)
 rename simulation/halsim_ds_socket/src/main/native/include/{DSCommPacket.h => wpi/halsim/ds_socket/DSCommPacket.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{AddressableLEDGui.h => AddressableLEDGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{AnalogInputSimGui.h => AnalogInputSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{DIOSimGui.h => DIOSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{DriverStationGui.h => DriverStationGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{EncoderSimGui.h => EncoderSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{NetworkTablesSimGui.h => NetworkTablesSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{PCMSimGui.h => PCMSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{PHSimGui.h => PHSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{PWMSimGui.h => PWMSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{PowerDistributionSimGui.h => PowerDistributionSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{RoboRioSimGui.h => RoboRioSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/cpp/{TimingGui.h => TimingGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/include/{HALDataSource.h => wpi/halsim/gui/HALDataSource.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/include/{HALProvider.h => wpi/halsim/gui/HALProvider.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/include/{HALSimGui.h => wpi/halsim/gui/HALSimGui.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/include/{HALSimGuiExt.h => wpi/halsim/gui/HALSimGuiExt.hpp} (100%)
 rename simulation/halsim_gui/src/main/native/include/{SimDeviceGui.h => wpi/halsim/gui/SimDeviceGui.hpp} (100%)
 rename simulation/halsim_ws_client/src/main/native/include/{HALSimWS.h => wpi/halsim/ws_client/HALSimWS.hpp} (100%)
 rename simulation/halsim_ws_client/src/main/native/include/{HALSimWSClient.h => wpi/halsim/ws_client/HALSimWSClient.hpp} (100%)
 rename simulation/halsim_ws_client/src/main/native/include/{HALSimWSClientConnection.h => wpi/halsim/ws_client/HALSimWSClientConnection.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{HALSimBaseWebSocketConnection.h => wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSBaseProvider.h => wpi/halsim/ws_core/WSBaseProvider.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSHalProviders.h => wpi/halsim/ws_core/WSHalProviders.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProviderContainer.h => wpi/halsim/ws_core/WSProviderContainer.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_AddressableLED.h => wpi/halsim/ws_core/WSProvider_AddressableLED.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_Analog.h => wpi/halsim/ws_core/WSProvider_Analog.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_DIO.h => wpi/halsim/ws_core/WSProvider_DIO.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_DriverStation.h => wpi/halsim/ws_core/WSProvider_DriverStation.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_Encoder.h => wpi/halsim/ws_core/WSProvider_Encoder.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_HAL.h => wpi/halsim/ws_core/WSProvider_HAL.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_Joystick.h => wpi/halsim/ws_core/WSProvider_Joystick.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_PCM.h => wpi/halsim/ws_core/WSProvider_PCM.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_PWM.h => wpi/halsim/ws_core/WSProvider_PWM.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_RoboRIO.h => wpi/halsim/ws_core/WSProvider_RoboRIO.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_SimDevice.h => wpi/halsim/ws_core/WSProvider_SimDevice.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_Solenoid.h => wpi/halsim/ws_core/WSProvider_Solenoid.hpp} (100%)
 rename simulation/halsim_ws_core/src/main/native/include/{WSProvider_dPWM.h => wpi/halsim/ws_core/WSProvider_dPWM.hpp} (100%)
 rename simulation/halsim_ws_server/src/main/native/include/{HALSimHttpConnection.h => wpi/halsim/ws_server/HALSimHttpConnection.hpp} (100%)
 rename simulation/halsim_ws_server/src/main/native/include/{HALSimWSServer.h => wpi/halsim/ws_server/HALSimWSServer.hpp} (100%)
 rename simulation/halsim_ws_server/src/main/native/include/{HALSimWeb.h => wpi/halsim/ws_server/HALSimWeb.hpp} (100%)
 rename simulation/halsim_ws_server/src/test/native/include/{WebServerClientTest.h => WebServerClientTest.hpp} (100%)
 rename simulation/halsim_xrp/src/main/native/include/{HALSimXRP.h => wpi/halsim/xrp/HALSimXRP.hpp} (100%)
 rename simulation/halsim_xrp/src/main/native/include/{HALSimXRPClient.h => wpi/halsim/xrp/HALSimXRPClient.hpp} (100%)
 rename simulation/halsim_xrp/src/main/native/include/{XRP.h => wpi/halsim/xrp/XRP.hpp} (100%)
 rename tools/datalogtool/src/main/native/cpp/{App.h => App.hpp} (100%)
 rename tools/datalogtool/src/main/native/cpp/{Downloader.h => Downloader.hpp} (100%)
 rename tools/datalogtool/src/main/native/cpp/{Exporter.h => Exporter.hpp} (100%)
 rename tools/datalogtool/src/main/native/cpp/{Sftp.h => Sftp.hpp} (100%)
 rename tools/processstarter/src/main/native/linux/{main.h => main.hpp} (100%)
 rename tools/processstarter/src/main/native/osx/{main.h => main.hpp} (100%)
 rename tools/processstarter/src/main/native/windows/{main.h => main.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/Util.h => wpi/sysid/Util.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/AnalysisManager.h => wpi/sysid/analysis/AnalysisManager.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/AnalysisType.h => wpi/sysid/analysis/AnalysisType.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/ArmSim.h => wpi/sysid/analysis/ArmSim.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/ElevatorSim.h => wpi/sysid/analysis/ElevatorSim.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/FeedbackAnalysis.h => wpi/sysid/analysis/FeedbackAnalysis.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/FeedbackControllerPreset.h => wpi/sysid/analysis/FeedbackControllerPreset.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/FeedforwardAnalysis.h => wpi/sysid/analysis/FeedforwardAnalysis.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/FilteringUtils.h => wpi/sysid/analysis/FilteringUtils.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/OLS.h => wpi/sysid/analysis/OLS.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/SimpleMotorSim.h => wpi/sysid/analysis/SimpleMotorSim.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/Storage.h => wpi/sysid/analysis/Storage.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/analysis/TrackwidthAnalysis.h => wpi/sysid/analysis/TrackwidthAnalysis.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/view/Analyzer.h => wpi/sysid/view/Analyzer.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/view/AnalyzerPlot.h => wpi/sysid/view/AnalyzerPlot.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/view/DataSelector.h => wpi/sysid/view/DataSelector.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/view/LogLoader.h => wpi/sysid/view/LogLoader.hpp} (100%)
 rename tools/sysid/src/main/native/include/{sysid/view/UILayout.h => wpi/sysid/view/UILayout.hpp} (100%)
 rename tools/wpical/src/main/native/include/{cameracalibration.h => cameracalibration.hpp} (100%)
 rename tools/wpical/src/main/native/include/{fieldcalibration.h => fieldcalibration.hpp} (100%)
 rename tools/wpical/src/main/native/include/{fieldmap.h => fieldmap.hpp} (100%)
 rename tools/wpical/src/main/native/include/{fmap.h => fmap.hpp} (100%)
 rename tools/wpical/src/main/native/include/{tagpose.h => tagpose.hpp} (100%)
 rename tools/wpical/src/test/native/cpp/{path_lookup.h => path_lookup.hpp} (100%)
 rename wpigui/src/main/native/include/{ => wpi/gui}/portable-file-dialogs.h (100%)
 rename wpigui/src/main/native/include/{wpigui.h => wpi/gui/wpigui.hpp} (100%)
 rename wpigui/src/main/native/include/{wpigui_internal.h => wpi/gui/wpigui_internal.hpp} (100%)
 rename wpigui/src/main/native/include/{wpigui_openurl.h => wpi/gui/wpigui_openurl.hpp} (100%)
 rename wpilibc/src/generated/main/native/cpp/{ => driverstation}/PS4Controller.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{ => driverstation}/PS5Controller.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{ => driverstation}/StadiaController.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{ => driverstation}/XboxController.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/Koors40.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/PWMSparkFlex.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/PWMSparkMax.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/PWMTalonFX.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/PWMTalonSRX.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/PWMVenom.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/PWMVictorSPX.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/Spark.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/SparkMini.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/Talon.cpp (100%)
 rename wpilibc/src/generated/main/native/cpp/{motorcontrol => hardware/motor}/VictorSP.cpp (100%)
 rename wpilibc/src/generated/main/native/include/{frc/PS4Controller.h => wpi/driverstation/PS4Controller.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/PS5Controller.h => wpi/driverstation/PS5Controller.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/StadiaController.h => wpi/driverstation/StadiaController.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/XboxController.h => wpi/driverstation/XboxController.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/Koors40.h => wpi/hardware/motor/Koors40.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/PWMSparkFlex.h => wpi/hardware/motor/PWMSparkFlex.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/PWMSparkMax.h => wpi/hardware/motor/PWMSparkMax.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/PWMTalonFX.h => wpi/hardware/motor/PWMTalonFX.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/PWMTalonSRX.h => wpi/hardware/motor/PWMTalonSRX.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/PWMVenom.h => wpi/hardware/motor/PWMVenom.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/PWMVictorSPX.h => wpi/hardware/motor/PWMVictorSPX.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/Spark.h => wpi/hardware/motor/Spark.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/SparkMini.h => wpi/hardware/motor/SparkMini.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/Talon.h => wpi/hardware/motor/Talon.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/motorcontrol/VictorSP.h => wpi/hardware/motor/VictorSP.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/simulation/PS4ControllerSim.h => wpi/simulation/PS4ControllerSim.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/simulation/PS5ControllerSim.h => wpi/simulation/PS5ControllerSim.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/simulation/StadiaControllerSim.h => wpi/simulation/StadiaControllerSim.hpp} (100%)
 rename wpilibc/src/generated/main/native/include/{frc/simulation/XboxControllerSim.h => wpi/simulation/XboxControllerSim.hpp} (100%)
 rename wpilibc/src/main/native/cpp/{ => driverstation}/DSControlWord.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => driverstation}/DriverStation.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => driverstation}/Gamepad.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => driverstation}/GenericHID.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => driverstation}/Joystick.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/accelerometer}/ADXL345_I2C.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/accelerometer}/AnalogAccelerometer.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/bus}/CAN.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/bus}/I2C.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/bus}/SerialPort.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/discrete}/AnalogInput.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/discrete}/DigitalInput.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/discrete}/DigitalOutput.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/discrete}/PWM.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/imu}/OnboardIMU.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/led}/AddressableLED.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/led}/LEDPattern.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/motor}/MotorSafety.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/Compressor.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/DoubleSolenoid.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/PneumaticHub.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/PneumaticsBase.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/PneumaticsControlModule.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/pneumatic}/Solenoid.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/power}/PowerDistribution.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/range}/SharpIR.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/rotation}/AnalogEncoder.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/rotation}/AnalogPotentiometer.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/rotation}/DutyCycle.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/rotation}/DutyCycleEncoder.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => hardware/rotation}/Encoder.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => opmode}/IterativeRobotBase.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => opmode}/RobotState.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => opmode}/TimedRobot.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => opmode}/TimesliceRobot.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/DataLogManager.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Errors.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Filesystem.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Notifier.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Resource.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/RobotController.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/ScopedTracer.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/SystemServer.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Threads.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Timer.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Tracer.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => system}/Watchdog.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => util}/Alert.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => util}/Preferences.cpp (100%)
 rename wpilibc/src/main/native/cpp/{ => util}/SensorUtil.cpp (100%)
 rename wpilibc/src/main/native/include/{frc/ExpansionHub.h => wpi/ExpansionHub.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/ExpansionHubMotor.h => wpi/ExpansionHubMotor.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/ExpansionHubPidConstants.h => wpi/ExpansionHubPidConstants.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/ExpansionHubServo.h => wpi/ExpansionHubServo.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/counter/EdgeConfiguration.h => wpi/counter/EdgeConfiguration.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/counter/Tachometer.h => wpi/counter/Tachometer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/counter/UpDownCounter.h => wpi/counter/UpDownCounter.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/drive/DifferentialDrive.h => wpi/drive/DifferentialDrive.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/drive/MecanumDrive.h => wpi/drive/MecanumDrive.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/drive/RobotDriveBase.h => wpi/drive/RobotDriveBase.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DSControlWord.h => wpi/driverstation/DSControlWord.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DriverStation.h => wpi/driverstation/DriverStation.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Gamepad.h => wpi/driverstation/Gamepad.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/GenericHID.h => wpi/driverstation/GenericHID.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Joystick.h => wpi/driverstation/Joystick.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/event/BooleanEvent.h => wpi/event/BooleanEvent.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/event/EventLoop.h => wpi/event/EventLoop.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/event/NetworkBooleanEvent.h => wpi/event/NetworkBooleanEvent.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/ADXL345_I2C.h => wpi/hardware/accelerometer/ADXL345_I2C.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/AnalogAccelerometer.h => wpi/hardware/accelerometer/AnalogAccelerometer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/CAN.h => wpi/hardware/bus/CAN.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/I2C.h => wpi/hardware/bus/I2C.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/SerialPort.h => wpi/hardware/bus/SerialPort.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/AnalogInput.h => wpi/hardware/discrete/AnalogInput.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/CounterBase.h => wpi/hardware/discrete/CounterBase.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DigitalInput.h => wpi/hardware/discrete/DigitalInput.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DigitalOutput.h => wpi/hardware/discrete/DigitalOutput.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/PWM.h => wpi/hardware/discrete/PWM.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/OnboardIMU.h => wpi/hardware/imu/OnboardIMU.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/AddressableLED.h => wpi/hardware/led/AddressableLED.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/LEDPattern.h => wpi/hardware/led/LEDPattern.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/motorcontrol/MotorController.h => wpi/hardware/motor/MotorController.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/motorcontrol/MotorControllerGroup.h => wpi/hardware/motor/MotorControllerGroup.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/MotorSafety.h => wpi/hardware/motor/MotorSafety.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/motorcontrol/PWMMotorController.h => wpi/hardware/motor/PWMMotorController.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Compressor.h => wpi/hardware/pneumatic/Compressor.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/CompressorConfigType.h => wpi/hardware/pneumatic/CompressorConfigType.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DoubleSolenoid.h => wpi/hardware/pneumatic/DoubleSolenoid.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/PneumaticHub.h => wpi/hardware/pneumatic/PneumaticHub.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/PneumaticsBase.h => wpi/hardware/pneumatic/PneumaticsBase.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/PneumaticsControlModule.h => wpi/hardware/pneumatic/PneumaticsControlModule.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/PneumaticsModuleType.h => wpi/hardware/pneumatic/PneumaticsModuleType.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Solenoid.h => wpi/hardware/pneumatic/Solenoid.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/PowerDistribution.h => wpi/hardware/power/PowerDistribution.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/SharpIR.h => wpi/hardware/range/SharpIR.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/AnalogEncoder.h => wpi/hardware/rotation/AnalogEncoder.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/AnalogPotentiometer.h => wpi/hardware/rotation/AnalogPotentiometer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DutyCycle.h => wpi/hardware/rotation/DutyCycle.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DutyCycleEncoder.h => wpi/hardware/rotation/DutyCycleEncoder.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Encoder.h => wpi/hardware/rotation/Encoder.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/internal/DriverStationModeThread.h => wpi/internal/DriverStationModeThread.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/IterativeRobotBase.h => wpi/opmode/IterativeRobotBase.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/RobotBase.h => wpi/opmode/RobotBase.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/RobotState.h => wpi/opmode/RobotState.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/TimedRobot.h => wpi/opmode/TimedRobot.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/TimesliceRobot.h => wpi/opmode/TimesliceRobot.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/ADXL345Sim.h => wpi/simulation/ADXL345Sim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/AddressableLEDSim.h => wpi/simulation/AddressableLEDSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/AnalogEncoderSim.h => wpi/simulation/AnalogEncoderSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/AnalogInputSim.h => wpi/simulation/AnalogInputSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/BatterySim.h => wpi/simulation/BatterySim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/CTREPCMSim.h => wpi/simulation/CTREPCMSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/CallbackStore.h => wpi/simulation/CallbackStore.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DCMotorSim.h => wpi/simulation/DCMotorSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DIOSim.h => wpi/simulation/DIOSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DifferentialDrivetrainSim.h => wpi/simulation/DifferentialDrivetrainSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DigitalPWMSim.h => wpi/simulation/DigitalPWMSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DoubleSolenoidSim.h => wpi/simulation/DoubleSolenoidSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DriverStationSim.h => wpi/simulation/DriverStationSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DutyCycleEncoderSim.h => wpi/simulation/DutyCycleEncoderSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/DutyCycleSim.h => wpi/simulation/DutyCycleSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/ElevatorSim.h => wpi/simulation/ElevatorSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/EncoderSim.h => wpi/simulation/EncoderSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/FlywheelSim.h => wpi/simulation/FlywheelSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/GamepadSim.h => wpi/simulation/GamepadSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/GenericHIDSim.h => wpi/simulation/GenericHIDSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/JoystickSim.h => wpi/simulation/JoystickSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/LinearSystemSim.h => wpi/simulation/LinearSystemSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/PWMMotorControllerSim.h => wpi/simulation/PWMMotorControllerSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/PWMSim.h => wpi/simulation/PWMSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/PneumaticsBaseSim.h => wpi/simulation/PneumaticsBaseSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/PowerDistributionSim.h => wpi/simulation/PowerDistributionSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/REVPHSim.h => wpi/simulation/REVPHSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/RoboRioSim.h => wpi/simulation/RoboRioSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/SendableChooserSim.h => wpi/simulation/SendableChooserSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/SharpIRSim.h => wpi/simulation/SharpIRSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/SimDeviceSim.h => wpi/simulation/SimDeviceSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/SimHooks.h => wpi/simulation/SimHooks.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/SingleJointedArmSim.h => wpi/simulation/SingleJointedArmSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/simulation/SolenoidSim.h => wpi/simulation/SolenoidSim.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/Field2d.h => wpi/smartdashboard/Field2d.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/FieldObject2d.h => wpi/smartdashboard/FieldObject2d.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/ListenerExecutor.h => wpi/smartdashboard/ListenerExecutor.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/Mechanism2d.h => wpi/smartdashboard/Mechanism2d.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/MechanismLigament2d.h => wpi/smartdashboard/MechanismLigament2d.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/MechanismObject2d.h => wpi/smartdashboard/MechanismObject2d.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/MechanismRoot2d.h => wpi/smartdashboard/MechanismRoot2d.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/SendableBuilderImpl.h => wpi/smartdashboard/SendableBuilderImpl.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/SendableChooser.h => wpi/smartdashboard/SendableChooser.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/SendableChooserBase.h => wpi/smartdashboard/SendableChooserBase.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/smartdashboard/SmartDashboard.h => wpi/smartdashboard/SmartDashboard.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/sysid/SysIdRoutineLog.h => wpi/sysid/SysIdRoutineLog.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/DataLogManager.h => wpi/system/DataLogManager.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Errors.h => wpi/system/Errors.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Filesystem.h => wpi/system/Filesystem.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Notifier.h => wpi/system/Notifier.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Resource.h => wpi/system/Resource.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/RobotController.h => wpi/system/RobotController.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/RuntimeType.h => wpi/system/RuntimeType.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/ScopedTracer.h => wpi/system/ScopedTracer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/SystemServer.h => wpi/system/SystemServer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Threads.h => wpi/system/Threads.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Timer.h => wpi/system/Timer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Tracer.h => wpi/system/Tracer.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc => wpi/system}/WPIErrors.mac (100%)
 rename wpilibc/src/main/native/include/{WPILibVersion.h => wpi/system/WPILibVersion.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc => wpi/system}/WPIWarnings.mac (100%)
 rename wpilibc/src/main/native/include/{frc/Watchdog.h => wpi/system/Watchdog.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Alert.h => wpi/util/Alert.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/util/Color.h => wpi/util/Color.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/util/Color8Bit.h => wpi/util/Color8Bit.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/Preferences.h => wpi/util/Preferences.hpp} (100%)
 rename wpilibc/src/main/native/include/{frc/SensorUtil.h => wpi/util/SensorUtil.hpp} (100%)
 rename wpilibc/src/test/native/cpp/{JoystickTestMacros.h => JoystickTestMacros.hpp} (100%)
 rename wpilibc/src/test/native/include/callback_helpers/{TestCallbackHelpers.h => TestCallbackHelpers.hpp} (100%)
 rename wpilibc/src/test/native/include/motorcontrol/{MockMotorController.h => MockMotorController.hpp} (100%)
 rename wpilibc/src/test/native/include/motorcontrol/{MockPWMMotorController.h => MockPWMMotorController.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/command2/{ReplaceMeCommand2.h => ReplaceMeCommand2.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/emptyclass/{ReplaceMeEmptyClass.h => ReplaceMeEmptyClass.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/instantcommand/{ReplaceMeInstantCommand2.h => ReplaceMeInstantCommand2.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/{ReplaceMeParallelCommandGroup.h => ReplaceMeParallelCommandGroup.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/{ReplaceMeParallelDeadlineGroup.h => ReplaceMeParallelDeadlineGroup.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/parallelracegroup/{ReplaceMeParallelRaceGroup.h => ReplaceMeParallelRaceGroup.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/{ReplaceMeSequentialCommandGroup.h => ReplaceMeSequentialCommandGroup.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/commands/subsystem2/{ReplaceMeSubsystem2.h => ReplaceMeSubsystem2.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/AddressableLED/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/{Arm.h => Arm.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/{ExampleGlobalMeasurementSensor.h => ExampleGlobalMeasurementSensor.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/{ExampleSmartMotorController.h => ExampleSmartMotorController.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/{DriveSubsystem.h => DriveSubsystem.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/include/{ExampleSmartMotorController.h => ExampleSmartMotorController.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/{Elevator.h => Elevator.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/{Elevator.h => Elevator.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/include/{ExampleSmartMotorController.h => ExampleSmartMotorController.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/{Autos.h => Autos.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/{DriveSubsystem.h => DriveSubsystem.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/{HatchSubsystem.h => HatchSubsystem.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/{ComplexAuto.h => ComplexAuto.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/{DefaultDrive.h => DefaultDrive.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/{DriveDistance.h => DriveDistance.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/{GrabHatch.h => GrabHatch.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/{HalveDriveSpeed.h => HalveDriveSpeed.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/{ReleaseHatch.h => ReleaseHatch.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/{DriveSubsystem.h => DriveSubsystem.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/{HatchSubsystem.h => HatchSubsystem.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/MecanumBot/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/{ExampleGlobalMeasurementSensor.h => ExampleGlobalMeasurementSensor.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/{RapidReactCommandBot.h => RapidReactCommandBot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/{Drive.h => Drive.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/{Intake.h => Intake.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/{Pneumatics.h => Pneumatics.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/{Shooter.h => Shooter.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/{Storage.h => Storage.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{AutonomousDistance.h => AutonomousDistance.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{AutonomousTime.h => AutonomousTime.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{DriveDistance.h => DriveDistance.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{DriveTime.h => DriveTime.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{TeleopArcadeDrive.h => TeleopArcadeDrive.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{TurnDegrees.h => TurnDegrees.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/{TurnTime.h => TurnTime.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SelectCommand/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SelectCommand/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SelectCommand/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/Solenoid/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SwerveBot/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SwerveBot/include/{SwerveModule.h => SwerveModule.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/{ExampleGlobalMeasurementSensor.h => ExampleGlobalMeasurementSensor.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/{SwerveModule.h => SwerveModule.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/{SysIdRoutineBot.h => SysIdRoutineBot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/{Drive.h => Drive.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/{Shooter.h => Shooter.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/UnitTest/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/UnitTest/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/{Intake.h => Intake.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{AutonomousDistance.h => AutonomousDistance.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{AutonomousTime.h => AutonomousTime.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{DriveDistance.h => DriveDistance.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{DriveTime.h => DriveTime.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{TeleopArcadeDrive.h => TeleopArcadeDrive.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{TurnDegrees.h => TurnDegrees.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/{TurnTime.h => TurnTime.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/{Arm.h => Arm.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/{Drivetrain.h => Drivetrain.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbased/include/{Constants.h => Constants.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbased/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbased/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/{Autos.h => Autos.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/{ExampleCommand.h => ExampleCommand.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/{ExampleSubsystem.h => ExampleSubsystem.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/{RobotContainer.h => RobotContainer.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/timed/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/timedskeleton/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/timeslice/include/{Robot.h => Robot.hpp} (100%)
 rename wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/{Robot.h => Robot.hpp} (100%)
 rename wpimath/src/main/native/cpp/jni/{Exceptions.h => Exceptions.hpp} (100%)
 rename wpimath/src/main/native/cpp/{ => util}/MathShared.cpp (100%)
 rename wpimath/src/main/native/cpp/{ => util}/StateSpaceUtil.cpp (100%)
 rename wpimath/src/main/native/include/{frc/controller/ArmFeedforward.h => wpi/math/controller/ArmFeedforward.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/BangBangController.h => wpi/math/controller/BangBangController.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/ControlAffinePlantInversionFeedforward.h => wpi/math/controller/ControlAffinePlantInversionFeedforward.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/DifferentialDriveAccelerationLimiter.h => wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/DifferentialDriveFeedforward.h => wpi/math/controller/DifferentialDriveFeedforward.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/DifferentialDriveWheelVoltages.h => wpi/math/controller/DifferentialDriveWheelVoltages.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/ElevatorFeedforward.h => wpi/math/controller/ElevatorFeedforward.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/ImplicitModelFollower.h => wpi/math/controller/ImplicitModelFollower.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/LTVDifferentialDriveController.h => wpi/math/controller/LTVDifferentialDriveController.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/LTVUnicycleController.h => wpi/math/controller/LTVUnicycleController.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/LinearPlantInversionFeedforward.h => wpi/math/controller/LinearPlantInversionFeedforward.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/LinearQuadraticRegulator.h => wpi/math/controller/LinearQuadraticRegulator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/PIDController.h => wpi/math/controller/PIDController.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/ProfiledPIDController.h => wpi/math/controller/ProfiledPIDController.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/SimpleMotorFeedforward.h => wpi/math/controller/SimpleMotorFeedforward.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/proto/ArmFeedforwardProto.h => wpi/math/controller/proto/ArmFeedforwardProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/proto/DifferentialDriveFeedforwardProto.h => wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/proto/DifferentialDriveWheelVoltagesProto.h => wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/proto/ElevatorFeedforwardProto.h => wpi/math/controller/proto/ElevatorFeedforwardProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/proto/SimpleMotorFeedforwardProto.h => wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/struct/ArmFeedforwardStruct.h => wpi/math/controller/struct/ArmFeedforwardStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/struct/DifferentialDriveFeedforwardStruct.h => wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/struct/DifferentialDriveWheelVoltagesStruct.h => wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/struct/ElevatorFeedforwardStruct.h => wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/controller/struct/SimpleMotorFeedforwardStruct.h => wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/AngleStatistics.h => wpi/math/estimator/AngleStatistics.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/DifferentialDrivePoseEstimator.h => wpi/math/estimator/DifferentialDrivePoseEstimator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/DifferentialDrivePoseEstimator3d.h => wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/ExtendedKalmanFilter.h => wpi/math/estimator/ExtendedKalmanFilter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/KalmanFilter.h => wpi/math/estimator/KalmanFilter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/KalmanFilterLatencyCompensator.h => wpi/math/estimator/KalmanFilterLatencyCompensator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/MecanumDrivePoseEstimator.h => wpi/math/estimator/MecanumDrivePoseEstimator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/MecanumDrivePoseEstimator3d.h => wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/MerweScaledSigmaPoints.h => wpi/math/estimator/MerweScaledSigmaPoints.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/MerweUKF.h => wpi/math/estimator/MerweUKF.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/PoseEstimator.h => wpi/math/estimator/PoseEstimator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/PoseEstimator3d.h => wpi/math/estimator/PoseEstimator3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/S3SigmaPoints.h => wpi/math/estimator/S3SigmaPoints.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/S3UKF.h => wpi/math/estimator/S3UKF.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/SigmaPoints.h => wpi/math/estimator/SigmaPoints.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/SteadyStateKalmanFilter.h => wpi/math/estimator/SteadyStateKalmanFilter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/SwerveDrivePoseEstimator.h => wpi/math/estimator/SwerveDrivePoseEstimator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/SwerveDrivePoseEstimator3d.h => wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/UnscentedKalmanFilter.h => wpi/math/estimator/UnscentedKalmanFilter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/estimator/UnscentedTransform.h => wpi/math/estimator/UnscentedTransform.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/filter/Debouncer.h => wpi/math/filter/Debouncer.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/filter/LinearFilter.h => wpi/math/filter/LinearFilter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/filter/MedianFilter.h => wpi/math/filter/MedianFilter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/filter/SlewRateLimiter.h => wpi/math/filter/SlewRateLimiter.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/fmt/Eigen.h => wpi/math/fmt/Eigen.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/CoordinateAxis.h => wpi/math/geometry/CoordinateAxis.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/CoordinateSystem.h => wpi/math/geometry/CoordinateSystem.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Ellipse2d.h => wpi/math/geometry/Ellipse2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Pose2d.h => wpi/math/geometry/Pose2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Pose3d.h => wpi/math/geometry/Pose3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Quaternion.h => wpi/math/geometry/Quaternion.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Rectangle2d.h => wpi/math/geometry/Rectangle2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Rotation2d.h => wpi/math/geometry/Rotation2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Rotation3d.h => wpi/math/geometry/Rotation3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Transform2d.h => wpi/math/geometry/Transform2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Transform3d.h => wpi/math/geometry/Transform3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Translation2d.h => wpi/math/geometry/Translation2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Translation3d.h => wpi/math/geometry/Translation3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Twist2d.h => wpi/math/geometry/Twist2d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/Twist3d.h => wpi/math/geometry/Twist3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/detail/RotationVectorToMatrix.h => wpi/math/geometry/detail/RotationVectorToMatrix.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Ellipse2dProto.h => wpi/math/geometry/proto/Ellipse2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Pose2dProto.h => wpi/math/geometry/proto/Pose2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Pose3dProto.h => wpi/math/geometry/proto/Pose3dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/QuaternionProto.h => wpi/math/geometry/proto/QuaternionProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Rectangle2dProto.h => wpi/math/geometry/proto/Rectangle2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Rotation2dProto.h => wpi/math/geometry/proto/Rotation2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Rotation3dProto.h => wpi/math/geometry/proto/Rotation3dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Transform2dProto.h => wpi/math/geometry/proto/Transform2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Transform3dProto.h => wpi/math/geometry/proto/Transform3dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Translation2dProto.h => wpi/math/geometry/proto/Translation2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Translation3dProto.h => wpi/math/geometry/proto/Translation3dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Twist2dProto.h => wpi/math/geometry/proto/Twist2dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/proto/Twist3dProto.h => wpi/math/geometry/proto/Twist3dProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Ellipse2dStruct.h => wpi/math/geometry/struct/Ellipse2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Pose2dStruct.h => wpi/math/geometry/struct/Pose2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Pose3dStruct.h => wpi/math/geometry/struct/Pose3dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/QuaternionStruct.h => wpi/math/geometry/struct/QuaternionStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Rectangle2dStruct.h => wpi/math/geometry/struct/Rectangle2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Rotation2dStruct.h => wpi/math/geometry/struct/Rotation2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Rotation3dStruct.h => wpi/math/geometry/struct/Rotation3dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Transform2dStruct.h => wpi/math/geometry/struct/Transform2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Transform3dStruct.h => wpi/math/geometry/struct/Transform3dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Translation2dStruct.h => wpi/math/geometry/struct/Translation2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Translation3dStruct.h => wpi/math/geometry/struct/Translation3dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Twist2dStruct.h => wpi/math/geometry/struct/Twist2dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/geometry/struct/Twist3dStruct.h => wpi/math/geometry/struct/Twist3dStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/interpolation/TimeInterpolatableBuffer.h => wpi/math/interpolation/TimeInterpolatableBuffer.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/ChassisSpeeds.h => wpi/math/kinematics/ChassisSpeeds.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/DifferentialDriveKinematics.h => wpi/math/kinematics/DifferentialDriveKinematics.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/DifferentialDriveOdometry.h => wpi/math/kinematics/DifferentialDriveOdometry.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/DifferentialDriveOdometry3d.h => wpi/math/kinematics/DifferentialDriveOdometry3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/DifferentialDriveWheelPositions.h => wpi/math/kinematics/DifferentialDriveWheelPositions.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/DifferentialDriveWheelSpeeds.h => wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/Kinematics.h => wpi/math/kinematics/Kinematics.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/MecanumDriveKinematics.h => wpi/math/kinematics/MecanumDriveKinematics.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/MecanumDriveOdometry.h => wpi/math/kinematics/MecanumDriveOdometry.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/MecanumDriveOdometry3d.h => wpi/math/kinematics/MecanumDriveOdometry3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/MecanumDriveWheelPositions.h => wpi/math/kinematics/MecanumDriveWheelPositions.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/MecanumDriveWheelSpeeds.h => wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/Odometry.h => wpi/math/kinematics/Odometry.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/Odometry3d.h => wpi/math/kinematics/Odometry3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/SwerveDriveKinematics.h => wpi/math/kinematics/SwerveDriveKinematics.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/SwerveDriveOdometry.h => wpi/math/kinematics/SwerveDriveOdometry.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/SwerveDriveOdometry3d.h => wpi/math/kinematics/SwerveDriveOdometry3d.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/SwerveModulePosition.h => wpi/math/kinematics/SwerveModulePosition.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/SwerveModuleState.h => wpi/math/kinematics/SwerveModuleState.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/ChassisSpeedsProto.h => wpi/math/kinematics/proto/ChassisSpeedsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/DifferentialDriveKinematicsProto.h => wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/DifferentialDriveWheelPositionsProto.h => wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/DifferentialDriveWheelSpeedsProto.h => wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/MecanumDriveKinematicsProto.h => wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/MecanumDriveWheelPositionsProto.h => wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/MecanumDriveWheelSpeedsProto.h => wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/SwerveDriveKinematicsProto.h => wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/SwerveModulePositionProto.h => wpi/math/kinematics/proto/SwerveModulePositionProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/proto/SwerveModuleStateProto.h => wpi/math/kinematics/proto/SwerveModuleStateProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/ChassisSpeedsStruct.h => wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/DifferentialDriveKinematicsStruct.h => wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/DifferentialDriveWheelPositionsStruct.h => wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/DifferentialDriveWheelSpeedsStruct.h => wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/MecanumDriveKinematicsStruct.h => wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/MecanumDriveWheelPositionsStruct.h => wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/MecanumDriveWheelSpeedsStruct.h => wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/SwerveDriveKinematicsStruct.h => wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/SwerveModulePositionStruct.h => wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/kinematics/struct/SwerveModuleStateStruct.h => wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/DARE.h => wpi/math/linalg/DARE.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/EigenCore.h => wpi/math/linalg/EigenCore.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/ct_matrix.h => wpi/math/linalg/ct_matrix.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/proto/MatrixProto.h => wpi/math/linalg/proto/MatrixProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/proto/VectorProto.h => wpi/math/linalg/proto/VectorProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/struct/MatrixStruct.h => wpi/math/linalg/struct/StructProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/struct/VectorStruct.h => wpi/math/linalg/struct/VectorStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/optimization/SimulatedAnnealing.h => wpi/math/optimization/SimulatedAnnealing.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/path/TravelingSalesman.h => wpi/math/path/TravelingSalesman.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/CubicHermiteSpline.h => wpi/math/spline/CubicHermiteSpline.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/QuinticHermiteSpline.h => wpi/math/spline/QuinticHermiteSpline.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/Spline.h => wpi/math/spline/Spline.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/SplineHelper.h => wpi/math/spline/SplineHelper.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/SplineParameterizer.h => wpi/math/spline/SplineParameterizer.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/proto/CubicHermiteSplineProto.h => wpi/math/spline/proto/CubicHermiteSplineProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/proto/QuinticHermiteSplineProto.h => wpi/math/spline/proto/QuinticHermiteSplineProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/struct/CubicHermiteSplineStruct.h => wpi/math/spline/struct/CubicHermiteSplineStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/spline/struct/QuinticHermiteSplineStruct.h => wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/Discretization.h => wpi/math/system/Discretization.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/LinearSystem.h => wpi/math/system/LinearSystem.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/LinearSystemLoop.h => wpi/math/system/LinearSystemLoop.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/NumericalIntegration.h => wpi/math/system/NumericalIntegration.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/NumericalJacobian.h => wpi/math/system/NumericalJacobian.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/plant/DCMotor.h => wpi/math/system/plant/DCMotor.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/plant/LinearSystemId.h => wpi/math/system/plant/LinearSystemId.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/plant/proto/DCMotorProto.h => wpi/math/system/plant/proto/DCMotorProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/plant/struct/DCMotorStruct.h => wpi/math/system/plant/struct/DCMotorStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/proto/LinearSystemProto.h => wpi/math/system/proto/LinearSystemProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/system/struct/LinearSystemStruct.h => wpi/math/system/struct/LinearSystemStruct.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/ExponentialProfile.h => wpi/math/trajectory/ExponentialProfile.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/Trajectory.h => wpi/math/trajectory/Trajectory.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/TrajectoryConfig.h => wpi/math/trajectory/TrajectoryConfig.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/TrajectoryGenerator.h => wpi/math/trajectory/TrajectoryGenerator.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/TrajectoryParameterizer.h => wpi/math/trajectory/TrajectoryParameterizer.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/TrapezoidProfile.h => wpi/math/trajectory/TrapezoidProfile.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/CentripetalAccelerationConstraint.h => wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/DifferentialDriveKinematicsConstraint.h => wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/DifferentialDriveVoltageConstraint.h => wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/EllipticalRegionConstraint.h => wpi/math/trajectory/constraint/EllipticalRegionConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/MaxVelocityConstraint.h => wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/MecanumDriveKinematicsConstraint.h => wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/RectangularRegionConstraint.h => wpi/math/trajectory/constraint/RectangularRegionConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/SwerveDriveKinematicsConstraint.h => wpi/math/trajectory/constraint/SwerveDriveKinematicsConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/constraint/TrajectoryConstraint.h => wpi/math/trajectory/constraint/TrajectoryConstraint.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/proto/TrajectoryProto.h => wpi/math/trajectory/proto/TrajectoryProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/trajectory/proto/TrajectoryStateProto.h => wpi/math/trajectory/proto/TrajectoryStateProto.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/ComputerVisionUtil.h => wpi/math/util/ComputerVisionUtil.hpp} (100%)
 rename wpimath/src/main/native/include/{wpimath/MathShared.h => wpi/math/util/MathShared.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/MathUtil.h => wpi/math/util/MathUtil.hpp} (100%)
 rename wpimath/src/main/native/include/{frc/StateSpaceUtil.h => wpi/math/util/StateSpaceUtil.hpp} (100%)
 rename wpimath/src/main/native/include/{units/acceleration.h => wpi/units/acceleration.hpp} (100%)
 rename wpimath/src/main/native/include/{units/angle.h => wpi/units/angle.hpp} (100%)
 rename wpimath/src/main/native/include/{units/angular_acceleration.h => wpi/units/angular_acceleration.hpp} (100%)
 rename wpimath/src/main/native/include/{units/angular_jerk.h => wpi/units/angular_jerk.hpp} (100%)
 rename wpimath/src/main/native/include/{units/angular_velocity.h => wpi/units/angular_velocity.hpp} (100%)
 rename wpimath/src/main/native/include/{units/area.h => wpi/units/area.hpp} (100%)
 rename wpimath/src/main/native/include/{units/base.h => wpi/units/base.hpp} (100%)
 rename wpimath/src/main/native/include/{units/capacitance.h => wpi/units/capacitance.hpp} (100%)
 rename wpimath/src/main/native/include/{units/charge.h => wpi/units/charge.hpp} (100%)
 rename wpimath/src/main/native/include/{units/concentration.h => wpi/units/concentration.hpp} (100%)
 rename wpimath/src/main/native/include/{units/conductance.h => wpi/units/conductance.hpp} (100%)
 rename wpimath/src/main/native/include/{units/constants.h => wpi/units/constants.hpp} (100%)
 rename wpimath/src/main/native/include/{units/current.h => wpi/units/current.hpp} (100%)
 rename wpimath/src/main/native/include/{units/curvature.h => wpi/units/curvature.hpp} (100%)
 rename wpimath/src/main/native/include/{units/data.h => wpi/units/data.hpp} (100%)
 rename wpimath/src/main/native/include/{units/data_transfer_rate.h => wpi/units/data_transfer_rate.hpp} (100%)
 rename wpimath/src/main/native/include/{units/density.h => wpi/units/density.hpp} (100%)
 rename wpimath/src/main/native/include/{units/dimensionless.h => wpi/units/dimensionless.hpp} (100%)
 rename wpimath/src/main/native/include/{units/energy.h => wpi/units/energy.hpp} (100%)
 rename wpimath/src/main/native/include/{units/force.h => wpi/units/force.hpp} (100%)
 rename wpimath/src/main/native/include/{units/formatter.h => wpi/units/formatter.hpp} (100%)
 rename wpimath/src/main/native/include/{units/frequency.h => wpi/units/frequency.hpp} (100%)
 rename wpimath/src/main/native/include/{units/illuminance.h => wpi/units/illuminance.hpp} (100%)
 rename wpimath/src/main/native/include/{units/impedance.h => wpi/units/impedance.hpp} (100%)
 rename wpimath/src/main/native/include/{units/inductance.h => wpi/units/inductance.hpp} (100%)
 rename wpimath/src/main/native/include/{units/length.h => wpi/units/length.hpp} (100%)
 rename wpimath/src/main/native/include/{units/luminous_flux.h => wpi/units/luminous_flux.hpp} (100%)
 rename wpimath/src/main/native/include/{units/luminous_intensity.h => wpi/units/luminous_intensity.hpp} (100%)
 rename wpimath/src/main/native/include/{units/magnetic_field_strength.h => wpi/units/magnetic_field_strength.hpp} (100%)
 rename wpimath/src/main/native/include/{units/magnetic_flux.h => wpi/units/magnetic_flux.hpp} (100%)
 rename wpimath/src/main/native/include/{units/mass.h => wpi/units/mass.hpp} (100%)
 rename wpimath/src/main/native/include/{units/math.h => wpi/units/math.hpp} (100%)
 rename wpimath/src/main/native/include/{units/moment_of_inertia.h => wpi/units/moment_of_inertia.hpp} (100%)
 rename wpimath/src/main/native/include/{units/power.h => wpi/units/power.hpp} (100%)
 rename wpimath/src/main/native/include/{units/pressure.h => wpi/units/pressure.hpp} (100%)
 rename wpimath/src/main/native/include/{units/radiation.h => wpi/units/radiation.hpp} (100%)
 rename wpimath/src/main/native/include/{units/solid_angle.h => wpi/units/solid_angle.hpp} (100%)
 rename wpimath/src/main/native/include/{units/substance.h => wpi/units/substance.hpp} (100%)
 rename wpimath/src/main/native/include/{units/temperature.h => wpi/units/temperature.hpp} (100%)
 rename wpimath/src/main/native/include/{units/time.h => wpi/units/time.hpp} (100%)
 rename wpimath/src/main/native/include/{units/torque.h => wpi/units/torque.hpp} (100%)
 rename wpimath/src/main/native/include/{units/velocity.h => wpi/units/velocity.hpp} (100%)
 rename wpimath/src/main/native/include/{units/voltage.h => wpi/units/voltage.hpp} (100%)
 rename wpimath/src/main/native/include/{units/volume.h => wpi/units/volume.hpp} (100%)
 rename wpimath/src/test/native/cpp/{ProtoTestBase.h => ProtoTestBase.hpp} (100%)
 rename wpimath/src/test/native/cpp/{StructTestBase.h => StructTestBase.hpp} (100%)
 rename wpimath/src/test/native/include/{trajectory/TestTrajectory.h => wpi/math/trajectory/TestTrajectory.hpp} (100%)
 rename wpinet/src/main/native/cpp/{MulticastHandleManager.h => MulticastHandleManager.hpp} (100%)
 rename wpinet/src/main/native/cpp/{WebSocketDebug.h => WebSocketDebug.hpp} (100%)
 rename wpinet/src/main/native/cpp/{WebSocketSerializer.h => WebSocketSerializer.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/DsClient.h => wpi/net/DsClient.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/EventLoopRunner.h => wpi/net/EventLoopRunner.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/HttpParser.h => wpi/net/HttpParser.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/HttpServerConnection.h => wpi/net/HttpServerConnection.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/HttpUtil.h => wpi/net/HttpUtil.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/HttpWebSocketServerConnection.h => wpi/net/HttpWebSocketServerConnection.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/MimeTypes.h => wpi/net/MimeTypes.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet => wpi/net}/MulticastServiceAnnouncer.h (100%)
 rename wpinet/src/main/native/include/{wpinet => wpi/net}/MulticastServiceResolver.h (100%)
 rename wpinet/src/main/native/include/{wpinet/NetworkAcceptor.h => wpi/net/NetworkAcceptor.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/NetworkStream.h => wpi/net/NetworkStream.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/ParallelTcpConnector.h => wpi/net/ParallelTcpConnector.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/PortForwarder.h => wpi/net/PortForwarder.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/SocketError.h => wpi/net/SocketError.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/UDPClient.h => wpi/net/UDPClient.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/UrlParser.h => wpi/net/UrlParser.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/WebServer.h => wpi/net/WebServer.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/WebSocket.h => wpi/net/WebSocket.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/WebSocketServer.h => wpi/net/WebSocketServer.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/WorkerThread.h => wpi/net/WorkerThread.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/hostname.h => wpi/net/hostname.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/http_parser.h => wpi/net/http_parser.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/raw_socket_istream.h => wpi/net/raw_socket_istream.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/raw_socket_ostream.h => wpi/net/raw_socket_ostream.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/raw_uv_ostream.h => wpi/net/raw_uv_ostream.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Async.h => wpi/net/uv/Async.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/AsyncFunction.h => wpi/net/uv/AsyncFunction.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Buffer.h => wpi/net/uv/Buffer.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Check.h => wpi/net/uv/Check.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Error.h => wpi/net/uv/Error.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/FsEvent.h => wpi/net/uv/FsEvent.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/GetAddrInfo.h => wpi/net/uv/GetAddrInfo.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/GetNameInfo.h => wpi/net/uv/GetNameInfo.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Handle.h => wpi/net/uv/Handle.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Idle.h => wpi/net/uv/Idle.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Loop.h => wpi/net/uv/Loop.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/NetworkStream.h => wpi/net/uv/NetworkStream.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Pipe.h => wpi/net/uv/Pipe.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Poll.h => wpi/net/uv/Poll.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Prepare.h => wpi/net/uv/Prepare.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Process.h => wpi/net/uv/Process.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Request.h => wpi/net/uv/Request.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Signal.h => wpi/net/uv/Signal.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Stream.h => wpi/net/uv/Stream.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Tcp.h => wpi/net/uv/Tcp.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Timer.h => wpi/net/uv/Timer.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Tty.h => wpi/net/uv/Tty.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Udp.h => wpi/net/uv/Udp.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/Work.h => wpi/net/uv/Work.hpp} (100%)
 rename wpinet/src/main/native/include/{wpinet/uv/util.h => wpi/net/uv/util.hpp} (100%)
 rename wpinet/src/main/native/linux/{AvahiClient.h => AvahiClient.hpp} (100%)
 rename wpinet/src/main/native/macOS/{ResolverThread.h => ResolverThread.hpp} (100%)
 rename wpinet/src/main/native/thirdparty/tcpsockets/include/{wpinet => wpi/net}/TCPAcceptor.h (100%)
 rename wpinet/src/main/native/thirdparty/tcpsockets/include/{wpinet => wpi/net}/TCPConnector.h (100%)
 rename wpinet/src/main/native/thirdparty/tcpsockets/include/{wpinet => wpi/net}/TCPStream.h (100%)
 rename wpinet/src/main/native/windows/{DynamicDns.h => DynamicDns.hpp} (100%)
 rename wpinet/src/test/native/cpp/{WebSocketTest.h => WebSocketTest.hpp} (100%)
 rename wpiutil/src/main/native/cpp/jni/{WPIUtilJNI.h => WPIUtilJNI.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{Algorithm.h => util/Algorithm.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{Base64.h => util/Base64.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{CallbackManager.h => util/CallbackManager.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{DecayedDerivedFrom.h => util/DecayedDerivedFrom.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{Demangle.h => util/Demangle.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{EventVector.h => util/EventVector.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{FastQueue.h => util/FastQueue.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{Logger.h => util/Logger.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{MappedFileRegion.h => util/MappedFileRegion.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{MessagePack.h => util/MessagePack.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{NullDeleter.h => util/NullDeleter.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/RawFrame.h (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/RuntimeCheck.h (100%)
 rename wpiutil/src/main/native/include/wpi/{SafeThread.h => util/SafeThread.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{SpanExtras.h => util/SpanExtras.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{StackTrace.h => util/StackTrace.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{StringMap.h => util/StringMap.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{SymbolExports.h => util/SymbolExports.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/Synchronization.h (100%)
 rename wpiutil/src/main/native/include/wpi/{UidVector.h => util/UidVector.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{array.h => util/array.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{circular_buffer.h => util/circular_buffer.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{condition_variable.h => util/condition_variable.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ct_string.h => util/ct_string.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{deprecated.h => util/deprecated.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{fmt/raw_ostream.h => util/fmt/raw_ostream.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{fs.h => util/fs.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{future.h => util/future.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{interpolating_map.h => util/interpolating_map.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{jni_util.h => util/jni_util.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{mutex.h => util/mutex.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/nodiscard.h (100%)
 rename wpiutil/src/main/native/include/wpi/{print.h => util/print.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{priority_mutex.h => util/priority_mutex.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{priority_queue.h => util/priority_queue.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{protobuf/Protobuf.h => util/protobuf/Protobuf.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{protobuf/ProtobufCallbacks.h => util/protobuf/ProtobufCallbacks.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{raw_istream.h => util/raw_istream.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{rotated_span.h => util/rotated_span.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/scope (100%)
 rename wpiutil/src/main/native/include/wpi/{sendable/Sendable.h => util/sendable/Sendable.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{sendable/SendableBuilder.h => util/sendable/SendableBuilder.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{sendable/SendableHelper.h => util/sendable/SendableHelper.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{sendable/SendableRegistry.h => util/sendable/SendableRegistry.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{sha1.h => util/sha1.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{spinlock.h => util/spinlock.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{static_circular_buffer.h => util/static_circular_buffer.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/string.h (100%)
 rename wpiutil/src/main/native/include/wpi/{struct/DynamicStruct.h => util/struct/DynamicStruct.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{struct/SchemaParser.h => util/struct/SchemaParser.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{struct/Struct.h => util/struct/Struct.hpp} (100%)
 rename wpiutil/src/main/native/include/wpi/{ => util}/timestamp.h (100%)
 rename wpiutil/src/main/native/thirdparty/argparse/include/wpi/{argparse.h => util/argparse.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/expected/include/wpi/{ => util}/expected (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{adl_serializer.h => util/adl_serializer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{byte_container_with_subtype.h => util/byte_container_with_subtype.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/abi_macros.h => util/detail/abi_macros.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/conversions/from_json.h => util/detail/conversions/from_json.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/conversions/to_chars.h => util/detail/conversions/to_chars.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/conversions/to_json.h => util/detail/conversions/to_json.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/exceptions.h => util/detail/exceptions.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/hash.h => util/detail/hash.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/input/binary_reader.h => util/detail/input/binary_reader.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/input/input_adapters.h => util/detail/input/input_adapters.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/input/json_sax.h => util/detail/input/json_sax.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/input/lexer.h => util/detail/input/lexer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/input/parser.h => util/detail/input/parser.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/input/position_t.h => util/detail/input/position_t.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/iterators/internal_iterator.h => util/detail/iterators/internal_iterator.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/iterators/iter_impl.h => util/detail/iterators/iter_impl.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/iterators/iteration_proxy.h => util/detail/iterators/iteration_proxy.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/iterators/iterator_traits.h => util/detail/iterators/iterator_traits.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/iterators/json_reverse_iterator.h => util/detail/iterators/json_reverse_iterator.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/iterators/primitive_iterator.h => util/detail/iterators/primitive_iterator.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/json_custom_base_class.h => util/detail/json_custom_base_class.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/json_pointer.h => util/detail/json_pointer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/json_ref.h => util/detail/json_ref.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/macro_scope.h => util/detail/macro_scope.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/macro_unscope.h => util/detail/macro_unscope.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/call_std/begin.h => util/detail/meta/call_std/begin.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/call_std/end.h => util/detail/meta/call_std/end.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/cpp_future.h => util/detail/meta/cpp_future.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/detected.h => util/detail/meta/detected.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/identity_tag.h => util/detail/meta/identity_tag.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/is_sax.h => util/detail/meta/is_sax.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/std_fs.h => util/detail/meta/std_fs.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/type_traits.h => util/detail/meta/type_traits.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/meta/void_t.h => util/detail/meta/void_t.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/output/binary_writer.h => util/detail/output/binary_writer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/output/output_adapters.h => util/detail/output/output_adapters.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/output/serializer.h => util/detail/output/serializer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/string_concat.h => util/detail/string_concat.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/string_escape.h => util/detail/string_escape.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{detail/value_t.h => util/detail/value_t.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{json.h => util/json.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{json_fwd.h => util/json_fwd.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{ordered_map.h => util/ordered_map.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{thirdparty/hedley/hedley.h => util/thirdparty/hedley/hedley.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/json/include/wpi/{thirdparty/hedley/hedley_undef.h => util/thirdparty/hedley/hedley_undef.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/{WindowsSupport.h => WindowsSupport.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{ADL.h => util/ADL.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{AlignOf.h => util/AlignOf.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{AllocatorBase.h => util/AllocatorBase.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{Casting.h => util/Casting.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{Chrono.h => util/Chrono.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{Compiler.h => util/Compiler.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{ConvertUTF.h => util/ConvertUTF.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{DenseMap.h => util/DenseMap.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{DenseMapInfo.h => util/DenseMapInfo.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{DenseMapInfoVariant.h => util/DenseMapInfoVariant.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{Endian.h => util/Endian.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{EpochTracker.h => util/EpochTracker.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{Errc.h => util/Errc.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{Errno.h => util/Errno.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{ErrorHandling.h => util/ErrorHandling.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{FunctionExtras.h => util/FunctionExtras.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{MathExtras.h => util/MathExtras.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{MemAlloc.h => util/MemAlloc.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{MemoryBuffer.h => util/MemoryBuffer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{PointerIntPair.h => util/PointerIntPair.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{PointerLikeTypeTraits.h => util/PointerLikeTypeTraits.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{PointerUnion.h => util/PointerUnion.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{ReverseIteration.h => util/ReverseIteration.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{STLForwardCompat.h => util/STLForwardCompat.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{SmallPtrSet.h => util/SmallPtrSet.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{SmallSet.h => util/SmallSet.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{SmallString.h => util/SmallString.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{SmallVector.h => util/SmallVector.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{SmallVectorMemoryBuffer.h => util/SmallVectorMemoryBuffer.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{StringExtras.h => util/StringExtras.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{SwapByteOrder.h => util/SwapByteOrder.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{VersionTuple.h => util/VersionTuple.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{WindowsError.h => util/WindowsError.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{bit.h => util/bit.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{function_ref.h => util/function_ref.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{iterator.h => util/iterator.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{iterator_range.h => util/iterator_range.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{raw_os_ostream.h => util/raw_os_ostream.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{raw_ostream.h => util/raw_ostream.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/llvm/include/wpi/{type_traits.h => util/type_traits.hpp} (100%)
 rename wpiutil/src/main/native/thirdparty/mpack/include/wpi/{ => util}/mpack.h (100%)
 rename wpiutil/src/main/native/thirdparty/sigslot/include/wpi/{ => util}/Signal.h (100%)
 rename wpiutil/src/test/native/cpp/llvm/{CountCopyAndMove.h => CountCopyAndMove.hpp} (100%)
 rename wpiutil/src/test/native/cpp/proto/{TestProtoInner.h => TestProtoInner.hpp} (100%)
 rename wpiutil/src/test/native/include/wpi/{SpanMatcher.h => util/SpanMatcher.hpp} (100%)
 rename wpiutil/src/test/native/include/wpi/{TestPrinters.h => util/TestPrinters.hpp} (100%)
 rename xrpVendordep/src/main/native/include/{frc/xrp/XRPGyro.h => wpi/xrp/XRPGyro.hpp} (100%)
 rename xrpVendordep/src/main/native/include/{frc/xrp/XRPMotor.h => wpi/xrp/XRPMotor.hpp} (100%)
 rename xrpVendordep/src/main/native/include/{frc/xrp/XRPOnBoardIO.h => wpi/xrp/XRPOnBoardIO.hpp} (100%)
 rename xrpVendordep/src/main/native/include/{frc/xrp/XRPRangefinder.h => wpi/xrp/XRPRangefinder.hpp} (100%)
 rename xrpVendordep/src/main/native/include/{frc/xrp/XRPReflectanceSensor.h => wpi/xrp/XRPReflectanceSensor.hpp} (100%)
 rename xrpVendordep/src/main/native/include/{frc/xrp/XRPServo.h => wpi/xrp/XRPServo.hpp} (100%)

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