diff --git a/.styleguide b/.styleguide
index bcf6c5d214..b93b522cef 100644
--- a/.styleguide
+++ b/.styleguide
@@ -26,9 +26,14 @@ repoRootNameOverride {
 }
 
 includeOtherLibs {
-  ^HAL/
+  ^cameraserver/
+  ^cscore
+  ^hal/
+  ^mockdata/
   ^networktables/
+  ^ntcore
   ^opencv2/
   ^support/
+  ^vision/
   ^wpi/
 }
diff --git a/cameraserver/src/main/native/cpp/CameraServer.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
similarity index 99%
rename from cameraserver/src/main/native/cpp/CameraServer.cpp
rename to cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
index 4b97c33641..2a839f1b07 100644
--- a/cameraserver/src/main/native/cpp/CameraServer.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "CameraServer.h"
+#include "cameraserver/CameraServer.h"
 
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "CameraServerShared.h"
+#include "cameraserver/CameraServerShared.h"
 #include "ntcore_cpp.h"
 
 using namespace frc;
diff --git a/cameraserver/src/main/native/cpp/CameraServerShared.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
similarity index 97%
rename from cameraserver/src/main/native/cpp/CameraServerShared.cpp
rename to cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
index d00a5b5cc7..1095899961 100644
--- a/cameraserver/src/main/native/cpp/CameraServerShared.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "CameraServerShared.h"
+#include "cameraserver/CameraServerShared.h"
 
 #include <wpi/mutex.h>
 
diff --git a/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp b/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp
index ebc52c7ef2..9896bbd8b4 100644
--- a/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp
+++ b/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp
@@ -11,7 +11,7 @@
 
 #include <opencv2/core/mat.hpp>
 
-#include "CameraServerShared.h"
+#include "cameraserver/CameraServerShared.h"
 
 using namespace frc;
 
diff --git a/cameraserver/src/main/native/include/CameraServer.h b/cameraserver/src/main/native/include/cameraserver/CameraServer.h
similarity index 99%
rename from cameraserver/src/main/native/include/CameraServer.h
rename to cameraserver/src/main/native/include/cameraserver/CameraServer.h
index 916a8d64d3..6f842f5da1 100644
--- a/cameraserver/src/main/native/include/CameraServer.h
+++ b/cameraserver/src/main/native/include/cameraserver/CameraServer.h
@@ -308,4 +308,4 @@ class CameraServer {
 
 }  // namespace frc
 
-#include "CameraServer.inc"
+#include "cameraserver/CameraServer.inc"
diff --git a/cameraserver/src/main/native/include/CameraServer.inc b/cameraserver/src/main/native/include/cameraserver/CameraServer.inc
similarity index 100%
rename from cameraserver/src/main/native/include/CameraServer.inc
rename to cameraserver/src/main/native/include/cameraserver/CameraServer.inc
diff --git a/cameraserver/src/main/native/include/CameraServerShared.h b/cameraserver/src/main/native/include/cameraserver/CameraServerShared.h
similarity index 100%
rename from cameraserver/src/main/native/include/CameraServerShared.h
rename to cameraserver/src/main/native/include/cameraserver/CameraServerShared.h
diff --git a/gen/wpilibj_frcnetcomm.py b/gen/wpilibj_frcnetcomm.py
index 2e5fba1616..aba587e9a7 100755
--- a/gen/wpilibj_frcnetcomm.py
+++ b/gen/wpilibj_frcnetcomm.py
@@ -82,7 +82,7 @@ public class FRCNetComm extends JNIWrapper {
         first_enum = True
         files = [
             "/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h",
-            "/hal/src/main/native/include/HAL/UsageReporting.h"
+            "/hal/src/main/native/include/hal/UsageReporting.h"
         ]
         for file_name in files:
             with open(config_path + file_name, "r") as cpp_source:
diff --git a/hal/.styleguide b/hal/.styleguide
index 3a0be47533..49d4e29e24 100644
--- a/hal/.styleguide
+++ b/hal/.styleguide
@@ -40,4 +40,5 @@ includeOtherLibs {
 
 includeProject {
   ^ctre/
+  ^mockdata/
 }
diff --git a/hal/src/dev/native/cpp/main.cpp b/hal/src/dev/native/cpp/main.cpp
index 4b3e1f7efb..6bfa3df661 100644
--- a/hal/src/dev/native/cpp/main.cpp
+++ b/hal/src/dev/native/cpp/main.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 int main() {
   std::cout << "Hello World" << std::endl;
diff --git a/hal/src/main/native/athena/Accelerometer.cpp b/hal/src/main/native/athena/Accelerometer.cpp
index 8b47680a97..f83c06e464 100644
--- a/hal/src/main/native/athena/Accelerometer.cpp
+++ b/hal/src/main/native/athena/Accelerometer.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Accelerometer.h"
+#include "hal/Accelerometer.h"
 
 #include <stdint.h>
 
@@ -13,9 +13,9 @@
 #include <cstdio>
 #include <memory>
 
-#include "HAL/ChipObject.h"
-#include "HAL/HAL.h"
 #include "HALInitializer.h"
+#include "hal/ChipObject.h"
+#include "hal/HAL.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/AnalogAccumulator.cpp b/hal/src/main/native/athena/AnalogAccumulator.cpp
index 1560371abe..6664c528ed 100644
--- a/hal/src/main/native/athena/AnalogAccumulator.cpp
+++ b/hal/src/main/native/athena/AnalogAccumulator.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogAccumulator.h"
+#include "hal/AnalogAccumulator.h"
 
 #include "AnalogInternal.h"
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/AnalogGyro.cpp b/hal/src/main/native/athena/AnalogGyro.cpp
index 83937b1831..d7991e9d3e 100644
--- a/hal/src/main/native/athena/AnalogGyro.cpp
+++ b/hal/src/main/native/athena/AnalogGyro.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogGyro.h"
+#include "hal/AnalogGyro.h"
 
 #include <thread>
 
 #include "AnalogInternal.h"
-#include "HAL/AnalogAccumulator.h"
-#include "HAL/AnalogInput.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
+#include "hal/AnalogAccumulator.h"
+#include "hal/AnalogInput.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 namespace {
 
diff --git a/hal/src/main/native/athena/AnalogInput.cpp b/hal/src/main/native/athena/AnalogInput.cpp
index 3012ed152f..d352887cea 100644
--- a/hal/src/main/native/athena/AnalogInput.cpp
+++ b/hal/src/main/native/athena/AnalogInput.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogInput.h"
+#include "hal/AnalogInput.h"
 
 #include <FRC_NetworkCommunication/AICalibration.h>
 #include <wpi/mutex.h>
 
 #include "AnalogInternal.h"
-#include "HAL/AnalogAccumulator.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/AnalogAccumulator.h"
+#include "hal/HAL.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 namespace init {
diff --git a/hal/src/main/native/athena/AnalogInternal.cpp b/hal/src/main/native/athena/AnalogInternal.cpp
index 7dd7c3630a..6e02defc2f 100644
--- a/hal/src/main/native/athena/AnalogInternal.cpp
+++ b/hal/src/main/native/athena/AnalogInternal.cpp
@@ -11,10 +11,10 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/AnalogInput.h"
-#include "HAL/ChipObject.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/AnalogInput.h"
+#include "hal/ChipObject.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/AnalogInternal.h b/hal/src/main/native/athena/AnalogInternal.h
index e8fe89558a..a74562f593 100644
--- a/hal/src/main/native/athena/AnalogInternal.h
+++ b/hal/src/main/native/athena/AnalogInternal.h
@@ -13,10 +13,10 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/ChipObject.h"
-#include "HAL/Ports.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "PortsInternal.h"
+#include "hal/ChipObject.h"
+#include "hal/Ports.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/AnalogOutput.cpp b/hal/src/main/native/athena/AnalogOutput.cpp
index 18df2da28e..77f841bea7 100644
--- a/hal/src/main/native/athena/AnalogOutput.cpp
+++ b/hal/src/main/native/athena/AnalogOutput.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogOutput.h"
+#include "hal/AnalogOutput.h"
 
 #include "AnalogInternal.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/AnalogTrigger.cpp b/hal/src/main/native/athena/AnalogTrigger.cpp
index f7e72890cc..1841c51161 100644
--- a/hal/src/main/native/athena/AnalogTrigger.cpp
+++ b/hal/src/main/native/athena/AnalogTrigger.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogTrigger.h"
+#include "hal/AnalogTrigger.h"
 
 #include "AnalogInternal.h"
-#include "HAL/AnalogInput.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/AnalogInput.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/CAN.cpp b/hal/src/main/native/athena/CAN.cpp
index 251daef06e..81053582bf 100644
--- a/hal/src/main/native/athena/CAN.cpp
+++ b/hal/src/main/native/athena/CAN.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/CAN.h"
+#include "hal/CAN.h"
 
 #include <FRC_NetworkCommunication/CANSessionMux.h>
 
diff --git a/hal/src/main/native/athena/CANAPI.cpp b/hal/src/main/native/athena/CANAPI.cpp
index faf7a2e07c..bf60104640 100644
--- a/hal/src/main/native/athena/CANAPI.cpp
+++ b/hal/src/main/native/athena/CANAPI.cpp
@@ -5,18 +5,18 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/CANAPI.h"
+#include "hal/CANAPI.h"
 
 #include <atomic>
 #include <ctime>
 
 #include <wpi/DenseMap.h>
 
-#include "HAL/CAN.h"
-#include "HAL/Errors.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
 #include "HALInitializer.h"
+#include "hal/CAN.h"
+#include "hal/Errors.h"
+#include "hal/HAL.h"
+#include "hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Compressor.cpp b/hal/src/main/native/athena/Compressor.cpp
index 44ffdf97da..f3813055c7 100644
--- a/hal/src/main/native/athena/Compressor.cpp
+++ b/hal/src/main/native/athena/Compressor.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Compressor.h"
+#include "hal/Compressor.h"
 
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
 #include "PCMInternal.h"
 #include "PortsInternal.h"
 #include "ctre/PCM.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Constants.cpp b/hal/src/main/native/athena/Constants.cpp
index 13cf290643..6af443d9aa 100644
--- a/hal/src/main/native/athena/Constants.cpp
+++ b/hal/src/main/native/athena/Constants.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Constants.h"
+#include "hal/Constants.h"
 
 #include "ConstantsInternal.h"
 
diff --git a/hal/src/main/native/athena/Counter.cpp b/hal/src/main/native/athena/Counter.cpp
index 342807d263..6d7e254f79 100644
--- a/hal/src/main/native/athena/Counter.cpp
+++ b/hal/src/main/native/athena/Counter.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Counter.h"
+#include "hal/Counter.h"
 
 #include "ConstantsInternal.h"
 #include "DigitalInternal.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/HAL.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/DIO.cpp b/hal/src/main/native/athena/DIO.cpp
index 8e631418af..96eab2b70f 100644
--- a/hal/src/main/native/athena/DIO.cpp
+++ b/hal/src/main/native/athena/DIO.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/DIO.h"
+#include "hal/DIO.h"
 
 #include <cmath>
 #include <thread>
@@ -13,11 +13,11 @@
 #include <wpi/raw_ostream.h>
 
 #include "DigitalInternal.h"
-#include "HAL/cpp/fpga_clock.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/cpp/fpga_clock.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/DigitalInternal.cpp b/hal/src/main/native/athena/DigitalInternal.cpp
index 13b4f321d0..1db6c7e1b5 100644
--- a/hal/src/main/native/athena/DigitalInternal.cpp
+++ b/hal/src/main/native/athena/DigitalInternal.cpp
@@ -14,13 +14,13 @@
 #include <wpi/mutex.h>
 
 #include "ConstantsInternal.h"
-#include "HAL/AnalogTrigger.h"
-#include "HAL/ChipObject.h"
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
-#include "HAL/cpp/UnsafeDIO.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/ChipObject.h"
+#include "hal/HAL.h"
+#include "hal/Ports.h"
+#include "hal/cpp/UnsafeDIO.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/DigitalInternal.h b/hal/src/main/native/athena/DigitalInternal.h
index 90cdb88a1b..b486f4849c 100644
--- a/hal/src/main/native/athena/DigitalInternal.h
+++ b/hal/src/main/native/athena/DigitalInternal.h
@@ -13,13 +13,13 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/ChipObject.h"
-#include "HAL/Ports.h"
-#include "HAL/Types.h"
-#include "HAL/handles/DigitalHandleResource.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "PortsInternal.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/ChipObject.h"
+#include "hal/Ports.h"
+#include "hal/Types.h"
+#include "hal/handles/DigitalHandleResource.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/Encoder.cpp b/hal/src/main/native/athena/Encoder.cpp
index a481208c79..adf70ed6ce 100644
--- a/hal/src/main/native/athena/Encoder.cpp
+++ b/hal/src/main/native/athena/Encoder.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Encoder.h"
+#include "hal/Encoder.h"
 
 #include "EncoderInternal.h"
 #include "FPGAEncoder.h"
-#include "HAL/ChipObject.h"
-#include "HAL/Counter.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/LimitedClassedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/ChipObject.h"
+#include "hal/Counter.h"
+#include "hal/Errors.h"
+#include "hal/handles/LimitedClassedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/EncoderInternal.h b/hal/src/main/native/athena/EncoderInternal.h
index f25bb5a490..1e7ed4d70e 100644
--- a/hal/src/main/native/athena/EncoderInternal.h
+++ b/hal/src/main/native/athena/EncoderInternal.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Encoder.h"
+#include "hal/Encoder.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/FPGAEncoder.cpp b/hal/src/main/native/athena/FPGAEncoder.cpp
index ff2fe4cfc4..7f2e107b70 100644
--- a/hal/src/main/native/athena/FPGAEncoder.cpp
+++ b/hal/src/main/native/athena/FPGAEncoder.cpp
@@ -10,9 +10,9 @@
 #include <memory>
 
 #include "DigitalInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/FPGAEncoder.h b/hal/src/main/native/athena/FPGAEncoder.h
index 8c9b30eb36..f29aeae871 100644
--- a/hal/src/main/native/athena/FPGAEncoder.h
+++ b/hal/src/main/native/athena/FPGAEncoder.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Types.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Types.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp
index a0c6d1e13b..83a1790033 100644
--- a/hal/src/main/native/athena/FRCDriverStation.cpp
+++ b/hal/src/main/native/athena/FRCDriverStation.cpp
@@ -18,7 +18,7 @@
 #include <wpi/mutex.h>
 #include <wpi/raw_ostream.h>
 
-#include "HAL/DriverStation.h"
+#include "hal/DriverStation.h"
 
 static_assert(sizeof(int32_t) >= sizeof(int),
               "FRC_NetworkComm status variable is larger than 32 bits");
diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp
index 6a551d808a..68cfc8cca3 100644
--- a/hal/src/main/native/athena/HAL.cpp
+++ b/hal/src/main/native/athena/HAL.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 #include <signal.h>  // linux for kill
 #include <sys/prctl.h>
@@ -22,13 +22,13 @@
 #include <wpi/raw_ostream.h>
 #include <wpi/timestamp.h>
 
-#include "HAL/ChipObject.h"
-#include "HAL/DriverStation.h"
-#include "HAL/Errors.h"
-#include "HAL/Notifier.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
 #include "ctre/ctre.h"
+#include "hal/ChipObject.h"
+#include "hal/DriverStation.h"
+#include "hal/Errors.h"
+#include "hal/Notifier.h"
+#include "hal/handles/HandlesInternal.h"
 #include "visa/visa.h"
 
 using namespace hal;
diff --git a/hal/src/main/native/athena/HALInitializer.cpp b/hal/src/main/native/athena/HALInitializer.cpp
index d4c4394b3a..a0456d4b7c 100644
--- a/hal/src/main/native/athena/HALInitializer.cpp
+++ b/hal/src/main/native/athena/HALInitializer.cpp
@@ -7,7 +7,7 @@
 
 #include "HALInitializer.h"
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 namespace hal {
 namespace init {
diff --git a/hal/src/main/native/athena/I2C.cpp b/hal/src/main/native/athena/I2C.cpp
index 069e9e58de..44c99571f8 100644
--- a/hal/src/main/native/athena/I2C.cpp
+++ b/hal/src/main/native/athena/I2C.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/I2C.h"
+#include "hal/I2C.h"
 
 #include <fcntl.h>
 #include <linux/i2c-dev.h>
@@ -16,9 +16,9 @@
 #include <cstring>
 
 #include "DigitalInternal.h"
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
 #include "HALInitializer.h"
+#include "hal/DIO.h"
+#include "hal/HAL.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Interrupts.cpp b/hal/src/main/native/athena/Interrupts.cpp
index c3f63f6bc6..450599ea5f 100644
--- a/hal/src/main/native/athena/Interrupts.cpp
+++ b/hal/src/main/native/athena/Interrupts.cpp
@@ -5,19 +5,19 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Interrupts.h"
+#include "hal/Interrupts.h"
 
 #include <memory>
 
 #include <wpi/SafeThread.h>
 
 #include "DigitalInternal.h"
-#include "HAL/ChipObject.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/ChipObject.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Notifier.cpp b/hal/src/main/native/athena/Notifier.cpp
index 5cbbf00714..c457cd12ec 100644
--- a/hal/src/main/native/athena/Notifier.cpp
+++ b/hal/src/main/native/athena/Notifier.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Notifier.h"
+#include "hal/Notifier.h"
 
 #include <atomic>
 #include <cstdlib>  // For std::atexit()
@@ -14,11 +14,11 @@
 #include <wpi/condition_variable.h>
 #include <wpi/mutex.h>
 
-#include "HAL/ChipObject.h"
-#include "HAL/Errors.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
 #include "HALInitializer.h"
+#include "hal/ChipObject.h"
+#include "hal/Errors.h"
+#include "hal/HAL.h"
+#include "hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/PCMInternal.cpp b/hal/src/main/native/athena/PCMInternal.cpp
index 4a840b8ceb..dee64cf986 100644
--- a/hal/src/main/native/athena/PCMInternal.cpp
+++ b/hal/src/main/native/athena/PCMInternal.cpp
@@ -7,10 +7,10 @@
 
 #include "PCMInternal.h"
 
-#include "HAL/Errors.h"
-#include "HAL/Solenoid.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/Errors.h"
+#include "hal/Solenoid.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/PCMInternal.h b/hal/src/main/native/athena/PCMInternal.h
index bbd29de83a..52f0f75784 100644
--- a/hal/src/main/native/athena/PCMInternal.h
+++ b/hal/src/main/native/athena/PCMInternal.h
@@ -11,11 +11,11 @@
 
 #include <memory>
 
-#include "HAL/Errors.h"
-#include "HAL/Ports.h"
-#include "HAL/Solenoid.h"
 #include "PortsInternal.h"
 #include "ctre/PCM.h"
+#include "hal/Errors.h"
+#include "hal/Ports.h"
+#include "hal/Solenoid.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/PDP.cpp b/hal/src/main/native/athena/PDP.cpp
index 0ed1629ace..8298e9d274 100644
--- a/hal/src/main/native/athena/PDP.cpp
+++ b/hal/src/main/native/athena/PDP.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/PDP.h"
+#include "hal/PDP.h"
 
 #include <memory>
 
-#include "HAL/CANAPI.h"
-#include "HAL/Errors.h"
-#include "HAL/Ports.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/CANAPI.h"
+#include "hal/Errors.h"
+#include "hal/Ports.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/PWM.cpp b/hal/src/main/native/athena/PWM.cpp
index 7b249ba1f4..06b527cd6f 100644
--- a/hal/src/main/native/athena/PWM.cpp
+++ b/hal/src/main/native/athena/PWM.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/PWM.h"
+#include "hal/PWM.h"
 
 #include <cmath>
 #include <thread>
@@ -14,10 +14,10 @@
 
 #include "ConstantsInternal.h"
 #include "DigitalInternal.h"
-#include "HAL/cpp/fpga_clock.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/cpp/fpga_clock.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Ports.cpp b/hal/src/main/native/athena/Ports.cpp
index e3b12e1264..9a527368da 100644
--- a/hal/src/main/native/athena/Ports.cpp
+++ b/hal/src/main/native/athena/Ports.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Ports.h"
+#include "hal/Ports.h"
 
 #include "PortsInternal.h"
 
diff --git a/hal/src/main/native/athena/PortsInternal.h b/hal/src/main/native/athena/PortsInternal.h
index 6d562a68c3..b3eb6b0ed6 100644
--- a/hal/src/main/native/athena/PortsInternal.h
+++ b/hal/src/main/native/athena/PortsInternal.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/ChipObject.h"
+#include "hal/ChipObject.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/athena/Power.cpp b/hal/src/main/native/athena/Power.cpp
index 1918f9c6aa..2cf4d33292 100644
--- a/hal/src/main/native/athena/Power.cpp
+++ b/hal/src/main/native/athena/Power.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Power.h"
+#include "hal/Power.h"
 
 #include <memory>
 
-#include "HAL/ChipObject.h"
 #include "HALInitializer.h"
+#include "hal/ChipObject.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Relay.cpp b/hal/src/main/native/athena/Relay.cpp
index 219ad961d7..9f7d6c086b 100644
--- a/hal/src/main/native/athena/Relay.cpp
+++ b/hal/src/main/native/athena/Relay.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Relay.h"
+#include "hal/Relay.h"
 
 #include "DigitalInternal.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/SPI.cpp b/hal/src/main/native/athena/SPI.cpp
index 931d5ee06d..a56f1af2d8 100644
--- a/hal/src/main/native/athena/SPI.cpp
+++ b/hal/src/main/native/athena/SPI.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/SPI.h"
+#include "hal/SPI.h"
 
 #include <fcntl.h>
 #include <linux/spi/spidev.h>
@@ -20,10 +20,10 @@
 #include <wpi/raw_ostream.h>
 
 #include "DigitalInternal.h"
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
+#include "hal/DIO.h"
+#include "hal/HAL.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/SerialPort.cpp b/hal/src/main/native/athena/SerialPort.cpp
index 742e4d1b4b..d2597a94cd 100644
--- a/hal/src/main/native/athena/SerialPort.cpp
+++ b/hal/src/main/native/athena/SerialPort.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/SerialPort.h"
+#include "hal/SerialPort.h"
 
 #include <string>
 
-#include "HAL/cpp/SerialHelper.h"
 #include "HALInitializer.h"
+#include "hal/cpp/SerialHelper.h"
 #include "visa/visa.h"
 
 static int32_t resourceManagerHandle{0};
diff --git a/hal/src/main/native/athena/Solenoid.cpp b/hal/src/main/native/athena/Solenoid.cpp
index e7f43692d8..c53db11ca7 100644
--- a/hal/src/main/native/athena/Solenoid.cpp
+++ b/hal/src/main/native/athena/Solenoid.cpp
@@ -5,19 +5,19 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Solenoid.h"
+#include "hal/Solenoid.h"
 
 #include <FRC_NetworkCommunication/LoadOut.h>
 
-#include "HAL/ChipObject.h"
-#include "HAL/Errors.h"
-#include "HAL/Ports.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
 #include "PCMInternal.h"
 #include "PortsInternal.h"
 #include "ctre/PCM.h"
+#include "hal/ChipObject.h"
+#include "hal/Errors.h"
+#include "hal/Ports.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 namespace {
 
diff --git a/hal/src/main/native/athena/Threads.cpp b/hal/src/main/native/athena/Threads.cpp
index d24c28ecdc..24fdd5816f 100644
--- a/hal/src/main/native/athena/Threads.cpp
+++ b/hal/src/main/native/athena/Threads.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Threads.h"
+#include "hal/Threads.h"
 
 #include <pthread.h>
 #include <sched.h>
 
-#include "HAL/Errors.h"
+#include "hal/Errors.h"
 
 namespace hal {
 namespace init {
diff --git a/hal/src/main/native/athena/cpp/SerialHelper.cpp b/hal/src/main/native/athena/cpp/SerialHelper.cpp
index b4acbf82da..389cdbef76 100644
--- a/hal/src/main/native/athena/cpp/SerialHelper.cpp
+++ b/hal/src/main/native/athena/cpp/SerialHelper.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/cpp/SerialHelper.h"
+#include "hal/cpp/SerialHelper.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -15,7 +15,7 @@
 #include <wpi/StringRef.h>
 
 #include "../visa/visa.h"
-#include "HAL/Errors.h"
+#include "hal/Errors.h"
 
 constexpr const char* OnboardResourceVISA = "ASRL1::INSTR";
 constexpr const char* MxpResourceVISA = "ASRL2::INSTR";
diff --git a/hal/src/main/native/cpp/cpp/fpga_clock.cpp b/hal/src/main/native/cpp/cpp/fpga_clock.cpp
index 5ab2fcaac5..751eae1327 100644
--- a/hal/src/main/native/cpp/cpp/fpga_clock.cpp
+++ b/hal/src/main/native/cpp/cpp/fpga_clock.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/cpp/fpga_clock.h"
+#include "hal/cpp/fpga_clock.h"
 
 #include <wpi/raw_ostream.h>
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 namespace hal {
 const fpga_clock::time_point fpga_clock::min_time =
diff --git a/hal/src/main/native/cpp/handles/HandlesInternal.cpp b/hal/src/main/native/cpp/handles/HandlesInternal.cpp
index f72b7f0b41..45ffb31287 100644
--- a/hal/src/main/native/cpp/handles/HandlesInternal.cpp
+++ b/hal/src/main/native/cpp/handles/HandlesInternal.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/handles/HandlesInternal.h"
+#include "hal/handles/HandlesInternal.h"
 
 #include <algorithm>
 
diff --git a/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp b/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp
index 2405d2f0a9..5cbd752b7a 100644
--- a/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp
@@ -7,8 +7,8 @@
 
 #include <jni.h>
 
-#include "HAL/Accelerometer.h"
 #include "edu_wpi_first_wpilibj_hal_AccelerometerJNI.h"
+#include "hal/Accelerometer.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp
index 7ea9bb5427..91d75409a6 100644
--- a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp
@@ -9,11 +9,11 @@
 
 #include <cassert>
 
-#include "HAL/AnalogGyro.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_AnalogGyroJNI.h"
+#include "hal/AnalogGyro.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/AnalogJNI.cpp b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
index 82b5c9ad72..b4cc8b9a07 100644
--- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
@@ -9,15 +9,15 @@
 
 #include <cassert>
 
-#include "HAL/AnalogAccumulator.h"
-#include "HAL/AnalogInput.h"
-#include "HAL/AnalogOutput.h"
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Ports.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_AnalogJNI.h"
+#include "hal/AnalogAccumulator.h"
+#include "hal/AnalogInput.h"
+#include "hal/AnalogOutput.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Ports.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
index 1ff21ea0f8..db163b20c8 100644
--- a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
@@ -13,12 +13,12 @@
 #include <wpi/jni_util.h>
 #include <wpi/raw_ostream.h>
 
-#include "HAL/CAN.h"
-#include "HAL/CANAPI.h"
-#include "HAL/Errors.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_CANAPIJNI.h"
+#include "hal/CAN.h"
+#include "hal/CANAPI.h"
+#include "hal/Errors.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/CANJNI.cpp b/hal/src/main/native/cpp/jni/CANJNI.cpp
index 2238d37621..6d2cf3e04b 100644
--- a/hal/src/main/native/cpp/jni/CANJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANJNI.cpp
@@ -13,10 +13,10 @@
 #include <wpi/jni_util.h>
 #include <wpi/raw_ostream.h>
 
-#include "HAL/CAN.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_can_CANJNI.h"
+#include "hal/CAN.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/CompressorJNI.cpp b/hal/src/main/native/cpp/jni/CompressorJNI.cpp
index 3565882fd0..5e02d46138 100644
--- a/hal/src/main/native/cpp/jni/CompressorJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CompressorJNI.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Compressor.h"
-#include "HAL/Ports.h"
-#include "HAL/Solenoid.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_CompressorJNI.h"
+#include "hal/Compressor.h"
+#include "hal/Ports.h"
+#include "hal/Solenoid.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp
index 07205d00ab..f6b09231d6 100644
--- a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp
@@ -9,10 +9,10 @@
 
 #include <cassert>
 
-#include "HAL/Constants.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_ConstantsJNI.h"
+#include "hal/Constants.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp
index 60548c9afc..5956d9b830 100644
--- a/hal/src/main/native/cpp/jni/CounterJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp
@@ -9,11 +9,11 @@
 
 #include <cassert>
 
-#include "HAL/Counter.h"
-#include "HAL/Errors.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_CounterJNI.h"
+#include "hal/Counter.h"
+#include "hal/Errors.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp
index 9f2df7aab0..e52775a276 100644
--- a/hal/src/main/native/cpp/jni/DIOJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp
@@ -9,13 +9,13 @@
 
 #include <cassert>
 
-#include "HAL/DIO.h"
-#include "HAL/PWM.h"
-#include "HAL/Ports.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_DIOJNI.h"
+#include "hal/DIO.h"
+#include "hal/PWM.h"
+#include "hal/Ports.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp b/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp
index 746e3c5de0..231fc92daa 100644
--- a/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp
@@ -7,9 +7,9 @@
 
 #include <jni.h>
 
-#include "HAL/DIO.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI.h"
+#include "hal/DIO.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/EncoderJNI.cpp b/hal/src/main/native/cpp/jni/EncoderJNI.cpp
index 1dc3194d50..06f612d569 100644
--- a/hal/src/main/native/cpp/jni/EncoderJNI.cpp
+++ b/hal/src/main/native/cpp/jni/EncoderJNI.cpp
@@ -9,11 +9,11 @@
 
 #include <cassert>
 
-#include "HAL/Encoder.h"
-#include "HAL/Errors.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_EncoderJNI.h"
+#include "hal/Encoder.h"
+#include "hal/Errors.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp
index ba2d4ec9ef..1b68254ec0 100644
--- a/hal/src/main/native/cpp/jni/HAL.cpp
+++ b/hal/src/main/native/cpp/jni/HAL.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 #include <jni.h>
 
@@ -14,10 +14,10 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/DriverStation.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_HAL.h"
+#include "hal/DriverStation.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp
index bf87a65c4a..7cef9a9049 100644
--- a/hal/src/main/native/cpp/jni/HALUtil.cpp
+++ b/hal/src/main/native/cpp/jni/HALUtil.cpp
@@ -19,12 +19,12 @@
 #include <wpi/jni_util.h>
 #include <wpi/raw_ostream.h>
 
-#include "HAL/CAN.h"
-#include "HAL/DriverStation.h"
-#include "HAL/Errors.h"
-#include "HAL/HAL.h"
-#include "HAL/cpp/Log.h"
 #include "edu_wpi_first_wpilibj_hal_HALUtil.h"
+#include "hal/CAN.h"
+#include "hal/DriverStation.h"
+#include "hal/Errors.h"
+#include "hal/HAL.h"
+#include "hal/cpp/Log.h"
 
 using namespace wpi::java;
 
diff --git a/hal/src/main/native/cpp/jni/I2CJNI.cpp b/hal/src/main/native/cpp/jni/I2CJNI.cpp
index e5123997ee..3c3056b8dc 100644
--- a/hal/src/main/native/cpp/jni/I2CJNI.cpp
+++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp
@@ -11,10 +11,10 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/I2C.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_I2CJNI.h"
+#include "hal/I2C.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/InterruptJNI.cpp b/hal/src/main/native/cpp/jni/InterruptJNI.cpp
index 176f8e5f71..1716a2c4da 100644
--- a/hal/src/main/native/cpp/jni/InterruptJNI.cpp
+++ b/hal/src/main/native/cpp/jni/InterruptJNI.cpp
@@ -14,10 +14,10 @@
 #include <wpi/SafeThread.h>
 #include <wpi/mutex.h>
 
-#include "HAL/Interrupts.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_InterruptJNI.h"
+#include "hal/Interrupts.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/NotifierJNI.cpp b/hal/src/main/native/cpp/jni/NotifierJNI.cpp
index 0befd678ba..020d44a38e 100644
--- a/hal/src/main/native/cpp/jni/NotifierJNI.cpp
+++ b/hal/src/main/native/cpp/jni/NotifierJNI.cpp
@@ -10,10 +10,10 @@
 #include <cassert>
 #include <cstdio>
 
-#include "HAL/Notifier.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_NotifierJNI.h"
+#include "hal/Notifier.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/PDPJNI.cpp b/hal/src/main/native/cpp/jni/PDPJNI.cpp
index f3d1de17b4..be665269bb 100644
--- a/hal/src/main/native/cpp/jni/PDPJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PDPJNI.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/PDP.h"
-#include "HAL/Ports.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_PDPJNI.h"
+#include "hal/PDP.h"
+#include "hal/Ports.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp
index ffbf5064d9..036983f118 100644
--- a/hal/src/main/native/cpp/jni/PWMJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp
@@ -9,13 +9,13 @@
 
 #include <cassert>
 
-#include "HAL/DIO.h"
-#include "HAL/PWM.h"
-#include "HAL/Ports.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_PWMJNI.h"
+#include "hal/DIO.h"
+#include "hal/PWM.h"
+#include "hal/Ports.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/PortsJNI.cpp b/hal/src/main/native/cpp/jni/PortsJNI.cpp
index e09d6879f5..a90c1ddcef 100644
--- a/hal/src/main/native/cpp/jni/PortsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp
@@ -9,10 +9,10 @@
 
 #include <cassert>
 
-#include "HAL/Ports.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_PortsJNI.h"
+#include "hal/Ports.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/PowerJNI.cpp b/hal/src/main/native/cpp/jni/PowerJNI.cpp
index a21ceaf365..bdc9d6baeb 100644
--- a/hal/src/main/native/cpp/jni/PowerJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PowerJNI.cpp
@@ -7,9 +7,9 @@
 
 #include <jni.h>
 
-#include "HAL/Power.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_PowerJNI.h"
+#include "hal/Power.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/RelayJNI.cpp b/hal/src/main/native/cpp/jni/RelayJNI.cpp
index 317d432607..cd185cb2ee 100644
--- a/hal/src/main/native/cpp/jni/RelayJNI.cpp
+++ b/hal/src/main/native/cpp/jni/RelayJNI.cpp
@@ -9,12 +9,12 @@
 
 #include <cassert>
 
-#include "HAL/Ports.h"
-#include "HAL/Relay.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_RelayJNI.h"
+#include "hal/Ports.h"
+#include "hal/Relay.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/SPIJNI.cpp b/hal/src/main/native/cpp/jni/SPIJNI.cpp
index e031a8c720..b960573f61 100644
--- a/hal/src/main/native/cpp/jni/SPIJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SPIJNI.cpp
@@ -11,10 +11,10 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/SPI.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_SPIJNI.h"
+#include "hal/SPI.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
index 5fe51721be..b9ac46749a 100644
--- a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
@@ -11,10 +11,10 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/SerialPort.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_SerialPortJNI.h"
+#include "hal/SerialPort.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp
index 9711c9972b..4a036385bd 100644
--- a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp
@@ -7,12 +7,12 @@
 
 #include <jni.h>
 
-#include "HAL/Ports.h"
-#include "HAL/Solenoid.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_SolenoidJNI.h"
+#include "hal/Ports.h"
+#include "hal/Solenoid.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp
index 572763387c..7a5eccb597 100644
--- a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp
@@ -9,10 +9,10 @@
 
 #include <cassert>
 
-#include "HAL/Threads.h"
-#include "HAL/cpp/Log.h"
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_ThreadsJNI.h"
+#include "hal/Threads.h"
+#include "hal/cpp/Log.h"
 
 using namespace frc;
 
diff --git a/hal/src/main/native/include/HAL/Accelerometer.h b/hal/src/main/native/include/hal/Accelerometer.h
similarity index 98%
rename from hal/src/main/native/include/HAL/Accelerometer.h
rename to hal/src/main/native/include/hal/Accelerometer.h
index 880d47e277..4871b52dff 100644
--- a/hal/src/main/native/include/HAL/Accelerometer.h
+++ b/hal/src/main/native/include/hal/Accelerometer.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 // clang-format off
 /**
diff --git a/hal/src/main/native/include/HAL/AnalogAccumulator.h b/hal/src/main/native/include/hal/AnalogAccumulator.h
similarity index 99%
rename from hal/src/main/native/include/HAL/AnalogAccumulator.h
rename to hal/src/main/native/include/hal/AnalogAccumulator.h
index bcc88852b7..756b3072a2 100644
--- a/hal/src/main/native/include/HAL/AnalogAccumulator.h
+++ b/hal/src/main/native/include/hal/AnalogAccumulator.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/AnalogGyro.h b/hal/src/main/native/include/hal/AnalogGyro.h
similarity index 99%
rename from hal/src/main/native/include/HAL/AnalogGyro.h
rename to hal/src/main/native/include/hal/AnalogGyro.h
index 2ee8df408c..997317d47c 100644
--- a/hal/src/main/native/include/HAL/AnalogGyro.h
+++ b/hal/src/main/native/include/hal/AnalogGyro.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/AnalogInput.h b/hal/src/main/native/include/hal/AnalogInput.h
similarity index 99%
rename from hal/src/main/native/include/HAL/AnalogInput.h
rename to hal/src/main/native/include/hal/AnalogInput.h
index 445d6f54b7..8fc3bc6a7c 100644
--- a/hal/src/main/native/include/HAL/AnalogInput.h
+++ b/hal/src/main/native/include/hal/AnalogInput.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/AnalogOutput.h b/hal/src/main/native/include/hal/AnalogOutput.h
similarity index 98%
rename from hal/src/main/native/include/HAL/AnalogOutput.h
rename to hal/src/main/native/include/hal/AnalogOutput.h
index d0884294f0..ef45da1c94 100644
--- a/hal/src/main/native/include/HAL/AnalogOutput.h
+++ b/hal/src/main/native/include/hal/AnalogOutput.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/AnalogTrigger.h b/hal/src/main/native/include/hal/AnalogTrigger.h
similarity index 99%
rename from hal/src/main/native/include/HAL/AnalogTrigger.h
rename to hal/src/main/native/include/hal/AnalogTrigger.h
index f642ba9386..2ddb01910e 100644
--- a/hal/src/main/native/include/HAL/AnalogTrigger.h
+++ b/hal/src/main/native/include/hal/AnalogTrigger.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 // clang-format off
 /**
diff --git a/hal/src/main/native/include/HAL/CAN.h b/hal/src/main/native/include/hal/CAN.h
similarity index 99%
rename from hal/src/main/native/include/HAL/CAN.h
rename to hal/src/main/native/include/hal/CAN.h
index 01da4ff34a..e49f99cabc 100644
--- a/hal/src/main/native/include/HAL/CAN.h
+++ b/hal/src/main/native/include/hal/CAN.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 // These are copies of defines located in CANSessionMux.h prepended with HAL_
 
diff --git a/hal/src/main/native/include/HAL/CANAPI.h b/hal/src/main/native/include/hal/CANAPI.h
similarity index 99%
rename from hal/src/main/native/include/HAL/CANAPI.h
rename to hal/src/main/native/include/hal/CANAPI.h
index f4fff3cc25..67d7160f5d 100644
--- a/hal/src/main/native/include/HAL/CANAPI.h
+++ b/hal/src/main/native/include/hal/CANAPI.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 // clang-format off
 /**
diff --git a/hal/src/main/native/include/HAL/ChipObject.h b/hal/src/main/native/include/hal/ChipObject.h
similarity index 100%
rename from hal/src/main/native/include/HAL/ChipObject.h
rename to hal/src/main/native/include/hal/ChipObject.h
diff --git a/hal/src/main/native/include/HAL/Compressor.h b/hal/src/main/native/include/hal/Compressor.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Compressor.h
rename to hal/src/main/native/include/hal/Compressor.h
index 664dbe8af7..74ba45e4fd 100644
--- a/hal/src/main/native/include/HAL/Compressor.h
+++ b/hal/src/main/native/include/hal/Compressor.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/Constants.h b/hal/src/main/native/include/hal/Constants.h
similarity index 100%
rename from hal/src/main/native/include/HAL/Constants.h
rename to hal/src/main/native/include/hal/Constants.h
diff --git a/hal/src/main/native/include/HAL/Counter.h b/hal/src/main/native/include/hal/Counter.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Counter.h
rename to hal/src/main/native/include/hal/Counter.h
index 89ab8d4117..8949708d16 100644
--- a/hal/src/main/native/include/HAL/Counter.h
+++ b/hal/src/main/native/include/hal/Counter.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Types.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Types.h"
 
 // clang-format off
 /**
diff --git a/hal/src/main/native/include/HAL/DIO.h b/hal/src/main/native/include/hal/DIO.h
similarity index 99%
rename from hal/src/main/native/include/HAL/DIO.h
rename to hal/src/main/native/include/hal/DIO.h
index 0756dd0fe5..542aaaf009 100644
--- a/hal/src/main/native/include/HAL/DIO.h
+++ b/hal/src/main/native/include/hal/DIO.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/DriverStation.h b/hal/src/main/native/include/hal/DriverStation.h
similarity index 99%
rename from hal/src/main/native/include/HAL/DriverStation.h
rename to hal/src/main/native/include/hal/DriverStation.h
index 31c38d87c3..f4fd59e744 100644
--- a/hal/src/main/native/include/HAL/DriverStation.h
+++ b/hal/src/main/native/include/hal/DriverStation.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #define HAL_IO_CONFIG_DATA_SIZE 32
 #define HAL_SYS_STATUS_DATA_SIZE 44
diff --git a/hal/src/main/native/include/HAL/Encoder.h b/hal/src/main/native/include/hal/Encoder.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Encoder.h
rename to hal/src/main/native/include/hal/Encoder.h
index ca6c16bd16..093f8683b2 100644
--- a/hal/src/main/native/include/HAL/Encoder.h
+++ b/hal/src/main/native/include/hal/Encoder.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Types.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Types.h"
 
 // clang-format off
 /**
diff --git a/hal/src/main/native/include/HAL/Errors.h b/hal/src/main/native/include/hal/Errors.h
similarity index 100%
rename from hal/src/main/native/include/HAL/Errors.h
rename to hal/src/main/native/include/hal/Errors.h
diff --git a/hal/src/main/native/include/HAL/Extensions.h b/hal/src/main/native/include/hal/Extensions.h
similarity index 100%
rename from hal/src/main/native/include/HAL/Extensions.h
rename to hal/src/main/native/include/hal/Extensions.h
diff --git a/hal/src/main/native/include/HAL/HAL.h b/hal/src/main/native/include/hal/HAL.h
similarity index 89%
rename from hal/src/main/native/include/HAL/HAL.h
rename to hal/src/main/native/include/hal/HAL.h
index 22e6bcd201..adb8021321 100644
--- a/hal/src/main/native/include/HAL/HAL.h
+++ b/hal/src/main/native/include/hal/HAL.h
@@ -11,34 +11,34 @@
 
 #ifndef HAL_USE_LABVIEW
 
-#include "HAL/Accelerometer.h"
-#include "HAL/AnalogAccumulator.h"
-#include "HAL/AnalogGyro.h"
-#include "HAL/AnalogInput.h"
-#include "HAL/AnalogOutput.h"
-#include "HAL/AnalogTrigger.h"
-#include "HAL/CAN.h"
-#include "HAL/Compressor.h"
-#include "HAL/Constants.h"
-#include "HAL/Counter.h"
-#include "HAL/DIO.h"
-#include "HAL/DriverStation.h"
-#include "HAL/Errors.h"
-#include "HAL/I2C.h"
-#include "HAL/Interrupts.h"
-#include "HAL/Notifier.h"
-#include "HAL/PDP.h"
-#include "HAL/PWM.h"
-#include "HAL/Ports.h"
-#include "HAL/Power.h"
-#include "HAL/Relay.h"
-#include "HAL/SPI.h"
-#include "HAL/SerialPort.h"
-#include "HAL/Solenoid.h"
+#include "hal/Accelerometer.h"
+#include "hal/AnalogAccumulator.h"
+#include "hal/AnalogGyro.h"
+#include "hal/AnalogInput.h"
+#include "hal/AnalogOutput.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/CAN.h"
+#include "hal/Compressor.h"
+#include "hal/Constants.h"
+#include "hal/Counter.h"
+#include "hal/DIO.h"
+#include "hal/DriverStation.h"
+#include "hal/Errors.h"
+#include "hal/I2C.h"
+#include "hal/Interrupts.h"
+#include "hal/Notifier.h"
+#include "hal/PDP.h"
+#include "hal/PWM.h"
+#include "hal/Ports.h"
+#include "hal/Power.h"
+#include "hal/Relay.h"
+#include "hal/SPI.h"
+#include "hal/SerialPort.h"
+#include "hal/Solenoid.h"
 
 #endif  // HAL_USE_LABVIEW
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 #include "UsageReporting.h"
diff --git a/hal/src/main/native/include/HAL/I2C.h b/hal/src/main/native/include/hal/I2C.h
similarity index 99%
rename from hal/src/main/native/include/HAL/I2C.h
rename to hal/src/main/native/include/hal/I2C.h
index a71f92da75..11935bf6aa 100644
--- a/hal/src/main/native/include/HAL/I2C.h
+++ b/hal/src/main/native/include/hal/I2C.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 // clang-format off
 HAL_ENUM(HAL_I2CPort) { HAL_I2C_kOnboard = 0, HAL_I2C_kMXP };
diff --git a/hal/src/main/native/include/HAL/Interrupts.h b/hal/src/main/native/include/hal/Interrupts.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Interrupts.h
rename to hal/src/main/native/include/hal/Interrupts.h
index a98095a276..5b20460e4e 100644
--- a/hal/src/main/native/include/HAL/Interrupts.h
+++ b/hal/src/main/native/include/hal/Interrupts.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Types.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/Notifier.h b/hal/src/main/native/include/hal/Notifier.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Notifier.h
rename to hal/src/main/native/include/hal/Notifier.h
index 33a61654b8..7ac561f13e 100644
--- a/hal/src/main/native/include/HAL/Notifier.h
+++ b/hal/src/main/native/include/hal/Notifier.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/PDP.h b/hal/src/main/native/include/hal/PDP.h
similarity index 99%
rename from hal/src/main/native/include/HAL/PDP.h
rename to hal/src/main/native/include/hal/PDP.h
index 8a90cf737f..e1ffef20ef 100644
--- a/hal/src/main/native/include/HAL/PDP.h
+++ b/hal/src/main/native/include/hal/PDP.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/PWM.h b/hal/src/main/native/include/hal/PWM.h
similarity index 99%
rename from hal/src/main/native/include/HAL/PWM.h
rename to hal/src/main/native/include/hal/PWM.h
index 90f26571c8..08cc690a0a 100644
--- a/hal/src/main/native/include/HAL/PWM.h
+++ b/hal/src/main/native/include/hal/PWM.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/Ports.h b/hal/src/main/native/include/hal/Ports.h
similarity index 100%
rename from hal/src/main/native/include/HAL/Ports.h
rename to hal/src/main/native/include/hal/Ports.h
diff --git a/hal/src/main/native/include/HAL/Power.h b/hal/src/main/native/include/hal/Power.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Power.h
rename to hal/src/main/native/include/hal/Power.h
index 721b48788b..24baf4d2b6 100644
--- a/hal/src/main/native/include/HAL/Power.h
+++ b/hal/src/main/native/include/hal/Power.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/Relay.h b/hal/src/main/native/include/hal/Relay.h
similarity index 98%
rename from hal/src/main/native/include/HAL/Relay.h
rename to hal/src/main/native/include/hal/Relay.h
index 655f26dacb..6c377348e4 100644
--- a/hal/src/main/native/include/HAL/Relay.h
+++ b/hal/src/main/native/include/hal/Relay.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/SPI.h b/hal/src/main/native/include/hal/SPI.h
similarity index 99%
rename from hal/src/main/native/include/HAL/SPI.h
rename to hal/src/main/native/include/hal/SPI.h
index a197fccda4..e85a4f7e50 100644
--- a/hal/src/main/native/include/HAL/SPI.h
+++ b/hal/src/main/native/include/hal/SPI.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Types.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Types.h"
 
 // clang-format off
 HAL_ENUM(HAL_SPIPort) {
diff --git a/hal/src/main/native/include/HAL/SerialPort.h b/hal/src/main/native/include/hal/SerialPort.h
similarity index 99%
rename from hal/src/main/native/include/HAL/SerialPort.h
rename to hal/src/main/native/include/hal/SerialPort.h
index 3adb4003cc..e4e19f74a3 100644
--- a/hal/src/main/native/include/HAL/SerialPort.h
+++ b/hal/src/main/native/include/hal/SerialPort.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 // clang-format off
 HAL_ENUM(HAL_SerialPort) {
diff --git a/hal/src/main/native/include/HAL/Solenoid.h b/hal/src/main/native/include/hal/Solenoid.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Solenoid.h
rename to hal/src/main/native/include/hal/Solenoid.h
index c9022137a0..35a26a8b4d 100644
--- a/hal/src/main/native/include/HAL/Solenoid.h
+++ b/hal/src/main/native/include/hal/Solenoid.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/HAL/Threads.h b/hal/src/main/native/include/hal/Threads.h
similarity index 99%
rename from hal/src/main/native/include/HAL/Threads.h
rename to hal/src/main/native/include/hal/Threads.h
index 725f744a7b..6ce0351373 100644
--- a/hal/src/main/native/include/HAL/Threads.h
+++ b/hal/src/main/native/include/hal/Threads.h
@@ -15,7 +15,7 @@
 #define NativeThreadHandle const pthread_t*
 #endif
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 extern "C" {
 /**
diff --git a/hal/src/main/native/include/HAL/Types.h b/hal/src/main/native/include/hal/Types.h
similarity index 100%
rename from hal/src/main/native/include/HAL/Types.h
rename to hal/src/main/native/include/hal/Types.h
diff --git a/hal/src/main/native/include/HAL/UsageReporting.h b/hal/src/main/native/include/hal/UsageReporting.h
similarity index 100%
rename from hal/src/main/native/include/HAL/UsageReporting.h
rename to hal/src/main/native/include/hal/UsageReporting.h
diff --git a/hal/src/main/native/include/HAL/cpp/Log.h b/hal/src/main/native/include/hal/cpp/Log.h
similarity index 100%
rename from hal/src/main/native/include/HAL/cpp/Log.h
rename to hal/src/main/native/include/hal/cpp/Log.h
diff --git a/hal/src/main/native/include/HAL/cpp/SerialHelper.h b/hal/src/main/native/include/hal/cpp/SerialHelper.h
similarity index 98%
rename from hal/src/main/native/include/HAL/cpp/SerialHelper.h
rename to hal/src/main/native/include/hal/cpp/SerialHelper.h
index df33529e2c..9f4d6a07c0 100644
--- a/hal/src/main/native/include/HAL/cpp/SerialHelper.h
+++ b/hal/src/main/native/include/hal/cpp/SerialHelper.h
@@ -16,7 +16,7 @@
 #include <wpi/SmallVector.h>
 #include <wpi/mutex.h>
 
-#include "HAL/SerialPort.h"
+#include "hal/SerialPort.h"
 
 namespace hal {
 /**
diff --git a/hal/src/main/native/include/HAL/cpp/UnsafeDIO.h b/hal/src/main/native/include/hal/cpp/UnsafeDIO.h
similarity index 98%
rename from hal/src/main/native/include/HAL/cpp/UnsafeDIO.h
rename to hal/src/main/native/include/hal/cpp/UnsafeDIO.h
index aefb4fade5..ceb41c30bf 100644
--- a/hal/src/main/native/include/HAL/cpp/UnsafeDIO.h
+++ b/hal/src/main/native/include/hal/cpp/UnsafeDIO.h
@@ -9,8 +9,8 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/ChipObject.h"
-#include "HAL/Types.h"
+#include "hal/ChipObject.h"
+#include "hal/Types.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/cpp/fpga_clock.h b/hal/src/main/native/include/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/hal/cpp/fpga_clock.h
diff --git a/hal/src/main/native/include/HAL/handles/DigitalHandleResource.h b/hal/src/main/native/include/hal/handles/DigitalHandleResource.h
similarity index 97%
rename from hal/src/main/native/include/HAL/handles/DigitalHandleResource.h
rename to hal/src/main/native/include/hal/handles/DigitalHandleResource.h
index 305ce03157..23fb6768fe 100644
--- a/hal/src/main/native/include/HAL/handles/DigitalHandleResource.h
+++ b/hal/src/main/native/include/hal/handles/DigitalHandleResource.h
@@ -14,9 +14,9 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/Errors.h"
-#include "HAL/Types.h"
-#include "HAL/handles/HandlesInternal.h"
+#include "hal/Errors.h"
+#include "hal/Types.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/handles/HandlesInternal.h b/hal/src/main/native/include/hal/handles/HandlesInternal.h
similarity index 99%
rename from hal/src/main/native/include/HAL/handles/HandlesInternal.h
rename to hal/src/main/native/include/hal/handles/HandlesInternal.h
index 25ba56f83b..85b349347c 100644
--- a/hal/src/main/native/include/HAL/handles/HandlesInternal.h
+++ b/hal/src/main/native/include/hal/handles/HandlesInternal.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 /* General Handle Data Layout
  * Bits 0-15:  Handle Index
diff --git a/hal/src/main/native/include/HAL/handles/IndexedClassedHandleResource.h b/hal/src/main/native/include/hal/handles/IndexedClassedHandleResource.h
similarity index 97%
rename from hal/src/main/native/include/HAL/handles/IndexedClassedHandleResource.h
rename to hal/src/main/native/include/hal/handles/IndexedClassedHandleResource.h
index 62b55a3f91..a038e04c66 100644
--- a/hal/src/main/native/include/HAL/handles/IndexedClassedHandleResource.h
+++ b/hal/src/main/native/include/hal/handles/IndexedClassedHandleResource.h
@@ -15,9 +15,9 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/Errors.h"
-#include "HAL/Types.h"
-#include "HAL/handles/HandlesInternal.h"
+#include "hal/Errors.h"
+#include "hal/Types.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/handles/IndexedHandleResource.h b/hal/src/main/native/include/hal/handles/IndexedHandleResource.h
similarity index 97%
rename from hal/src/main/native/include/HAL/handles/IndexedHandleResource.h
rename to hal/src/main/native/include/hal/handles/IndexedHandleResource.h
index a320b2b015..39abf583e1 100644
--- a/hal/src/main/native/include/HAL/handles/IndexedHandleResource.h
+++ b/hal/src/main/native/include/hal/handles/IndexedHandleResource.h
@@ -14,9 +14,9 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/Errors.h"
-#include "HAL/Types.h"
-#include "HAL/handles/HandlesInternal.h"
+#include "hal/Errors.h"
+#include "hal/Types.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/handles/LimitedClassedHandleResource.h b/hal/src/main/native/include/hal/handles/LimitedClassedHandleResource.h
similarity index 98%
rename from hal/src/main/native/include/HAL/handles/LimitedClassedHandleResource.h
rename to hal/src/main/native/include/hal/handles/LimitedClassedHandleResource.h
index 8f7a4a568b..272312952a 100644
--- a/hal/src/main/native/include/HAL/handles/LimitedClassedHandleResource.h
+++ b/hal/src/main/native/include/hal/handles/LimitedClassedHandleResource.h
@@ -14,8 +14,8 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/HandlesInternal.h"
+#include "hal/Types.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/handles/LimitedHandleResource.h b/hal/src/main/native/include/hal/handles/LimitedHandleResource.h
similarity index 99%
rename from hal/src/main/native/include/HAL/handles/LimitedHandleResource.h
rename to hal/src/main/native/include/hal/handles/LimitedHandleResource.h
index 8fbc1b0272..a53582952c 100644
--- a/hal/src/main/native/include/HAL/handles/LimitedHandleResource.h
+++ b/hal/src/main/native/include/hal/handles/LimitedHandleResource.h
@@ -14,8 +14,8 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/Types.h"
 #include "HandlesInternal.h"
+#include "hal/Types.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/handles/UnlimitedHandleResource.h b/hal/src/main/native/include/hal/handles/UnlimitedHandleResource.h
similarity index 98%
rename from hal/src/main/native/include/HAL/handles/UnlimitedHandleResource.h
rename to hal/src/main/native/include/hal/handles/UnlimitedHandleResource.h
index 15d343be70..7df8061d69 100644
--- a/hal/src/main/native/include/HAL/handles/UnlimitedHandleResource.h
+++ b/hal/src/main/native/include/hal/handles/UnlimitedHandleResource.h
@@ -15,8 +15,8 @@
 
 #include <wpi/mutex.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/HandlesInternal.h"
+#include "hal/Types.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/HAL/LabVIEW/HAL.h b/hal/src/main/native/include/hal/labview/HAL.h
similarity index 87%
rename from hal/src/main/native/include/HAL/LabVIEW/HAL.h
rename to hal/src/main/native/include/hal/labview/HAL.h
index 4268a613b2..db9f20fdb4 100644
--- a/hal/src/main/native/include/HAL/LabVIEW/HAL.h
+++ b/hal/src/main/native/include/hal/labview/HAL.h
@@ -9,6 +9,6 @@
 
 #define HAL_USE_LABVIEW
 
-#include "HAL/DriverStation.h"
-#include "HAL/HAL.h"
-#include "HAL/Types.h"
+#include "hal/DriverStation.h"
+#include "hal/HAL.h"
+#include "hal/Types.h"
diff --git a/hal/src/main/native/include/MockData/AccelerometerData.h b/hal/src/main/native/include/mockdata/AccelerometerData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/AccelerometerData.h
rename to hal/src/main/native/include/mockdata/AccelerometerData.h
index dcf7b14042..7591fbda85 100644
--- a/hal/src/main/native/include/MockData/AccelerometerData.h
+++ b/hal/src/main/native/include/mockdata/AccelerometerData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/AnalogGyroData.h b/hal/src/main/native/include/mockdata/AnalogGyroData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/AnalogGyroData.h
rename to hal/src/main/native/include/mockdata/AnalogGyroData.h
index b15ddd5a48..15a35a2f95 100644
--- a/hal/src/main/native/include/MockData/AnalogGyroData.h
+++ b/hal/src/main/native/include/mockdata/AnalogGyroData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/AnalogInData.h b/hal/src/main/native/include/mockdata/AnalogInData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/AnalogInData.h
rename to hal/src/main/native/include/mockdata/AnalogInData.h
index 1e46b54ea4..0eb6f44a74 100644
--- a/hal/src/main/native/include/MockData/AnalogInData.h
+++ b/hal/src/main/native/include/mockdata/AnalogInData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/AnalogOutData.h b/hal/src/main/native/include/mockdata/AnalogOutData.h
similarity index 98%
rename from hal/src/main/native/include/MockData/AnalogOutData.h
rename to hal/src/main/native/include/mockdata/AnalogOutData.h
index c1721df4d4..8ffa86b02a 100644
--- a/hal/src/main/native/include/MockData/AnalogOutData.h
+++ b/hal/src/main/native/include/mockdata/AnalogOutData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/AnalogTriggerData.h b/hal/src/main/native/include/mockdata/AnalogTriggerData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/AnalogTriggerData.h
rename to hal/src/main/native/include/mockdata/AnalogTriggerData.h
index 848f16ac45..cc2201efc9 100644
--- a/hal/src/main/native/include/MockData/AnalogTriggerData.h
+++ b/hal/src/main/native/include/mockdata/AnalogTriggerData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 enum HALSIM_AnalogTriggerMode : int32_t {
   HALSIM_AnalogTriggerUnassigned,
diff --git a/hal/src/main/native/include/MockData/CanData.h b/hal/src/main/native/include/mockdata/CanData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/CanData.h
rename to hal/src/main/native/include/mockdata/CanData.h
index ca91b03a02..95568541dd 100644
--- a/hal/src/main/native/include/MockData/CanData.h
+++ b/hal/src/main/native/include/mockdata/CanData.h
@@ -9,9 +9,9 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "HAL_Value.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 typedef void (*HAL_CAN_SendMessageCallback)(const char* name, void* param,
                                             uint32_t messageID,
diff --git a/hal/src/main/native/include/MockData/DIOData.h b/hal/src/main/native/include/mockdata/DIOData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/DIOData.h
rename to hal/src/main/native/include/mockdata/DIOData.h
index fbbc02f22a..7fc0825483 100644
--- a/hal/src/main/native/include/MockData/DIOData.h
+++ b/hal/src/main/native/include/mockdata/DIOData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/DigitalPWMData.h b/hal/src/main/native/include/mockdata/DigitalPWMData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/DigitalPWMData.h
rename to hal/src/main/native/include/mockdata/DigitalPWMData.h
index cdd419d153..130d829839 100644
--- a/hal/src/main/native/include/MockData/DigitalPWMData.h
+++ b/hal/src/main/native/include/mockdata/DigitalPWMData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/DriverStationData.h b/hal/src/main/native/include/mockdata/DriverStationData.h
similarity index 98%
rename from hal/src/main/native/include/MockData/DriverStationData.h
rename to hal/src/main/native/include/mockdata/DriverStationData.h
index 37e858b7e2..06099735ae 100644
--- a/hal/src/main/native/include/MockData/DriverStationData.h
+++ b/hal/src/main/native/include/mockdata/DriverStationData.h
@@ -9,9 +9,9 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/DriverStation.h"
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/DriverStation.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/EncoderData.h b/hal/src/main/native/include/mockdata/EncoderData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/EncoderData.h
rename to hal/src/main/native/include/mockdata/EncoderData.h
index 4dea5c8316..eac1f7f826 100644
--- a/hal/src/main/native/include/MockData/EncoderData.h
+++ b/hal/src/main/native/include/mockdata/EncoderData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/HAL_Value.h b/hal/src/main/native/include/mockdata/HAL_Value.h
similarity index 98%
rename from hal/src/main/native/include/MockData/HAL_Value.h
rename to hal/src/main/native/include/mockdata/HAL_Value.h
index 19308ed57d..ee348b914e 100644
--- a/hal/src/main/native/include/MockData/HAL_Value.h
+++ b/hal/src/main/native/include/mockdata/HAL_Value.h
@@ -9,7 +9,7 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 /** HAL data types. */
 enum HAL_Type {
diff --git a/hal/src/main/native/include/MockData/I2CData.h b/hal/src/main/native/include/mockdata/I2CData.h
similarity index 98%
rename from hal/src/main/native/include/MockData/I2CData.h
rename to hal/src/main/native/include/mockdata/I2CData.h
index 9b12bf7b13..a7027d4edb 100644
--- a/hal/src/main/native/include/MockData/I2CData.h
+++ b/hal/src/main/native/include/mockdata/I2CData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/MockHooks.h b/hal/src/main/native/include/mockdata/MockHooks.h
similarity index 100%
rename from hal/src/main/native/include/MockData/MockHooks.h
rename to hal/src/main/native/include/mockdata/MockHooks.h
diff --git a/hal/src/main/native/include/MockData/NotifyCallbackHelpers.h b/hal/src/main/native/include/mockdata/NotifyCallbackHelpers.h
similarity index 98%
rename from hal/src/main/native/include/MockData/NotifyCallbackHelpers.h
rename to hal/src/main/native/include/mockdata/NotifyCallbackHelpers.h
index 588ae1b960..d7806fe8c3 100644
--- a/hal/src/main/native/include/MockData/NotifyCallbackHelpers.h
+++ b/hal/src/main/native/include/mockdata/NotifyCallbackHelpers.h
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/NotifyListenerVector.h"
 
 template <typename VectorType, typename CallbackType>
 std::shared_ptr<VectorType> RegisterCallbackImpl(
diff --git a/hal/src/main/native/include/MockData/NotifyListener.h b/hal/src/main/native/include/mockdata/NotifyListener.h
similarity index 100%
rename from hal/src/main/native/include/MockData/NotifyListener.h
rename to hal/src/main/native/include/mockdata/NotifyListener.h
diff --git a/hal/src/main/native/include/MockData/NotifyListenerVector.h b/hal/src/main/native/include/mockdata/NotifyListenerVector.h
similarity index 100%
rename from hal/src/main/native/include/MockData/NotifyListenerVector.h
rename to hal/src/main/native/include/mockdata/NotifyListenerVector.h
diff --git a/hal/src/main/native/include/MockData/PCMData.h b/hal/src/main/native/include/mockdata/PCMData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/PCMData.h
rename to hal/src/main/native/include/mockdata/PCMData.h
index 083ef64ac9..057fb1e63f 100644
--- a/hal/src/main/native/include/MockData/PCMData.h
+++ b/hal/src/main/native/include/mockdata/PCMData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/PDPData.h b/hal/src/main/native/include/mockdata/PDPData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/PDPData.h
rename to hal/src/main/native/include/mockdata/PDPData.h
index cac22c9cbe..d05f0e9004 100644
--- a/hal/src/main/native/include/MockData/PDPData.h
+++ b/hal/src/main/native/include/mockdata/PDPData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/PWMData.h b/hal/src/main/native/include/mockdata/PWMData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/PWMData.h
rename to hal/src/main/native/include/mockdata/PWMData.h
index bf1b7359f5..f64a6b2157 100644
--- a/hal/src/main/native/include/MockData/PWMData.h
+++ b/hal/src/main/native/include/mockdata/PWMData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/RelayData.h b/hal/src/main/native/include/mockdata/RelayData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/RelayData.h
rename to hal/src/main/native/include/mockdata/RelayData.h
index 56727ea8f1..eb123c7fef 100644
--- a/hal/src/main/native/include/MockData/RelayData.h
+++ b/hal/src/main/native/include/mockdata/RelayData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/RoboRioData.h b/hal/src/main/native/include/mockdata/RoboRioData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/RoboRioData.h
rename to hal/src/main/native/include/mockdata/RoboRioData.h
index 7cb3ca4620..0d8ff167f0 100644
--- a/hal/src/main/native/include/MockData/RoboRioData.h
+++ b/hal/src/main/native/include/mockdata/RoboRioData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/SPIAccelerometerData.h b/hal/src/main/native/include/mockdata/SPIAccelerometerData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/SPIAccelerometerData.h
rename to hal/src/main/native/include/mockdata/SPIAccelerometerData.h
index adfbaa74f4..52affe464f 100644
--- a/hal/src/main/native/include/MockData/SPIAccelerometerData.h
+++ b/hal/src/main/native/include/mockdata/SPIAccelerometerData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hal/src/main/native/include/MockData/SPIData.h b/hal/src/main/native/include/mockdata/SPIData.h
similarity index 99%
rename from hal/src/main/native/include/MockData/SPIData.h
rename to hal/src/main/native/include/mockdata/SPIData.h
index 6639fa55e8..519b029332 100644
--- a/hal/src/main/native/include/MockData/SPIData.h
+++ b/hal/src/main/native/include/mockdata/SPIData.h
@@ -9,8 +9,8 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "HAL/HAL.h"
 #include "NotifyListener.h"
+#include "hal/HAL.h"
 
 typedef void (*HAL_SpiReadAutoReceiveBufferCallback)(const char* name,
                                                      void* param,
diff --git a/hal/src/main/native/include/Simulation/AccelerometerSim.h b/hal/src/main/native/include/simulation/AccelerometerSim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/AccelerometerSim.h
rename to hal/src/main/native/include/simulation/AccelerometerSim.h
index 4cc71efca8..e2b23ad84b 100644
--- a/hal/src/main/native/include/Simulation/AccelerometerSim.h
+++ b/hal/src/main/native/include/simulation/AccelerometerSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/AccelerometerData.h"
+#include "mockdata/AccelerometerData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/AnalogGyroSim.h b/hal/src/main/native/include/simulation/AnalogGyroSim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/AnalogGyroSim.h
rename to hal/src/main/native/include/simulation/AnalogGyroSim.h
index 623cf62507..ecb11aed4f 100644
--- a/hal/src/main/native/include/Simulation/AnalogGyroSim.h
+++ b/hal/src/main/native/include/simulation/AnalogGyroSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogGyroData.h"
+#include "mockdata/AnalogGyroData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/AnalogInSim.h b/hal/src/main/native/include/simulation/AnalogInSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/AnalogInSim.h
rename to hal/src/main/native/include/simulation/AnalogInSim.h
index d09cede68c..35efd310c3 100644
--- a/hal/src/main/native/include/Simulation/AnalogInSim.h
+++ b/hal/src/main/native/include/simulation/AnalogInSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogInData.h"
+#include "mockdata/AnalogInData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/AnalogOutSim.h b/hal/src/main/native/include/simulation/AnalogOutSim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/AnalogOutSim.h
rename to hal/src/main/native/include/simulation/AnalogOutSim.h
index 1ccb91967d..8573eb852a 100644
--- a/hal/src/main/native/include/Simulation/AnalogOutSim.h
+++ b/hal/src/main/native/include/simulation/AnalogOutSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogOutData.h"
+#include "mockdata/AnalogOutData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/AnalogTriggerSim.h b/hal/src/main/native/include/simulation/AnalogTriggerSim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/AnalogTriggerSim.h
rename to hal/src/main/native/include/simulation/AnalogTriggerSim.h
index ab43b7a5db..be408d5981 100644
--- a/hal/src/main/native/include/Simulation/AnalogTriggerSim.h
+++ b/hal/src/main/native/include/simulation/AnalogTriggerSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogTriggerData.h"
+#include "mockdata/AnalogTriggerData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/CallbackStore.h b/hal/src/main/native/include/simulation/CallbackStore.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/CallbackStore.h
rename to hal/src/main/native/include/simulation/CallbackStore.h
index 6e39f47ca6..51fa8050a1 100644
--- a/hal/src/main/native/include/Simulation/CallbackStore.h
+++ b/hal/src/main/native/include/simulation/CallbackStore.h
@@ -13,7 +13,7 @@
 
 #include <wpi/StringRef.h>
 
-#include "MockData/HAL_Value.h"
+#include "mockdata/HAL_Value.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/DIOSim.h b/hal/src/main/native/include/simulation/DIOSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/DIOSim.h
rename to hal/src/main/native/include/simulation/DIOSim.h
index 07734270b2..b0c253739e 100644
--- a/hal/src/main/native/include/Simulation/DIOSim.h
+++ b/hal/src/main/native/include/simulation/DIOSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/DIOData.h"
+#include "mockdata/DIOData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/DigitalPWMSim.h b/hal/src/main/native/include/simulation/DigitalPWMSim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/DigitalPWMSim.h
rename to hal/src/main/native/include/simulation/DigitalPWMSim.h
index d38621258d..8bdbbae3d0 100644
--- a/hal/src/main/native/include/Simulation/DigitalPWMSim.h
+++ b/hal/src/main/native/include/simulation/DigitalPWMSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/DigitalPWMData.h"
+#include "mockdata/DigitalPWMData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/DriverStationSim.h b/hal/src/main/native/include/simulation/DriverStationSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/DriverStationSim.h
rename to hal/src/main/native/include/simulation/DriverStationSim.h
index 88ca123994..f9b253029c 100644
--- a/hal/src/main/native/include/Simulation/DriverStationSim.h
+++ b/hal/src/main/native/include/simulation/DriverStationSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/DriverStationData.h"
+#include "mockdata/DriverStationData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/EncoderSim.h b/hal/src/main/native/include/simulation/EncoderSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/EncoderSim.h
rename to hal/src/main/native/include/simulation/EncoderSim.h
index 2446fcb9d0..73308c4fd3 100644
--- a/hal/src/main/native/include/Simulation/EncoderSim.h
+++ b/hal/src/main/native/include/simulation/EncoderSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/EncoderData.h"
+#include "mockdata/EncoderData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/PCMSim.h b/hal/src/main/native/include/simulation/PCMSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/PCMSim.h
rename to hal/src/main/native/include/simulation/PCMSim.h
index 2e92bf6776..97ebcb63ca 100644
--- a/hal/src/main/native/include/Simulation/PCMSim.h
+++ b/hal/src/main/native/include/simulation/PCMSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/PCMData.h"
+#include "mockdata/PCMData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/PDPSim.h b/hal/src/main/native/include/simulation/PDPSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/PDPSim.h
rename to hal/src/main/native/include/simulation/PDPSim.h
index a6818407d9..4e0b34cec2 100644
--- a/hal/src/main/native/include/Simulation/PDPSim.h
+++ b/hal/src/main/native/include/simulation/PDPSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/PDPData.h"
+#include "mockdata/PDPData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/PWMSim.h b/hal/src/main/native/include/simulation/PWMSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/PWMSim.h
rename to hal/src/main/native/include/simulation/PWMSim.h
index 89579b320b..bbe728a5ca 100644
--- a/hal/src/main/native/include/Simulation/PWMSim.h
+++ b/hal/src/main/native/include/simulation/PWMSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/PWMData.h"
+#include "mockdata/PWMData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/RelaySim.h b/hal/src/main/native/include/simulation/RelaySim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/RelaySim.h
rename to hal/src/main/native/include/simulation/RelaySim.h
index 48f1caa1a7..3a04397562 100644
--- a/hal/src/main/native/include/Simulation/RelaySim.h
+++ b/hal/src/main/native/include/simulation/RelaySim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/RelayData.h"
+#include "mockdata/RelayData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/RoboRioSim.h b/hal/src/main/native/include/simulation/RoboRioSim.h
similarity index 99%
rename from hal/src/main/native/include/Simulation/RoboRioSim.h
rename to hal/src/main/native/include/simulation/RoboRioSim.h
index 8f4cbf3ba8..521a2633d7 100644
--- a/hal/src/main/native/include/Simulation/RoboRioSim.h
+++ b/hal/src/main/native/include/simulation/RoboRioSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/RoboRioData.h"
+#include "mockdata/RoboRioData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/SPIAccelerometerSim.h b/hal/src/main/native/include/simulation/SPIAccelerometerSim.h
similarity index 98%
rename from hal/src/main/native/include/Simulation/SPIAccelerometerSim.h
rename to hal/src/main/native/include/simulation/SPIAccelerometerSim.h
index 2a0ad9b946..bff2329cd1 100644
--- a/hal/src/main/native/include/Simulation/SPIAccelerometerSim.h
+++ b/hal/src/main/native/include/simulation/SPIAccelerometerSim.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "CallbackStore.h"
-#include "MockData/SPIAccelerometerData.h"
+#include "mockdata/SPIAccelerometerData.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/include/Simulation/SimHooks.h b/hal/src/main/native/include/simulation/SimHooks.h
similarity index 96%
rename from hal/src/main/native/include/Simulation/SimHooks.h
rename to hal/src/main/native/include/simulation/SimHooks.h
index 9ca7434b73..d2eafe04be 100644
--- a/hal/src/main/native/include/Simulation/SimHooks.h
+++ b/hal/src/main/native/include/simulation/SimHooks.h
@@ -9,7 +9,7 @@
 
 #ifndef __FRC_ROBORIO__
 
-#include "MockData/MockHooks.h"
+#include "mockdata/MockHooks.h"
 
 namespace frc {
 namespace sim {
diff --git a/hal/src/main/native/sim/Accelerometer.cpp b/hal/src/main/native/sim/Accelerometer.cpp
index c5501bb6c3..151594a4ff 100644
--- a/hal/src/main/native/sim/Accelerometer.cpp
+++ b/hal/src/main/native/sim/Accelerometer.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Accelerometer.h"
+#include "hal/Accelerometer.h"
 
-#include "MockData/AccelerometerDataInternal.h"
+#include "mockdata/AccelerometerDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/AnalogAccumulator.cpp b/hal/src/main/native/sim/AnalogAccumulator.cpp
index 5772d33144..dcc4922a41 100644
--- a/hal/src/main/native/sim/AnalogAccumulator.cpp
+++ b/hal/src/main/native/sim/AnalogAccumulator.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogAccumulator.h"
+#include "hal/AnalogAccumulator.h"
 
 #include "AnalogInternal.h"
-#include "MockData/AnalogInDataInternal.h"
+#include "mockdata/AnalogInDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/AnalogGyro.cpp b/hal/src/main/native/sim/AnalogGyro.cpp
index 730123d2f8..d47315aac9 100644
--- a/hal/src/main/native/sim/AnalogGyro.cpp
+++ b/hal/src/main/native/sim/AnalogGyro.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogGyro.h"
+#include "hal/AnalogGyro.h"
 
 #include <chrono>
 #include <thread>
 
 #include "AnalogInternal.h"
-#include "HAL/AnalogAccumulator.h"
-#include "HAL/AnalogInput.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/AnalogGyroDataInternal.h"
+#include "hal/AnalogAccumulator.h"
+#include "hal/AnalogInput.h"
+#include "hal/handles/IndexedHandleResource.h"
+#include "mockdata/AnalogGyroDataInternal.h"
 
 namespace {
 struct AnalogGyro {
diff --git a/hal/src/main/native/sim/AnalogInput.cpp b/hal/src/main/native/sim/AnalogInput.cpp
index fa4859c979..f3962aa305 100644
--- a/hal/src/main/native/sim/AnalogInput.cpp
+++ b/hal/src/main/native/sim/AnalogInput.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogInput.h"
+#include "hal/AnalogInput.h"
 
 #include "AnalogInternal.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
-#include "MockData/AnalogInDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/AnalogInDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/AnalogInternal.cpp b/hal/src/main/native/sim/AnalogInternal.cpp
index 9bce87bc75..1e6a755f3e 100644
--- a/hal/src/main/native/sim/AnalogInternal.cpp
+++ b/hal/src/main/native/sim/AnalogInternal.cpp
@@ -7,8 +7,8 @@
 
 #include "AnalogInternal.h"
 
-#include "HAL/AnalogInput.h"
 #include "PortsInternal.h"
+#include "hal/AnalogInput.h"
 
 namespace hal {
 IndexedHandleResource<HAL_AnalogInputHandle, hal::AnalogPort, kNumAnalogInputs,
diff --git a/hal/src/main/native/sim/AnalogInternal.h b/hal/src/main/native/sim/AnalogInternal.h
index 0287b582b5..bcc5c9522a 100644
--- a/hal/src/main/native/sim/AnalogInternal.h
+++ b/hal/src/main/native/sim/AnalogInternal.h
@@ -11,9 +11,9 @@
 
 #include <memory>
 
-#include "HAL/Ports.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "PortsInternal.h"
+#include "hal/Ports.h"
+#include "hal/handles/IndexedHandleResource.h"
 
 namespace hal {
 constexpr int32_t kTimebase = 40000000;  ///< 40 MHz clock
diff --git a/hal/src/main/native/sim/AnalogOutput.cpp b/hal/src/main/native/sim/AnalogOutput.cpp
index 8373e9deb2..064580c017 100644
--- a/hal/src/main/native/sim/AnalogOutput.cpp
+++ b/hal/src/main/native/sim/AnalogOutput.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogOutput.h"
+#include "hal/AnalogOutput.h"
 
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/AnalogOutDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/IndexedHandleResource.h"
+#include "mockdata/AnalogOutDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/AnalogTrigger.cpp b/hal/src/main/native/sim/AnalogTrigger.cpp
index 72d547560a..9cc473debe 100644
--- a/hal/src/main/native/sim/AnalogTrigger.cpp
+++ b/hal/src/main/native/sim/AnalogTrigger.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogTrigger.h"
+#include "hal/AnalogTrigger.h"
 
 #include "AnalogInternal.h"
-#include "HAL/AnalogInput.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/AnalogInDataInternal.h"
-#include "MockData/AnalogTriggerDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/AnalogInput.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
+#include "mockdata/AnalogInDataInternal.h"
+#include "mockdata/AnalogTriggerDataInternal.h"
 
 namespace {
 struct AnalogTrigger {
diff --git a/hal/src/main/native/sim/CAN.cpp b/hal/src/main/native/sim/CAN.cpp
index 72173c3209..aa3729410e 100644
--- a/hal/src/main/native/sim/CAN.cpp
+++ b/hal/src/main/native/sim/CAN.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/CAN.h"
+#include "hal/CAN.h"
 
-#include "MockData/CanDataInternal.h"
+#include "mockdata/CanDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/CANAPI.cpp b/hal/src/main/native/sim/CANAPI.cpp
index 1b3302963a..7c6e2111d5 100644
--- a/hal/src/main/native/sim/CANAPI.cpp
+++ b/hal/src/main/native/sim/CANAPI.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/CANAPI.h"
+#include "hal/CANAPI.h"
 
 #include <atomic>
 #include <ctime>
@@ -13,11 +13,11 @@
 #include <wpi/DenseMap.h>
 
 #include "CANAPIInternal.h"
-#include "HAL/CAN.h"
-#include "HAL/Errors.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
 #include "HALInitializer.h"
+#include "hal/CAN.h"
+#include "hal/Errors.h"
+#include "hal/HAL.h"
+#include "hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/CANAPIInternal.h b/hal/src/main/native/sim/CANAPIInternal.h
index f92dd1bbda..074f682edd 100644
--- a/hal/src/main/native/sim/CANAPIInternal.h
+++ b/hal/src/main/native/sim/CANAPIInternal.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "HAL/Types.h"
+#include "hal/Types.h"
 
 namespace hal {
 namespace can {
diff --git a/hal/src/main/native/sim/CallbackStore.cpp b/hal/src/main/native/sim/CallbackStore.cpp
index e1741a1878..d278b93ab6 100644
--- a/hal/src/main/native/sim/CallbackStore.cpp
+++ b/hal/src/main/native/sim/CallbackStore.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Simulation/CallbackStore.h"
+#include "simulation/CallbackStore.h"
 
 void frc::sim::CallbackStoreThunk(const char* name, void* param,
                                   const HAL_Value* value) {
diff --git a/hal/src/main/native/sim/Compressor.cpp b/hal/src/main/native/sim/Compressor.cpp
index 4358669d63..01034d9ffe 100644
--- a/hal/src/main/native/sim/Compressor.cpp
+++ b/hal/src/main/native/sim/Compressor.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Compressor.h"
+#include "hal/Compressor.h"
 
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
-#include "MockData/PCMDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/PCMDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/Constants.cpp b/hal/src/main/native/sim/Constants.cpp
index e059f2eecb..64cb52bf02 100644
--- a/hal/src/main/native/sim/Constants.cpp
+++ b/hal/src/main/native/sim/Constants.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Constants.h"
+#include "hal/Constants.h"
 
 #include "ConstantsInternal.h"
 
diff --git a/hal/src/main/native/sim/Counter.cpp b/hal/src/main/native/sim/Counter.cpp
index a1c4352207..37454d0e9a 100644
--- a/hal/src/main/native/sim/Counter.cpp
+++ b/hal/src/main/native/sim/Counter.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Counter.h"
+#include "hal/Counter.h"
 
 #include "CounterInternal.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/sim/CounterInternal.h b/hal/src/main/native/sim/CounterInternal.h
index cd2f9c2577..70fbe54804 100644
--- a/hal/src/main/native/sim/CounterInternal.h
+++ b/hal/src/main/native/sim/CounterInternal.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "PortsInternal.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/sim/DIO.cpp b/hal/src/main/native/sim/DIO.cpp
index 23f1f9f902..e0f70a3976 100644
--- a/hal/src/main/native/sim/DIO.cpp
+++ b/hal/src/main/native/sim/DIO.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/DIO.h"
+#include "hal/DIO.h"
 
 #include <cmath>
 
 #include "DigitalInternal.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/DIODataInternal.h"
-#include "MockData/DigitalPWMDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
+#include "mockdata/DIODataInternal.h"
+#include "mockdata/DigitalPWMDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/DigitalInternal.cpp b/hal/src/main/native/sim/DigitalInternal.cpp
index 50454a36b5..070754a2c8 100644
--- a/hal/src/main/native/sim/DigitalInternal.cpp
+++ b/hal/src/main/native/sim/DigitalInternal.cpp
@@ -8,10 +8,10 @@
 #include "DigitalInternal.h"
 
 #include "ConstantsInternal.h"
-#include "HAL/AnalogTrigger.h"
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
 #include "PortsInternal.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/HAL.h"
+#include "hal/Ports.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/sim/DigitalInternal.h b/hal/src/main/native/sim/DigitalInternal.h
index bebcfdf597..89644a17ae 100644
--- a/hal/src/main/native/sim/DigitalInternal.h
+++ b/hal/src/main/native/sim/DigitalInternal.h
@@ -11,12 +11,12 @@
 
 #include <memory>
 
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Ports.h"
-#include "HAL/Types.h"
-#include "HAL/handles/DigitalHandleResource.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "PortsInternal.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Ports.h"
+#include "hal/Types.h"
+#include "hal/handles/DigitalHandleResource.h"
+#include "hal/handles/HandlesInternal.h"
 
 namespace hal {
 /**
diff --git a/hal/src/main/native/sim/DriverStation.cpp b/hal/src/main/native/sim/DriverStation.cpp
index bd6a203d88..f8f804255e 100644
--- a/hal/src/main/native/sim/DriverStation.cpp
+++ b/hal/src/main/native/sim/DriverStation.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/DriverStation.h"
+#include "hal/DriverStation.h"
 
 #ifdef __APPLE__
 #include <pthread.h>
@@ -20,8 +20,8 @@
 #include <wpi/mutex.h>
 
 #include "HALInitializer.h"
-#include "MockData/DriverStationDataInternal.h"
-#include "MockData/MockHooks.h"
+#include "mockdata/DriverStationDataInternal.h"
+#include "mockdata/MockHooks.h"
 
 static wpi::mutex msgMutex;
 static wpi::condition_variable* newDSDataAvailableCond;
diff --git a/hal/src/main/native/sim/Encoder.cpp b/hal/src/main/native/sim/Encoder.cpp
index a33d874091..30fc0cb7b6 100644
--- a/hal/src/main/native/sim/Encoder.cpp
+++ b/hal/src/main/native/sim/Encoder.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Encoder.h"
+#include "hal/Encoder.h"
 
 #include "CounterInternal.h"
-#include "HAL/Counter.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/EncoderDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/Counter.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
+#include "mockdata/EncoderDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/Extensions.cpp b/hal/src/main/native/sim/Extensions.cpp
index 1ef52f07f0..6ef79038ae 100644
--- a/hal/src/main/native/sim/Extensions.cpp
+++ b/hal/src/main/native/sim/Extensions.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Extensions.h"
+#include "hal/Extensions.h"
 
 #include <wpi/SmallString.h>
 #include <wpi/StringRef.h>
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 #if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp
index 439f6aa047..3faeca7460 100644
--- a/hal/src/main/native/sim/HAL.cpp
+++ b/hal/src/main/native/sim/HAL.cpp
@@ -5,18 +5,18 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 #include <wpi/raw_ostream.h>
 
 #include "ErrorsInternal.h"
-#include "HAL/DriverStation.h"
-#include "HAL/Errors.h"
-#include "HAL/Extensions.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
-#include "MockData/RoboRioDataInternal.h"
 #include "MockHooksInternal.h"
+#include "hal/DriverStation.h"
+#include "hal/Errors.h"
+#include "hal/Extensions.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/RoboRioDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/HALInitializer.cpp b/hal/src/main/native/sim/HALInitializer.cpp
index d4c4394b3a..a0456d4b7c 100644
--- a/hal/src/main/native/sim/HALInitializer.cpp
+++ b/hal/src/main/native/sim/HALInitializer.cpp
@@ -7,7 +7,7 @@
 
 #include "HALInitializer.h"
 
-#include "HAL/HAL.h"
+#include "hal/HAL.h"
 
 namespace hal {
 namespace init {
diff --git a/hal/src/main/native/sim/I2C.cpp b/hal/src/main/native/sim/I2C.cpp
index dc2155246a..f589a9853f 100644
--- a/hal/src/main/native/sim/I2C.cpp
+++ b/hal/src/main/native/sim/I2C.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/I2C.h"
+#include "hal/I2C.h"
 
 #include "HALInitializer.h"
-#include "MockData/I2CDataInternal.h"
+#include "mockdata/I2CDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/Interrupts.cpp b/hal/src/main/native/sim/Interrupts.cpp
index fd1e9d32a1..8065be921b 100644
--- a/hal/src/main/native/sim/Interrupts.cpp
+++ b/hal/src/main/native/sim/Interrupts.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Interrupts.h"
+#include "hal/Interrupts.h"
 
 #include <memory>
 
@@ -14,17 +14,17 @@
 #include "AnalogInternal.h"
 #include "DigitalInternal.h"
 #include "ErrorsInternal.h"
-#include "HAL/AnalogTrigger.h"
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/LimitedHandleResource.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/AnalogInDataInternal.h"
-#include "MockData/DIODataInternal.h"
-#include "MockData/HAL_Value.h"
 #include "MockHooksInternal.h"
 #include "PortsInternal.h"
+#include "hal/AnalogTrigger.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/LimitedHandleResource.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/AnalogInDataInternal.h"
+#include "mockdata/DIODataInternal.h"
+#include "mockdata/HAL_Value.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockHooksInternal.h b/hal/src/main/native/sim/MockHooksInternal.h
index d7fd06f0a4..e8c09a9901 100644
--- a/hal/src/main/native/sim/MockHooksInternal.h
+++ b/hal/src/main/native/sim/MockHooksInternal.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "MockData/MockHooks.h"
+#include "mockdata/MockHooks.h"
 
 namespace hal {
 void RestartTiming();
diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp
index d5bfc644d2..9f549d5ec6 100644
--- a/hal/src/main/native/sim/Notifier.cpp
+++ b/hal/src/main/native/sim/Notifier.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Notifier.h"
+#include "hal/Notifier.h"
 
 #include <chrono>
 
@@ -13,10 +13,10 @@
 #include <wpi/mutex.h>
 #include <wpi/timestamp.h>
 
-#include "HAL/HAL.h"
-#include "HAL/cpp/fpga_clock.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
 #include "HALInitializer.h"
+#include "hal/HAL.h"
+#include "hal/cpp/fpga_clock.h"
+#include "hal/handles/UnlimitedHandleResource.h"
 
 namespace {
 struct Notifier {
diff --git a/hal/src/main/native/sim/PDP.cpp b/hal/src/main/native/sim/PDP.cpp
index ddfb24bf7c..87ffcbfce2 100644
--- a/hal/src/main/native/sim/PDP.cpp
+++ b/hal/src/main/native/sim/PDP.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/PDP.h"
+#include "hal/PDP.h"
 
 #include "CANAPIInternal.h"
-#include "HAL/CANAPI.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/PDPDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/CANAPI.h"
+#include "hal/handles/IndexedHandleResource.h"
+#include "mockdata/PDPDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/PWM.cpp b/hal/src/main/native/sim/PWM.cpp
index fa6488150a..3e24dd94fa 100644
--- a/hal/src/main/native/sim/PWM.cpp
+++ b/hal/src/main/native/sim/PWM.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/PWM.h"
+#include "hal/PWM.h"
 
 #include "ConstantsInternal.h"
 #include "DigitalInternal.h"
-#include "HAL/handles/HandlesInternal.h"
 #include "HALInitializer.h"
-#include "MockData/PWMDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/PWMDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/Ports.cpp b/hal/src/main/native/sim/Ports.cpp
index d7454b5aa7..f50304fab4 100644
--- a/hal/src/main/native/sim/Ports.cpp
+++ b/hal/src/main/native/sim/Ports.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Ports.h"
+#include "hal/Ports.h"
 
 #include "PortsInternal.h"
 
diff --git a/hal/src/main/native/sim/Power.cpp b/hal/src/main/native/sim/Power.cpp
index 95ea752e3a..1aaabd1d18 100644
--- a/hal/src/main/native/sim/Power.cpp
+++ b/hal/src/main/native/sim/Power.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Power.h"
+#include "hal/Power.h"
 
-#include "MockData/RoboRioDataInternal.h"
+#include "mockdata/RoboRioDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/Relay.cpp b/hal/src/main/native/sim/Relay.cpp
index a32c7354f2..945ff3e1e7 100644
--- a/hal/src/main/native/sim/Relay.cpp
+++ b/hal/src/main/native/sim/Relay.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Relay.h"
+#include "hal/Relay.h"
 
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/RelayDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/handles/IndexedHandleResource.h"
+#include "mockdata/RelayDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/SPI.cpp b/hal/src/main/native/sim/SPI.cpp
index a9ce17a980..f339c5993c 100644
--- a/hal/src/main/native/sim/SPI.cpp
+++ b/hal/src/main/native/sim/SPI.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/SPI.h"
+#include "hal/SPI.h"
 
 #include "HALInitializer.h"
-#include "MockData/SPIDataInternal.h"
+#include "mockdata/SPIDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/SerialPort.cpp b/hal/src/main/native/sim/SerialPort.cpp
index df96bc451c..bc085667f7 100644
--- a/hal/src/main/native/sim/SerialPort.cpp
+++ b/hal/src/main/native/sim/SerialPort.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/SerialPort.h"
+#include "hal/SerialPort.h"
 
 #include "HALInitializer.h"
 
diff --git a/hal/src/main/native/sim/Solenoid.cpp b/hal/src/main/native/sim/Solenoid.cpp
index 9fcf535eef..d3f0c5da8a 100644
--- a/hal/src/main/native/sim/Solenoid.cpp
+++ b/hal/src/main/native/sim/Solenoid.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Solenoid.h"
+#include "hal/Solenoid.h"
 
-#include "HAL/Errors.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "HAL/handles/IndexedHandleResource.h"
 #include "HALInitializer.h"
-#include "MockData/PCMDataInternal.h"
 #include "PortsInternal.h"
+#include "hal/Errors.h"
+#include "hal/handles/HandlesInternal.h"
+#include "hal/handles/IndexedHandleResource.h"
+#include "mockdata/PCMDataInternal.h"
 
 namespace {
 struct Solenoid {
diff --git a/hal/src/main/native/sim/Threads.cpp b/hal/src/main/native/sim/Threads.cpp
index 67ca4fe1f8..2aa2c4bf90 100644
--- a/hal/src/main/native/sim/Threads.cpp
+++ b/hal/src/main/native/sim/Threads.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Threads.h"
+#include "hal/Threads.h"
 
 namespace hal {
 namespace init {
diff --git a/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp b/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp
index 1f487131e4..8964a417e9 100644
--- a/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/AccelerometerDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/AccelerometerData.h"
 #include "edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI.h"
+#include "mockdata/AccelerometerData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp
index 51d6ab99d2..08d18de51d 100644
--- a/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/AnalogGyroDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogGyroData.h"
 #include "edu_wpi_first_hal_sim_mockdata_AnalogGyroDataJNI.h"
+#include "mockdata/AnalogGyroData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp
index ebab507285..c6cee7b5c6 100644
--- a/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/AnalogInDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogInData.h"
 #include "edu_wpi_first_hal_sim_mockdata_AnalogInDataJNI.h"
+#include "mockdata/AnalogInData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp
index 3cfca65258..af9d6d6bee 100644
--- a/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/AnalogOutDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogOutData.h"
 #include "edu_wpi_first_hal_sim_mockdata_AnalogOutDataJNI.h"
+#include "mockdata/AnalogOutData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp b/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp
index 116be9bf89..66af737341 100644
--- a/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/AnalogTriggerDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/AnalogTriggerData.h"
 #include "edu_wpi_first_hal_sim_mockdata_AnalogTriggerDataJNI.h"
+#include "mockdata/AnalogTriggerData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/BufferCallbackStore.cpp b/hal/src/main/native/sim/jni/BufferCallbackStore.cpp
index 37318011c5..fbf3adce66 100644
--- a/hal/src/main/native/sim/jni/BufferCallbackStore.cpp
+++ b/hal/src/main/native/sim/jni/BufferCallbackStore.cpp
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 using namespace wpi::java;
 using namespace sim;
diff --git a/hal/src/main/native/sim/jni/BufferCallbackStore.h b/hal/src/main/native/sim/jni/BufferCallbackStore.h
index d3108fa58b..b9d49acf6f 100644
--- a/hal/src/main/native/sim/jni/BufferCallbackStore.h
+++ b/hal/src/main/native/sim/jni/BufferCallbackStore.h
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 namespace sim {
 class BufferCallbackStore {
diff --git a/hal/src/main/native/sim/jni/CallbackStore.cpp b/hal/src/main/native/sim/jni/CallbackStore.cpp
index 788449f9cb..abef9b010a 100644
--- a/hal/src/main/native/sim/jni/CallbackStore.cpp
+++ b/hal/src/main/native/sim/jni/CallbackStore.cpp
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 using namespace wpi::java;
 using namespace sim;
diff --git a/hal/src/main/native/sim/jni/CallbackStore.h b/hal/src/main/native/sim/jni/CallbackStore.h
index a0c547d161..94454b05d4 100644
--- a/hal/src/main/native/sim/jni/CallbackStore.h
+++ b/hal/src/main/native/sim/jni/CallbackStore.h
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 namespace sim {
 class CallbackStore {
diff --git a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp
index 677276971e..781725b1b7 100644
--- a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp
+++ b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.cpp
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 using namespace wpi::java;
 using namespace sim;
diff --git a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h
index 340e280f3c..1b0f54e19d 100644
--- a/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h
+++ b/hal/src/main/native/sim/jni/ConstBufferCallbackStore.h
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 namespace sim {
 class ConstBufferCallbackStore {
diff --git a/hal/src/main/native/sim/jni/DIODataJNI.cpp b/hal/src/main/native/sim/jni/DIODataJNI.cpp
index b9e6c0ac6e..2ad55f9b62 100644
--- a/hal/src/main/native/sim/jni/DIODataJNI.cpp
+++ b/hal/src/main/native/sim/jni/DIODataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/DIOData.h"
 #include "edu_wpi_first_hal_sim_mockdata_DIODataJNI.h"
+#include "mockdata/DIOData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp b/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp
index ade607355c..0800917dde 100644
--- a/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/DigitalPWMDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/DigitalPWMData.h"
 #include "edu_wpi_first_hal_sim_mockdata_DigitalPWMDataJNI.h"
+#include "mockdata/DigitalPWMData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp b/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp
index 12292e7b14..2e76c36d35 100644
--- a/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/DriverStationDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/DriverStationData.h"
 #include "edu_wpi_first_hal_sim_mockdata_DriverStationDataJNI.h"
+#include "mockdata/DriverStationData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/EncoderDataJNI.cpp b/hal/src/main/native/sim/jni/EncoderDataJNI.cpp
index 0048489cf6..8992b0c426 100644
--- a/hal/src/main/native/sim/jni/EncoderDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/EncoderDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/EncoderData.h"
 #include "edu_wpi_first_hal_sim_mockdata_EncoderDataJNI.h"
+#include "mockdata/EncoderData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/I2CDataJNI.cpp b/hal/src/main/native/sim/jni/I2CDataJNI.cpp
index d988c48f34..14b32921ce 100644
--- a/hal/src/main/native/sim/jni/I2CDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/I2CDataJNI.cpp
@@ -10,8 +10,8 @@
 #include "BufferCallbackStore.h"
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
-#include "MockData/I2CData.h"
 #include "edu_wpi_first_hal_sim_mockdata_I2CDataJNI.h"
+#include "mockdata/I2CData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/PCMDataJNI.cpp b/hal/src/main/native/sim/jni/PCMDataJNI.cpp
index 21723f7e61..de6f738267 100644
--- a/hal/src/main/native/sim/jni/PCMDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/PCMDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/PCMData.h"
 #include "edu_wpi_first_hal_sim_mockdata_PCMDataJNI.h"
+#include "mockdata/PCMData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/PDPDataJNI.cpp b/hal/src/main/native/sim/jni/PDPDataJNI.cpp
index 5a9a7ff9ec..5d39e87e57 100644
--- a/hal/src/main/native/sim/jni/PDPDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/PDPDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/PDPData.h"
 #include "edu_wpi_first_hal_sim_mockdata_PDPDataJNI.h"
+#include "mockdata/PDPData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/PWMDataJNI.cpp b/hal/src/main/native/sim/jni/PWMDataJNI.cpp
index 4f52308845..b8a7c41e54 100644
--- a/hal/src/main/native/sim/jni/PWMDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/PWMDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/PWMData.h"
 #include "edu_wpi_first_hal_sim_mockdata_PWMDataJNI.h"
+#include "mockdata/PWMData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/RelayDataJNI.cpp b/hal/src/main/native/sim/jni/RelayDataJNI.cpp
index 72c5732e40..bf8540781c 100644
--- a/hal/src/main/native/sim/jni/RelayDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/RelayDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/RelayData.h"
 #include "edu_wpi_first_hal_sim_mockdata_RelayDataJNI.h"
+#include "mockdata/RelayData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp b/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp
index eb0430d25e..d69e89544a 100644
--- a/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/RoboRioDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/RoboRioData.h"
 #include "edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI.h"
+#include "mockdata/RoboRioData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp b/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp
index 25af62223c..ca12f79dcf 100644
--- a/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/SPIAccelerometerDataJNI.cpp
@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "MockData/SPIAccelerometerData.h"
 #include "edu_wpi_first_hal_sim_mockdata_SPIAccelerometerDataJNI.h"
+#include "mockdata/SPIAccelerometerData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/SPIDataJNI.cpp b/hal/src/main/native/sim/jni/SPIDataJNI.cpp
index f8bf85901d..4eb342c592 100644
--- a/hal/src/main/native/sim/jni/SPIDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/SPIDataJNI.cpp
@@ -10,9 +10,9 @@
 #include "BufferCallbackStore.h"
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
-#include "MockData/SPIData.h"
 #include "SpiReadAutoReceiveBufferCallbackStore.h"
 #include "edu_wpi_first_hal_sim_mockdata_SPIDataJNI.h"
+#include "mockdata/SPIData.h"
 
 extern "C" {
 
diff --git a/hal/src/main/native/sim/jni/SimulatorJNI.cpp b/hal/src/main/native/sim/jni/SimulatorJNI.cpp
index dfdc6a0acc..a2b99660b2 100644
--- a/hal/src/main/native/sim/jni/SimulatorJNI.cpp
+++ b/hal/src/main/native/sim/jni/SimulatorJNI.cpp
@@ -10,12 +10,12 @@
 #include "BufferCallbackStore.h"
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
-#include "HAL/HAL.h"
-#include "HAL/cpp/Log.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/MockHooks.h"
 #include "SpiReadAutoReceiveBufferCallbackStore.h"
 #include "edu_wpi_first_hal_sim_mockdata_SimulatorJNI.h"
+#include "hal/HAL.h"
+#include "hal/cpp/Log.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/MockHooks.h"
 
 using namespace wpi::java;
 
diff --git a/hal/src/main/native/sim/jni/SimulatorJNI.h b/hal/src/main/native/sim/jni/SimulatorJNI.h
index 819783b570..60d0ca38cb 100644
--- a/hal/src/main/native/sim/jni/SimulatorJNI.h
+++ b/hal/src/main/native/sim/jni/SimulatorJNI.h
@@ -9,9 +9,9 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "MockData/HAL_Value.h"
+#include "hal/Types.h"
 #include "jni.h"
+#include "mockdata/HAL_Value.h"
 
 typedef HAL_Handle SIM_JniHandle;
 
diff --git a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp
index 552dbe1bab..164fe52cf0 100644
--- a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp
+++ b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.cpp
@@ -11,11 +11,11 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
 
 using namespace wpi::java;
 using namespace sim;
diff --git a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h
index 2d6a4a89fe..df8e2e04f8 100644
--- a/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h
+++ b/hal/src/main/native/sim/jni/SpiReadAutoReceiveBufferCallbackStore.h
@@ -11,12 +11,12 @@
 
 #include <wpi/jni_util.h>
 
-#include "HAL/Types.h"
-#include "HAL/handles/UnlimitedHandleResource.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
-#include "MockData/SPIData.h"
 #include "SimulatorJNI.h"
+#include "hal/Types.h"
+#include "hal/handles/UnlimitedHandleResource.h"
+#include "mockdata/HAL_Value.h"
+#include "mockdata/NotifyListener.h"
+#include "mockdata/SPIData.h"
 
 namespace sim {
 class SpiReadAutoReceiveBufferCallbackStore {
diff --git a/hal/src/main/native/sim/MockData/AccelerometerData.cpp b/hal/src/main/native/sim/mockdata/AccelerometerData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/AccelerometerData.cpp
rename to hal/src/main/native/sim/mockdata/AccelerometerData.cpp
index 173d7e307e..8096742edc 100644
--- a/hal/src/main/native/sim/MockData/AccelerometerData.cpp
+++ b/hal/src/main/native/sim/mockdata/AccelerometerData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "AccelerometerDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/AccelerometerDataInternal.h b/hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h
similarity index 96%
rename from hal/src/main/native/sim/MockData/AccelerometerDataInternal.h
rename to hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h
index 5d0a8f1dba..3658d9da89 100644
--- a/hal/src/main/native/sim/MockData/AccelerometerDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AccelerometerDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/AccelerometerData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/AccelerometerData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class AccelerometerData {
diff --git a/hal/src/main/native/sim/MockData/AnalogGyroData.cpp b/hal/src/main/native/sim/mockdata/AnalogGyroData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/AnalogGyroData.cpp
rename to hal/src/main/native/sim/mockdata/AnalogGyroData.cpp
index cce0586754..e6c6328906 100644
--- a/hal/src/main/native/sim/MockData/AnalogGyroData.cpp
+++ b/hal/src/main/native/sim/mockdata/AnalogGyroData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "AnalogGyroDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/AnalogGyroDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h
similarity index 96%
rename from hal/src/main/native/sim/MockData/AnalogGyroDataInternal.h
rename to hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h
index 177c21ad9a..754a7d004b 100644
--- a/hal/src/main/native/sim/MockData/AnalogGyroDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AnalogGyroDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/AnalogGyroData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/AnalogGyroData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class AnalogGyroData {
diff --git a/hal/src/main/native/sim/MockData/AnalogInData.cpp b/hal/src/main/native/sim/mockdata/AnalogInData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/AnalogInData.cpp
rename to hal/src/main/native/sim/mockdata/AnalogInData.cpp
index 79f7a223dd..65eb572198 100644
--- a/hal/src/main/native/sim/MockData/AnalogInData.cpp
+++ b/hal/src/main/native/sim/mockdata/AnalogInData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "AnalogInDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/AnalogInDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogInDataInternal.h
similarity index 98%
rename from hal/src/main/native/sim/MockData/AnalogInDataInternal.h
rename to hal/src/main/native/sim/mockdata/AnalogInDataInternal.h
index 035205adb1..88321e44be 100644
--- a/hal/src/main/native/sim/MockData/AnalogInDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AnalogInDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/AnalogInData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/AnalogInData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class AnalogInData {
diff --git a/hal/src/main/native/sim/MockData/AnalogOutData.cpp b/hal/src/main/native/sim/mockdata/AnalogOutData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/AnalogOutData.cpp
rename to hal/src/main/native/sim/mockdata/AnalogOutData.cpp
index a13c57376b..a227afa062 100644
--- a/hal/src/main/native/sim/MockData/AnalogOutData.cpp
+++ b/hal/src/main/native/sim/mockdata/AnalogOutData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "AnalogOutDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/AnalogOutDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h
similarity index 95%
rename from hal/src/main/native/sim/MockData/AnalogOutDataInternal.h
rename to hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h
index 822e5d648b..664437d6e3 100644
--- a/hal/src/main/native/sim/MockData/AnalogOutDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AnalogOutDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/AnalogOutData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/AnalogOutData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class AnalogOutData {
diff --git a/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp b/hal/src/main/native/sim/mockdata/AnalogTriggerData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/AnalogTriggerData.cpp
rename to hal/src/main/native/sim/mockdata/AnalogTriggerData.cpp
index 3055233ccd..1929c2c89c 100644
--- a/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp
+++ b/hal/src/main/native/sim/mockdata/AnalogTriggerData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "AnalogTriggerDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/AnalogTriggerDataInternal.h b/hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h
similarity index 97%
rename from hal/src/main/native/sim/MockData/AnalogTriggerDataInternal.h
rename to hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h
index 39f81bde93..76141b34b1 100644
--- a/hal/src/main/native/sim/MockData/AnalogTriggerDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/AnalogTriggerData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/AnalogTriggerData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class AnalogTriggerData {
diff --git a/hal/src/main/native/sim/MockData/CanDataInternal.cpp b/hal/src/main/native/sim/mockdata/CanDataInternal.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/CanDataInternal.cpp
rename to hal/src/main/native/sim/mockdata/CanDataInternal.cpp
index cb4a906e77..4379782788 100644
--- a/hal/src/main/native/sim/MockData/CanDataInternal.cpp
+++ b/hal/src/main/native/sim/mockdata/CanDataInternal.cpp
@@ -7,7 +7,7 @@
 
 #include "CanDataInternal.h"
 
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/CanDataInternal.h b/hal/src/main/native/sim/mockdata/CanDataInternal.h
similarity index 97%
rename from hal/src/main/native/sim/MockData/CanDataInternal.h
rename to hal/src/main/native/sim/mockdata/CanDataInternal.h
index a90b5154e6..4753bc7f17 100644
--- a/hal/src/main/native/sim/MockData/CanDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/CanDataInternal.h
@@ -13,9 +13,9 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/CanData.h"
-#include "MockData/NotifyCallbackHelpers.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/CanData.h"
+#include "mockdata/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/sim/MockData/DIOData.cpp b/hal/src/main/native/sim/mockdata/DIOData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/DIOData.cpp
rename to hal/src/main/native/sim/mockdata/DIOData.cpp
index 0dcf299be8..0822401ded 100644
--- a/hal/src/main/native/sim/MockData/DIOData.cpp
+++ b/hal/src/main/native/sim/mockdata/DIOData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "DIODataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/DIODataInternal.h b/hal/src/main/native/sim/mockdata/DIODataInternal.h
similarity index 97%
rename from hal/src/main/native/sim/MockData/DIODataInternal.h
rename to hal/src/main/native/sim/mockdata/DIODataInternal.h
index a3051f4d99..b8e992dd0d 100644
--- a/hal/src/main/native/sim/MockData/DIODataInternal.h
+++ b/hal/src/main/native/sim/mockdata/DIODataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/DIOData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/DIOData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class DIOData {
diff --git a/hal/src/main/native/sim/MockData/DigitalPWMData.cpp b/hal/src/main/native/sim/mockdata/DigitalPWMData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/DigitalPWMData.cpp
rename to hal/src/main/native/sim/mockdata/DigitalPWMData.cpp
index f6721d515a..e341b075ad 100644
--- a/hal/src/main/native/sim/MockData/DigitalPWMData.cpp
+++ b/hal/src/main/native/sim/mockdata/DigitalPWMData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "DigitalPWMDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/DigitalPWMDataInternal.h b/hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h
similarity index 96%
rename from hal/src/main/native/sim/MockData/DigitalPWMDataInternal.h
rename to hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h
index 41eaa6404a..dbc230a6a6 100644
--- a/hal/src/main/native/sim/MockData/DigitalPWMDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/DigitalPWMData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/DigitalPWMData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class DigitalPWMData {
diff --git a/hal/src/main/native/sim/MockData/DriverStationData.cpp b/hal/src/main/native/sim/mockdata/DriverStationData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/DriverStationData.cpp
rename to hal/src/main/native/sim/mockdata/DriverStationData.cpp
index 1486f85f32..1019c72b34 100644
--- a/hal/src/main/native/sim/MockData/DriverStationData.cpp
+++ b/hal/src/main/native/sim/mockdata/DriverStationData.cpp
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "DriverStationDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 namespace hal {
 struct JoystickOutputStore {
diff --git a/hal/src/main/native/sim/MockData/DriverStationDataInternal.h b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
similarity index 98%
rename from hal/src/main/native/sim/MockData/DriverStationDataInternal.h
rename to hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
index 66fcc03d38..aa2a169bf5 100644
--- a/hal/src/main/native/sim/MockData/DriverStationDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
@@ -13,8 +13,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/DriverStationData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/DriverStationData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 struct JoystickOutputStore;
diff --git a/hal/src/main/native/sim/MockData/EncoderData.cpp b/hal/src/main/native/sim/mockdata/EncoderData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/EncoderData.cpp
rename to hal/src/main/native/sim/mockdata/EncoderData.cpp
index 2732431da1..ea9487845e 100644
--- a/hal/src/main/native/sim/MockData/EncoderData.cpp
+++ b/hal/src/main/native/sim/mockdata/EncoderData.cpp
@@ -7,7 +7,7 @@
 
 #include "../PortsInternal.h"
 #include "EncoderDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/EncoderDataInternal.h b/hal/src/main/native/sim/mockdata/EncoderDataInternal.h
similarity index 98%
rename from hal/src/main/native/sim/MockData/EncoderDataInternal.h
rename to hal/src/main/native/sim/mockdata/EncoderDataInternal.h
index 11f2f4163b..596ed5b5ae 100644
--- a/hal/src/main/native/sim/MockData/EncoderDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/EncoderDataInternal.h
@@ -13,8 +13,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/EncoderData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/EncoderData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class EncoderData {
diff --git a/hal/src/main/native/sim/MockData/HALValueInternal.h b/hal/src/main/native/sim/mockdata/HALValueInternal.h
similarity index 92%
rename from hal/src/main/native/sim/MockData/HALValueInternal.h
rename to hal/src/main/native/sim/mockdata/HALValueInternal.h
index b48052ca6c..f6594036f9 100644
--- a/hal/src/main/native/sim/MockData/HALValueInternal.h
+++ b/hal/src/main/native/sim/mockdata/HALValueInternal.h
@@ -10,8 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "MockData/HALValue.h"
-#include "MockData/wpi/StringRef.h"
+#include "mockdata/HALValue.h"
+#include "mockdata/wpi/StringRef.h"
 
 namespace hal {
 
diff --git a/hal/src/main/native/sim/MockData/I2CData.cpp b/hal/src/main/native/sim/mockdata/I2CData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/I2CData.cpp
rename to hal/src/main/native/sim/mockdata/I2CData.cpp
index b129ff900f..aa08f0639c 100644
--- a/hal/src/main/native/sim/MockData/I2CData.cpp
+++ b/hal/src/main/native/sim/mockdata/I2CData.cpp
@@ -9,7 +9,7 @@
 
 #include "../PortsInternal.h"
 #include "I2CDataInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/I2CDataInternal.h b/hal/src/main/native/sim/mockdata/I2CDataInternal.h
similarity index 96%
rename from hal/src/main/native/sim/MockData/I2CDataInternal.h
rename to hal/src/main/native/sim/mockdata/I2CDataInternal.h
index 8e05f4e1d4..925436b314 100644
--- a/hal/src/main/native/sim/MockData/I2CDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/I2CDataInternal.h
@@ -13,8 +13,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/I2CData.h"
-#include "MockData/NotifyListenerVector.h"
+#include "mockdata/I2CData.h"
+#include "mockdata/NotifyListenerVector.h"
 
 namespace hal {
 class I2CData {
diff --git a/hal/src/main/native/sim/MockData/NotifyCallbackHelpers.cpp b/hal/src/main/native/sim/mockdata/NotifyCallbackHelpers.cpp
similarity index 98%
rename from hal/src/main/native/sim/MockData/NotifyCallbackHelpers.cpp
rename to hal/src/main/native/sim/mockdata/NotifyCallbackHelpers.cpp
index 2a2b8b8590..2d0dffb177 100644
--- a/hal/src/main/native/sim/MockData/NotifyCallbackHelpers.cpp
+++ b/hal/src/main/native/sim/mockdata/NotifyCallbackHelpers.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "MockData/NotifyCallbackHelpers.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/PCMData.cpp b/hal/src/main/native/sim/mockdata/PCMData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/PCMData.cpp
rename to hal/src/main/native/sim/mockdata/PCMData.cpp
index b0848dfe76..3485c62c00 100644
--- a/hal/src/main/native/sim/MockData/PCMData.cpp
+++ b/hal/src/main/native/sim/mockdata/PCMData.cpp
@@ -6,8 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "PCMDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/PCMDataInternal.h b/hal/src/main/native/sim/mockdata/PCMDataInternal.h
similarity index 98%
rename from hal/src/main/native/sim/MockData/PCMDataInternal.h
rename to hal/src/main/native/sim/mockdata/PCMDataInternal.h
index e7d2bbc62a..6f997bc296 100644
--- a/hal/src/main/native/sim/MockData/PCMDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/PCMDataInternal.h
@@ -13,8 +13,8 @@
 #include <wpi/mutex.h>
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/PCMData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/PCMData.h"
 
 namespace hal {
 class PCMData {
diff --git a/hal/src/main/native/sim/MockData/PDPData.cpp b/hal/src/main/native/sim/mockdata/PDPData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/PDPData.cpp
rename to hal/src/main/native/sim/mockdata/PDPData.cpp
index 25cbec9bc3..bf6164f5f3 100644
--- a/hal/src/main/native/sim/MockData/PDPData.cpp
+++ b/hal/src/main/native/sim/mockdata/PDPData.cpp
@@ -6,8 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "PDPDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/PDPDataInternal.h b/hal/src/main/native/sim/mockdata/PDPDataInternal.h
similarity index 97%
rename from hal/src/main/native/sim/MockData/PDPDataInternal.h
rename to hal/src/main/native/sim/mockdata/PDPDataInternal.h
index 4e1b5ab51d..9524c92c4c 100644
--- a/hal/src/main/native/sim/MockData/PDPDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/PDPDataInternal.h
@@ -13,8 +13,8 @@
 #include <wpi/mutex.h>
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/PDPData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/PDPData.h"
 
 namespace hal {
 class PDPData {
diff --git a/hal/src/main/native/sim/MockData/PWMData.cpp b/hal/src/main/native/sim/mockdata/PWMData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/PWMData.cpp
rename to hal/src/main/native/sim/mockdata/PWMData.cpp
index 681deaf60f..aaab4fb95a 100644
--- a/hal/src/main/native/sim/MockData/PWMData.cpp
+++ b/hal/src/main/native/sim/mockdata/PWMData.cpp
@@ -6,8 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "PWMDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/PWMDataInternal.h b/hal/src/main/native/sim/mockdata/PWMDataInternal.h
similarity index 97%
rename from hal/src/main/native/sim/MockData/PWMDataInternal.h
rename to hal/src/main/native/sim/mockdata/PWMDataInternal.h
index 229a8a4226..b21d8d9d88 100644
--- a/hal/src/main/native/sim/MockData/PWMDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/PWMDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/PWMData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/PWMData.h"
 
 namespace hal {
 class PWMData {
diff --git a/hal/src/main/native/sim/MockData/RelayData.cpp b/hal/src/main/native/sim/mockdata/RelayData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/RelayData.cpp
rename to hal/src/main/native/sim/mockdata/RelayData.cpp
index 06c4cfe798..f8c9aa2d72 100644
--- a/hal/src/main/native/sim/MockData/RelayData.cpp
+++ b/hal/src/main/native/sim/mockdata/RelayData.cpp
@@ -6,8 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "RelayDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/RelayDataInternal.h b/hal/src/main/native/sim/mockdata/RelayDataInternal.h
similarity index 97%
rename from hal/src/main/native/sim/MockData/RelayDataInternal.h
rename to hal/src/main/native/sim/mockdata/RelayDataInternal.h
index f9a46f306a..336f4c29dc 100644
--- a/hal/src/main/native/sim/MockData/RelayDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/RelayDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/RelayData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/RelayData.h"
 
 namespace hal {
 class RelayData {
diff --git a/hal/src/main/native/sim/MockData/RoboRioData.cpp b/hal/src/main/native/sim/mockdata/RoboRioData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/RoboRioData.cpp
rename to hal/src/main/native/sim/mockdata/RoboRioData.cpp
index 8a4ef5e64d..e8eec3b703 100644
--- a/hal/src/main/native/sim/MockData/RoboRioData.cpp
+++ b/hal/src/main/native/sim/mockdata/RoboRioData.cpp
@@ -6,8 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "RoboRioDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/RoboRioDataInternal.h b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
similarity index 98%
rename from hal/src/main/native/sim/MockData/RoboRioDataInternal.h
rename to hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
index 1980c6dd8b..196329f065 100644
--- a/hal/src/main/native/sim/MockData/RoboRioDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/RoboRioData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/RoboRioData.h"
 
 namespace hal {
 class RoboRioData {
diff --git a/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp b/hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp
rename to hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp
index ed13a3a932..a72bee5d81 100644
--- a/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp
+++ b/hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp
@@ -6,8 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "SPIAccelerometerDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/SPIAccelerometerDataInternal.h b/hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h
similarity index 96%
rename from hal/src/main/native/sim/MockData/SPIAccelerometerDataInternal.h
rename to hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h
index 228d047b6f..d505f8f746 100644
--- a/hal/src/main/native/sim/MockData/SPIAccelerometerDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/SPIAccelerometerDataInternal.h
@@ -12,8 +12,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/SPIAccelerometerData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/SPIAccelerometerData.h"
 
 namespace hal {
 class SPIAccelerometerData {
diff --git a/hal/src/main/native/sim/MockData/SPIData.cpp b/hal/src/main/native/sim/mockdata/SPIData.cpp
similarity index 99%
rename from hal/src/main/native/sim/MockData/SPIData.cpp
rename to hal/src/main/native/sim/mockdata/SPIData.cpp
index 4fd29a0303..fcc14c7317 100644
--- a/hal/src/main/native/sim/MockData/SPIData.cpp
+++ b/hal/src/main/native/sim/mockdata/SPIData.cpp
@@ -8,8 +8,8 @@
 #include <iostream>
 
 #include "../PortsInternal.h"
-#include "MockData/NotifyCallbackHelpers.h"
 #include "SPIDataInternal.h"
+#include "mockdata/NotifyCallbackHelpers.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockData/SPIDataInternal.h b/hal/src/main/native/sim/mockdata/SPIDataInternal.h
similarity index 96%
rename from hal/src/main/native/sim/MockData/SPIDataInternal.h
rename to hal/src/main/native/sim/mockdata/SPIDataInternal.h
index 65eafd08ba..a5c5580735 100644
--- a/hal/src/main/native/sim/MockData/SPIDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/SPIDataInternal.h
@@ -13,8 +13,8 @@
 
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-#include "MockData/SPIData.h"
+#include "mockdata/NotifyListenerVector.h"
+#include "mockdata/SPIData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/HALTests.cpp b/hal/src/test/native/cpp/HALTests.cpp
index 615b6de266..b387c14e82 100644
--- a/hal/src/test/native/cpp/HALTests.cpp
+++ b/hal/src/test/native/cpp/HALTests.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/Solenoid.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/Solenoid.h"
 
 namespace hal {
 TEST(HALTests, RuntimeType) {
diff --git a/hal/src/test/native/cpp/can/CANTest.cpp b/hal/src/test/native/cpp/can/CANTest.cpp
index 410a32cb38..6f5549c437 100644
--- a/hal/src/test/native/cpp/can/CANTest.cpp
+++ b/hal/src/test/native/cpp/can/CANTest.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/CANAPI.h"
-#include "HAL/HAL.h"
-#include "MockData/CanData.h"
 #include "gtest/gtest.h"
+#include "hal/CANAPI.h"
+#include "hal/HAL.h"
+#include "mockdata/CanData.h"
 
 namespace hal {
 struct CANTestStore {
diff --git a/hal/src/test/native/cpp/handles/HandleTests.cpp b/hal/src/test/native/cpp/handles/HandleTests.cpp
index 76d4ca184d..e893c7875b 100644
--- a/hal/src/test/native/cpp/handles/HandleTests.cpp
+++ b/hal/src/test/native/cpp/handles/HandleTests.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/handles/IndexedClassedHandleResource.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/handles/IndexedClassedHandleResource.h"
 
 #define HAL_TestHandle HAL_Handle
 
diff --git a/hal/src/test/native/cpp/main.cpp b/hal/src/test/native/cpp/main.cpp
index a875f041cb..33990f0f6c 100644
--- a/hal/src/test/native/cpp/main.cpp
+++ b/hal/src/test/native/cpp/main.cpp
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
 
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);
diff --git a/hal/src/test/native/cpp/MockData/AnalogInDataTests.cpp b/hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp
similarity index 95%
rename from hal/src/test/native/cpp/MockData/AnalogInDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp
index 9cf1c7353f..791be7954a 100644
--- a/hal/src/test/native/cpp/MockData/AnalogInDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/AnalogInDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogInput.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/AnalogInData.h"
 #include "gtest/gtest.h"
+#include "hal/AnalogInput.h"
+#include "hal/HAL.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/AnalogInData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/AnalogOutDataTests.cpp b/hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp
similarity index 95%
rename from hal/src/test/native/cpp/MockData/AnalogOutDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp
index ffbf71a5ef..8f6d6f0d19 100644
--- a/hal/src/test/native/cpp/MockData/AnalogOutDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/AnalogOutDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/AnalogOutput.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/AnalogOutData.h"
 #include "gtest/gtest.h"
+#include "hal/AnalogOutput.h"
+#include "hal/HAL.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/AnalogOutData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/DIODataTests.cpp b/hal/src/test/native/cpp/mockdata/DIODataTests.cpp
similarity index 96%
rename from hal/src/test/native/cpp/MockData/DIODataTests.cpp
rename to hal/src/test/native/cpp/mockdata/DIODataTests.cpp
index 3a86a07d99..19fe99428a 100644
--- a/hal/src/test/native/cpp/MockData/DIODataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/DIODataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/DIOData.h"
 #include "gtest/gtest.h"
+#include "hal/DIO.h"
+#include "hal/HAL.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/DIOData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/DriverStationDataTests.cpp b/hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp
similarity index 98%
rename from hal/src/test/native/cpp/MockData/DriverStationDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp
index 51462b1c59..35c0d54977 100644
--- a/hal/src/test/native/cpp/MockData/DriverStationDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/DriverStationDataTests.cpp
@@ -7,10 +7,10 @@
 
 #include <cstring>
 
-#include "HAL/HAL.h"
-#include "HAL/Solenoid.h"
-#include "MockData/DriverStationData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/Solenoid.h"
+#include "mockdata/DriverStationData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/I2CDataTests.cpp b/hal/src/test/native/cpp/mockdata/I2CDataTests.cpp
similarity index 91%
rename from hal/src/test/native/cpp/MockData/I2CDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/I2CDataTests.cpp
index 11d01d1463..3a8e01ce55 100644
--- a/hal/src/test/native/cpp/MockData/I2CDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/I2CDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/I2C.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/I2CData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/I2C.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/I2CData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/PCMDataTests.cpp b/hal/src/test/native/cpp/mockdata/PCMDataTests.cpp
similarity index 96%
rename from hal/src/test/native/cpp/MockData/PCMDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/PCMDataTests.cpp
index ef7814fc57..50a8ae39b5 100644
--- a/hal/src/test/native/cpp/MockData/PCMDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/PCMDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/Solenoid.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/PCMData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/Solenoid.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/PCMData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/PDPDataTests.cpp b/hal/src/test/native/cpp/mockdata/PDPDataTests.cpp
similarity index 92%
rename from hal/src/test/native/cpp/MockData/PDPDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/PDPDataTests.cpp
index e3fe1394b6..a46454f001 100644
--- a/hal/src/test/native/cpp/MockData/PDPDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/PDPDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/PDP.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/PDPData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/PDP.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/PDPData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/PWMDataTests.cpp b/hal/src/test/native/cpp/mockdata/PWMDataTests.cpp
similarity index 95%
rename from hal/src/test/native/cpp/MockData/PWMDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/PWMDataTests.cpp
index a580b74904..447a51044c 100644
--- a/hal/src/test/native/cpp/MockData/PWMDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/PWMDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/PWM.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/PWMData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/PWM.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/PWMData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/RelayDataTests.cpp b/hal/src/test/native/cpp/mockdata/RelayDataTests.cpp
similarity index 95%
rename from hal/src/test/native/cpp/MockData/RelayDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/RelayDataTests.cpp
index 444d9c3fd8..408657a52b 100644
--- a/hal/src/test/native/cpp/MockData/RelayDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/RelayDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/Relay.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/RelayData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/Relay.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/RelayData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/MockData/SPIDataTests.cpp b/hal/src/test/native/cpp/mockdata/SPIDataTests.cpp
similarity index 92%
rename from hal/src/test/native/cpp/MockData/SPIDataTests.cpp
rename to hal/src/test/native/cpp/mockdata/SPIDataTests.cpp
index 9aae6fa00f..64c85553e9 100644
--- a/hal/src/test/native/cpp/MockData/SPIDataTests.cpp
+++ b/hal/src/test/native/cpp/mockdata/SPIDataTests.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "HAL/SPI.h"
-#include "HAL/handles/HandlesInternal.h"
-#include "MockData/SPIData.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "hal/SPI.h"
+#include "hal/handles/HandlesInternal.h"
+#include "mockdata/SPIData.h"
 
 namespace hal {
 
diff --git a/hal/src/test/native/cpp/Sim/AccelerometerSimTest.cpp b/hal/src/test/native/cpp/sim/AccelerometerSimTest.cpp
similarity index 92%
rename from hal/src/test/native/cpp/Sim/AccelerometerSimTest.cpp
rename to hal/src/test/native/cpp/sim/AccelerometerSimTest.cpp
index b17e703f54..54be6e3060 100644
--- a/hal/src/test/native/cpp/Sim/AccelerometerSimTest.cpp
+++ b/hal/src/test/native/cpp/sim/AccelerometerSimTest.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Accelerometer.h"
-#include "HAL/HAL.h"
-#include "Simulation/AccelerometerSim.h"
 #include "gtest/gtest.h"
+#include "hal/Accelerometer.h"
+#include "hal/HAL.h"
+#include "simulation/AccelerometerSim.h"
 
 using namespace frc::sim;
 
diff --git a/hal/src/test/native/cpp/Sim/SimInitializationTest.cpp b/hal/src/test/native/cpp/sim/SimInitializationTest.cpp
similarity index 64%
rename from hal/src/test/native/cpp/Sim/SimInitializationTest.cpp
rename to hal/src/test/native/cpp/sim/SimInitializationTest.cpp
index 664b1032b0..fdd34cd35c 100644
--- a/hal/src/test/native/cpp/Sim/SimInitializationTest.cpp
+++ b/hal/src/test/native/cpp/sim/SimInitializationTest.cpp
@@ -5,23 +5,23 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
-#include "Simulation/AccelerometerSim.h"
-#include "Simulation/AnalogGyroSim.h"
-#include "Simulation/AnalogInSim.h"
-#include "Simulation/AnalogOutSim.h"
-#include "Simulation/AnalogTriggerSim.h"
-#include "Simulation/DIOSim.h"
-#include "Simulation/DigitalPWMSim.h"
-#include "Simulation/DriverStationSim.h"
-#include "Simulation/EncoderSim.h"
-#include "Simulation/PCMSim.h"
-#include "Simulation/PDPSim.h"
-#include "Simulation/PWMSim.h"
-#include "Simulation/RelaySim.h"
-#include "Simulation/RoboRioSim.h"
-#include "Simulation/SPIAccelerometerSim.h"
 #include "gtest/gtest.h"
+#include "hal/HAL.h"
+#include "simulation/AccelerometerSim.h"
+#include "simulation/AnalogGyroSim.h"
+#include "simulation/AnalogInSim.h"
+#include "simulation/AnalogOutSim.h"
+#include "simulation/AnalogTriggerSim.h"
+#include "simulation/DIOSim.h"
+#include "simulation/DigitalPWMSim.h"
+#include "simulation/DriverStationSim.h"
+#include "simulation/EncoderSim.h"
+#include "simulation/PCMSim.h"
+#include "simulation/PDPSim.h"
+#include "simulation/PWMSim.h"
+#include "simulation/RelaySim.h"
+#include "simulation/RoboRioSim.h"
+#include "simulation/SPIAccelerometerSim.h"
 
 using namespace frc::sim;
 
diff --git a/myRobot/src/main/native/cpp/MyRobot.cpp b/myRobot/src/main/native/cpp/MyRobot.cpp
index ddeb139e68..f9587e8be5 100644
--- a/myRobot/src/main/native/cpp/MyRobot.cpp
+++ b/myRobot/src/main/native/cpp/MyRobot.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "IterativeRobot.h"
+#include <frc/IterativeRobot.h>
 
 class MyRobot : public frc::IterativeRobot {
   /**
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_I2CAccelerometerData.cpp b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_I2CAccelerometerData.cpp
index bf84b6ff8c..3b20074408 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_I2CAccelerometerData.cpp
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_I2CAccelerometerData.cpp
@@ -9,7 +9,7 @@
 
 #include <cstring>
 
-#include "MockData/I2CData.h"
+#include <mockdata/I2CData.h>
 
 using namespace hal;
 
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_SpiAccelerometerData.cpp b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_SpiAccelerometerData.cpp
index 5c8e2e2135..7acc7763ab 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_SpiAccelerometerData.cpp
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_SpiAccelerometerData.cpp
@@ -9,7 +9,7 @@
 
 #include <cstring>
 
-#include "MockData/SPIData.h"
+#include <mockdata/SPIData.h>
 
 using namespace hal;
 
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL362_SpiAccelerometerData.cpp b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL362_SpiAccelerometerData.cpp
index e0f27d3c44..e6411f5a83 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL362_SpiAccelerometerData.cpp
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL362_SpiAccelerometerData.cpp
@@ -9,7 +9,7 @@
 
 #include <cstring>
 
-#include "MockData/SPIData.h"
+#include <mockdata/SPIData.h>
 
 using namespace hal;
 
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXRS450_SpiGyroWrapperData.cpp b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXRS450_SpiGyroWrapperData.cpp
index c97436cf2c..b0dea57fdc 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXRS450_SpiGyroWrapperData.cpp
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXRS450_SpiGyroWrapperData.cpp
@@ -11,8 +11,8 @@
 #include <cmath>
 #include <cstring>
 
-#include "MockData/NotifyCallbackHelpers.h"
-#include "MockData/SPIData.h"
+#include <mockdata/NotifyCallbackHelpers.h>
+#include <mockdata/SPIData.h>
 
 #ifdef _WIN32
 #include "Winsock2.h"
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ThreeAxisAccelerometerData.cpp b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ThreeAxisAccelerometerData.cpp
index 38e274ebc3..ff08dca009 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ThreeAxisAccelerometerData.cpp
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ThreeAxisAccelerometerData.cpp
@@ -7,7 +7,7 @@
 
 #include "ThreeAxisAccelerometerData.h"
 
-#include "MockData/NotifyCallbackHelpers.h"
+#include <mockdata/NotifyCallbackHelpers.h>
 
 using namespace hal;
 
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXRS450_SpiGyroWrapperData.h b/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXRS450_SpiGyroWrapperData.h
index 763c3fa66f..76b69bf4a3 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXRS450_SpiGyroWrapperData.h
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXRS450_SpiGyroWrapperData.h
@@ -10,10 +10,9 @@
 #include <atomic>
 #include <memory>
 
+#include <mockdata/NotifyListenerVector.h>
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-
 namespace hal {
 class ADXRS450_SpiGyroWrapper {
  public:
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ThreeAxisAccelerometerData.h b/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ThreeAxisAccelerometerData.h
index 894f2a337f..5734ff4e34 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ThreeAxisAccelerometerData.h
+++ b/simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ThreeAxisAccelerometerData.h
@@ -10,10 +10,9 @@
 #include <atomic>
 #include <memory>
 
+#include <mockdata/NotifyListenerVector.h>
 #include <wpi/mutex.h>
 
-#include "MockData/NotifyListenerVector.h"
-
 namespace hal {
 class ThreeAxisAccelerometerData {
  public:
diff --git a/simulation/halsim_adx_gyro_accelerometer/src/test/native/cpp/main.cpp b/simulation/halsim_adx_gyro_accelerometer/src/test/native/cpp/main.cpp
index 298f23c1f8..0e00efa33d 100644
--- a/simulation/halsim_adx_gyro_accelerometer/src/test/native/cpp/main.cpp
+++ b/simulation/halsim_adx_gyro_accelerometer/src/test/native/cpp/main.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 #include "gtest/gtest.h"
 
diff --git a/simulation/halsim_ds_nt/src/main/native/include/HALSimDsNt.h b/simulation/halsim_ds_nt/src/main/native/include/HALSimDsNt.h
index e2fddc3351..21d19ee712 100644
--- a/simulation/halsim_ds_nt/src/main/native/include/HALSimDsNt.h
+++ b/simulation/halsim_ds_nt/src/main/native/include/HALSimDsNt.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <thread>
 
-#include <MockData/DriverStationData.h>
+#include <mockdata/DriverStationData.h>
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/mutex.h>
 
diff --git a/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp b/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp
index ac42363053..0ea245f065 100644
--- a/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp
+++ b/simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include <FRCComm.h>
-#include <MockData/DriverStationData.h>
+#include <mockdata/DriverStationData.h>
 
 /*----------------------------------------------------------------------------
 **  The following methods help parse and hold information about the
diff --git a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h b/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h
index be3bf83320..0992a1dd8a 100644
--- a/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h
+++ b/simulation/halsim_ds_socket/src/main/native/include/DSCommPacket.h
@@ -15,7 +15,7 @@
 
 #include <DSCommJoystickPacket.h>
 #include <FRCComm.h>
-#include <MockData/DriverStationData.h>
+#include <mockdata/DriverStationData.h>
 
 class DSCommPacket {
  public:
diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp
index 4729fc8660..60700c23af 100644
--- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp
+++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboAnalogIn.cpp
@@ -9,11 +9,10 @@
 
 #include <string>
 
-#include <HAL/Power.h>
-
-#include "MockData/AnalogInData.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
+#include <hal/Power.h>
+#include <mockdata/AnalogInData.h>
+#include <mockdata/HAL_Value.h>
+#include <mockdata/NotifyListener.h>
 
 static void init_callback(const char* name, void* param,
                           const struct HAL_Value* value) {
diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp
index f94b5e3971..02f8387919 100644
--- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp
+++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboDIO.cpp
@@ -9,9 +9,9 @@
 
 #include <string>
 
-#include "MockData/DIOData.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
+#include <mockdata/DIOData.h>
+#include <mockdata/HAL_Value.h>
+#include <mockdata/NotifyListener.h>
 
 static void init_callback(const char* name, void* param,
                           const struct HAL_Value* value) {
diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp
index 5c33b56c4f..778df7a4a2 100644
--- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp
+++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboEncoder.cpp
@@ -9,9 +9,9 @@
 
 #include <string>
 
-#include "MockData/EncoderData.h"
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
+#include <mockdata/EncoderData.h>
+#include <mockdata/HAL_Value.h>
+#include <mockdata/NotifyListener.h>
 
 static void encoder_init_callback(const char* name, void* param,
                                   const struct HAL_Value* value) {
diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp
index 9268d1e1c6..de4188c0bb 100644
--- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp
+++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPCM.cpp
@@ -9,9 +9,10 @@
 
 #include <string>
 
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
-#include "MockData/PCMData.h"
+#include <mockdata/HAL_Value.h>
+#include <mockdata/NotifyListener.h>
+#include <mockdata/PCMData.h>
+
 #include "simulation/gz_msgs/msgs.h"
 
 static void init_callback(const char* name, void* param,
diff --git a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp
index e2761a883a..1d07832620 100644
--- a/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp
+++ b/simulation/halsim_gazebo/src/main/native/cpp/GazeboPWM.cpp
@@ -9,9 +9,10 @@
 
 #include <string>
 
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
-#include "MockData/PWMData.h"
+#include <mockdata/HAL_Value.h>
+#include <mockdata/NotifyListener.h>
+#include <mockdata/PWMData.h>
+
 #include "simulation/gz_msgs/msgs.h"
 
 static void init_callback(const char* name, void* param,
diff --git a/simulation/halsim_gazebo/src/main/native/cpp/main.cpp b/simulation/halsim_gazebo/src/main/native/cpp/main.cpp
index 3debccf3f5..fa1c85a068 100644
--- a/simulation/halsim_gazebo/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_gazebo/src/main/native/cpp/main.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include <HAL/Ports.h>
+#include <hal/Ports.h>
 
 #include "GazeboAnalogIn.h"
 #include "GazeboDIO.h"
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Analog.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Analog.cpp
index 43b1a89b98..2d35c571ce 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Analog.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Analog.cpp
@@ -7,9 +7,9 @@
 
 #include "NTProvider_Analog.h"
 
-#include <HAL/Ports.h>
-#include <MockData/AnalogInData.h>
-#include <MockData/AnalogOutData.h>
+#include <hal/Ports.h>
+#include <mockdata/AnalogInData.h>
+#include <mockdata/AnalogOutData.h>
 
 void HALSimNTProviderAnalogIn::Initialize() {
   InitializeDefault(HAL_GetNumAnalogInputs(),
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DIO.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DIO.cpp
index bf6f6eaf86..f4ed9d61c0 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DIO.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DIO.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_DIO.h"
 
-#include <HAL/Ports.h>
-#include <MockData/DIOData.h>
+#include <hal/Ports.h>
+#include <mockdata/DIOData.h>
 
 void HALSimNTProviderDIO::Initialize() {
   InitializeDefault(HAL_GetNumDigitalChannels(),
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DriverStation.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DriverStation.cpp
index c730895da7..e02d6462e3 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DriverStation.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_DriverStation.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_DriverStation.h"
 
-#include <HAL/Ports.h>
-#include <MockData/DriverStationData.h>
+#include <hal/Ports.h>
+#include <mockdata/DriverStationData.h>
 
 void HALSimNTProviderDriverStation::Initialize() {
   InitializeDefaultSingle(HALSIM_RegisterDriverStationAllCallbacks);
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Encoder.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Encoder.cpp
index 7e91e5df59..ca012abb52 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Encoder.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Encoder.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_Encoder.h"
 
-#include <HAL/Ports.h>
-#include <MockData/EncoderData.h>
+#include <hal/Ports.h>
+#include <mockdata/EncoderData.h>
 
 void HALSimNTProviderEncoder::Initialize() {
   InitializeDefault(HAL_GetNumEncoders(), HALSIM_RegisterEncoderAllCallbacks);
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_PWM.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_PWM.cpp
index 8df4aa2b9d..5786eeec3a 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_PWM.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_PWM.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_PWM.h"
 
-#include <HAL/Ports.h>
-#include <MockData/PWMData.h>
+#include <hal/Ports.h>
+#include <mockdata/PWMData.h>
 
 void HALSimNTProviderPWM::Initialize() {
   InitializeDefault(HAL_GetNumPWMChannels(), HALSIM_RegisterPWMAllCallbacks);
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Relay.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Relay.cpp
index 5c1cd6544e..249a1c3659 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Relay.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_Relay.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_Relay.h"
 
-#include <HAL/Ports.h>
-#include <MockData/RelayData.h>
+#include <hal/Ports.h>
+#include <mockdata/RelayData.h>
 
 void HALSimNTProviderRelay::Initialize() {
   InitializeDefault(HAL_GetNumRelayHeaders(), HALSIM_RegisterRelayAllCallbacks);
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_RoboRIO.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_RoboRIO.cpp
index 89442f8a04..c3eaa25b7f 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_RoboRIO.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_RoboRIO.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_RoboRIO.h"
 
-#include <HAL/Ports.h>
-#include <MockData/RoboRioData.h>
+#include <hal/Ports.h>
+#include <mockdata/RoboRioData.h>
 
 void HALSimNTProviderRoboRIO::Initialize() {
   InitializeDefault(1, HALSIM_RegisterRoboRioAllCallbacks);
diff --git a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_dPWM.cpp b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_dPWM.cpp
index 76f20dc707..e2bb74ae73 100644
--- a/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_dPWM.cpp
+++ b/simulation/halsim_lowfi/src/main/native/cpp/NTProvider_dPWM.cpp
@@ -7,8 +7,8 @@
 
 #include "NTProvider_dPWM.h"
 
-#include <HAL/Ports.h>
-#include <MockData/DigitalPWMData.h>
+#include <hal/Ports.h>
+#include <mockdata/DigitalPWMData.h>
 
 void HALSimNTProviderDigitalPWM::Initialize() {
   InitializeDefault(HAL_GetNumDigitalPWMOutputs(),
diff --git a/simulation/halsim_lowfi/src/main/native/include/HALSimLowFi.h b/simulation/halsim_lowfi/src/main/native/include/HALSimLowFi.h
index c3a2b3022a..28faed0d49 100644
--- a/simulation/halsim_lowfi/src/main/native/include/HALSimLowFi.h
+++ b/simulation/halsim_lowfi/src/main/native/include/HALSimLowFi.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <MockData/NotifyListener.h>
+#include <mockdata/NotifyListener.h>
 #include <networktables/NetworkTableInstance.h>
 
 class HALSimLowFi {
diff --git a/simulation/halsim_print/src/dev/native/cpp/main.cpp b/simulation/halsim_print/src/dev/native/cpp/main.cpp
index ce755375d7..d9f92e9b26 100644
--- a/simulation/halsim_print/src/dev/native/cpp/main.cpp
+++ b/simulation/halsim_print/src/dev/native/cpp/main.cpp
@@ -8,7 +8,7 @@
 #include <chrono>
 #include <thread>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 int main() {
   HAL_Initialize(500, 0);
diff --git a/simulation/halsim_print/src/main/native/cpp/PrintPWM.cpp b/simulation/halsim_print/src/main/native/cpp/PrintPWM.cpp
index 4d7a3e3498..fe82ccdaa5 100644
--- a/simulation/halsim_print/src/main/native/cpp/PrintPWM.cpp
+++ b/simulation/halsim_print/src/main/native/cpp/PrintPWM.cpp
@@ -9,9 +9,9 @@
 
 #include <iostream>
 
-#include "MockData/HAL_Value.h"
-#include "MockData/NotifyListener.h"
-#include "MockData/PWMData.h"
+#include <mockdata/HAL_Value.h>
+#include <mockdata/NotifyListener.h>
+#include <mockdata/PWMData.h>
 
 static void PWMCallback(const char* name, void* param,
                         const struct HAL_Value* value) {
diff --git a/simulation/halsim_print/src/main/native/cpp/main.cpp b/simulation/halsim_print/src/main/native/cpp/main.cpp
index e86b4c36d2..55327eeb72 100644
--- a/simulation/halsim_print/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_print/src/main/native/cpp/main.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include <HAL/Ports.h>
+#include <hal/Ports.h>
 
 #include "HALSimPrint.h"
 #include "PrintPWM.h"
diff --git a/simulation/lowfi_simulation/src/dev/native/cpp/main.cpp b/simulation/lowfi_simulation/src/dev/native/cpp/main.cpp
index 737d601bab..4dc5f43971 100644
--- a/simulation/lowfi_simulation/src/dev/native/cpp/main.cpp
+++ b/simulation/lowfi_simulation/src/dev/native/cpp/main.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 int main() {
   std::cout << "Hello World" << std::endl;
diff --git a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/MotorEncoderConnector.cpp b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/MotorEncoderConnector.cpp
similarity index 95%
rename from simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/MotorEncoderConnector.cpp
rename to simulation/lowfi_simulation/src/main/native/cpp/lowfisim/MotorEncoderConnector.cpp
index 2e471fbff0..5e530e6270 100644
--- a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/MotorEncoderConnector.cpp
+++ b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/MotorEncoderConnector.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LowFiSim/MotorEncoderConnector.h"
+#include "lowfisim/MotorEncoderConnector.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/MotorModel/SimpleMotorModel.cpp b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/motormodel/SimpleMotorModel.cpp
similarity index 96%
rename from simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/MotorModel/SimpleMotorModel.cpp
rename to simulation/lowfi_simulation/src/main/native/cpp/lowfisim/motormodel/SimpleMotorModel.cpp
index d3a0b5871d..226a836fff 100644
--- a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/MotorModel/SimpleMotorModel.cpp
+++ b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/motormodel/SimpleMotorModel.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LowFiSim/MotorModel/SimpleMotorModel.h"
+#include "lowfisim/motormodel/SimpleMotorModel.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/WpiSimulators/WpiEncoderSim.cpp b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/wpisimulators/WpiEncoderSim.cpp
similarity index 94%
rename from simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/WpiSimulators/WpiEncoderSim.cpp
rename to simulation/lowfi_simulation/src/main/native/cpp/lowfisim/wpisimulators/WpiEncoderSim.cpp
index 0cec44333d..48a6455df9 100644
--- a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/WpiSimulators/WpiEncoderSim.cpp
+++ b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/wpisimulators/WpiEncoderSim.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LowFiSim/WpiSimulators/WpiEncoderSim.h"
+#include "lowfisim/wpisimulators/WpiEncoderSim.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/WpiSimulators/WpiMotorSim.cpp b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/wpisimulators/WpiMotorSim.cpp
similarity index 96%
rename from simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/WpiSimulators/WpiMotorSim.cpp
rename to simulation/lowfi_simulation/src/main/native/cpp/lowfisim/wpisimulators/WpiMotorSim.cpp
index e82ea12220..fa63a1f83d 100644
--- a/simulation/lowfi_simulation/src/main/native/cpp/LowFiSim/WpiSimulators/WpiMotorSim.cpp
+++ b/simulation/lowfi_simulation/src/main/native/cpp/lowfisim/wpisimulators/WpiMotorSim.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LowFiSim/WpiSimulators/WpiMotorSim.h"
+#include "lowfisim/wpisimulators/WpiMotorSim.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/EncoderSim.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/EncoderSim.h
similarity index 100%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/EncoderSim.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/EncoderSim.h
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorEncoderConnector.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/MotorEncoderConnector.h
similarity index 100%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorEncoderConnector.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/MotorEncoderConnector.h
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorSim.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/MotorSim.h
similarity index 100%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorSim.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/MotorSim.h
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorModel/MotorModel.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/motormodel/MotorModel.h
similarity index 100%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorModel/MotorModel.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/motormodel/MotorModel.h
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorModel/SimpleMotorModel.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/motormodel/SimpleMotorModel.h
similarity index 96%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorModel/SimpleMotorModel.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/motormodel/SimpleMotorModel.h
index 10384039fe..ccfc3b981b 100644
--- a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/MotorModel/SimpleMotorModel.h
+++ b/simulation/lowfi_simulation/src/main/native/include/lowfisim/motormodel/SimpleMotorModel.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "LowFiSim/MotorModel/MotorModel.h"
+#include "lowfisim/motormodel/MotorModel.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/WpiSimulators/WpiEncoderSim.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/wpisimulators/WpiEncoderSim.h
similarity index 92%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/WpiSimulators/WpiEncoderSim.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/wpisimulators/WpiEncoderSim.h
index 484c30cad0..c25a5d97bb 100644
--- a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/WpiSimulators/WpiEncoderSim.h
+++ b/simulation/lowfi_simulation/src/main/native/include/lowfisim/wpisimulators/WpiEncoderSim.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "LowFiSim/EncoderSim.h"
-#include "Simulation/EncoderSim.h"
+#include "lowfisim/EncoderSim.h"
+#include "simulation/EncoderSim.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/WpiSimulators/WpiMotorSim.h b/simulation/lowfi_simulation/src/main/native/include/lowfisim/wpisimulators/WpiMotorSim.h
similarity index 90%
rename from simulation/lowfi_simulation/src/main/native/include/LowFiSim/WpiSimulators/WpiMotorSim.h
rename to simulation/lowfi_simulation/src/main/native/include/lowfisim/wpisimulators/WpiMotorSim.h
index 8ca4d9d5a4..173d299261 100644
--- a/simulation/lowfi_simulation/src/main/native/include/LowFiSim/WpiSimulators/WpiMotorSim.h
+++ b/simulation/lowfi_simulation/src/main/native/include/lowfisim/wpisimulators/WpiMotorSim.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "LowFiSim/MotorModel/MotorModel.h"
-#include "LowFiSim/MotorSim.h"
-#include "Simulation/PWMSim.h"
+#include "lowfisim/MotorSim.h"
+#include "lowfisim/motormodel/MotorModel.h"
+#include "simulation/PWMSim.h"
 
 namespace frc {
 namespace sim {
diff --git a/simulation/lowfi_simulation/src/test/native/cpp/LowFiSim/MotorEncoderSimulatorTest.cpp b/simulation/lowfi_simulation/src/test/native/cpp/lowfisim/MotorEncoderSimulatorTest.cpp
similarity index 92%
rename from simulation/lowfi_simulation/src/test/native/cpp/LowFiSim/MotorEncoderSimulatorTest.cpp
rename to simulation/lowfi_simulation/src/test/native/cpp/lowfisim/MotorEncoderSimulatorTest.cpp
index 71e8fe7651..60a4f5ccd8 100644
--- a/simulation/lowfi_simulation/src/test/native/cpp/LowFiSim/MotorEncoderSimulatorTest.cpp
+++ b/simulation/lowfi_simulation/src/test/native/cpp/lowfisim/MotorEncoderSimulatorTest.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Encoder.h"
-#include "LowFiSim/MotorEncoderConnector.h"
-#include "LowFiSim/MotorModel/SimpleMotorModel.h"
-#include "LowFiSim/WpiSimulators/WpiEncoderSim.h"
-#include "LowFiSim/WpiSimulators/WpiMotorSim.h"
-#include "Talon.h"
+#include "frc/Encoder.h"
+#include "frc/Talon.h"
 #include "gtest/gtest.h"
+#include "lowfisim/MotorEncoderConnector.h"
+#include "lowfisim/motormodel/SimpleMotorModel.h"
+#include "lowfisim/wpisimulators/WpiEncoderSim.h"
+#include "lowfisim/wpisimulators/WpiMotorSim.h"
 
 TEST(MotorEncoderConnectorTest, TestWithoutDistancePerPulseFullSpeed) {
   frc::Talon talon{3};
diff --git a/simulation/lowfi_simulation/src/test/native/cpp/LowFiSim/MotorModel/SimpleMotorModelSimulationTest.cpp b/simulation/lowfi_simulation/src/test/native/cpp/lowfisim/motormodel/SimpleMotorModelSimulationTest.cpp
similarity index 95%
rename from simulation/lowfi_simulation/src/test/native/cpp/LowFiSim/MotorModel/SimpleMotorModelSimulationTest.cpp
rename to simulation/lowfi_simulation/src/test/native/cpp/lowfisim/motormodel/SimpleMotorModelSimulationTest.cpp
index c12328a7cd..e60cf1ed72 100644
--- a/simulation/lowfi_simulation/src/test/native/cpp/LowFiSim/MotorModel/SimpleMotorModelSimulationTest.cpp
+++ b/simulation/lowfi_simulation/src/test/native/cpp/lowfisim/motormodel/SimpleMotorModelSimulationTest.cpp
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LowFiSim/MotorModel/SimpleMotorModel.h"
 #include "gtest/gtest.h"
+#include "lowfisim/motormodel/SimpleMotorModel.h"
 
 TEST(SimpleMotorModelSimulationTest, TestSimpleModel) {
   frc::sim::lowfi::SimpleMotorModel motorModelSim(200);
diff --git a/wpilibc/src/dev/native/cpp/main.cpp b/wpilibc/src/dev/native/cpp/main.cpp
index 8fea95c959..6e64d2b249 100644
--- a/wpilibc/src/dev/native/cpp/main.cpp
+++ b/wpilibc/src/dev/native/cpp/main.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 #include "WPILibVersion.h"
 
diff --git a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp b/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp
index a586cfdbfa..71407da5a3 100644
--- a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp
+++ b/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXL345_I2C.h"
+#include "frc/ADXL345_I2C.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp b/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp
index 2b6cd70383..738bc3e5ab 100644
--- a/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp
+++ b/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXL345_SPI.h"
+#include "frc/ADXL345_SPI.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/ADXL362.cpp b/wpilibc/src/main/native/cpp/ADXL362.cpp
index a5fccdaf0a..d709ae41c0 100644
--- a/wpilibc/src/main/native/cpp/ADXL362.cpp
+++ b/wpilibc/src/main/native/cpp/ADXL362.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXL362.h"
+#include "frc/ADXL362.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/DriverStation.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
index 59fab01da9..0dbeed30ed 100644
--- a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
+++ b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXRS450_Gyro.h"
+#include "frc/ADXRS450_Gyro.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
index 83ec57a6bb..3ae8e482bb 100644
--- a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogAccelerometer.h"
+#include "frc/AnalogAccelerometer.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogGyro.cpp b/wpilibc/src/main/native/cpp/AnalogGyro.cpp
index 4acd821e87..f7e1ee5013 100644
--- a/wpilibc/src/main/native/cpp/AnalogGyro.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogGyro.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogGyro.h"
+#include "frc/AnalogGyro.h"
 
 #include <climits>
 
-#include <HAL/AnalogGyro.h>
-#include <HAL/Errors.h>
-#include <HAL/HAL.h>
+#include <hal/AnalogGyro.h>
+#include <hal/Errors.h>
+#include <hal/HAL.h>
 
-#include "AnalogInput.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/AnalogInput.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogInput.cpp b/wpilibc/src/main/native/cpp/AnalogInput.cpp
index 36926bab4e..135768378c 100644
--- a/wpilibc/src/main/native/cpp/AnalogInput.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogInput.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogInput.h"
+#include "frc/AnalogInput.h"
 
-#include <HAL/AnalogAccumulator.h>
-#include <HAL/AnalogInput.h>
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
+#include <hal/AnalogAccumulator.h>
+#include <hal/AnalogInput.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogOutput.cpp b/wpilibc/src/main/native/cpp/AnalogOutput.cpp
index 8df6b5d68f..52bfbf9d40 100644
--- a/wpilibc/src/main/native/cpp/AnalogOutput.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogOutput.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogOutput.h"
+#include "frc/AnalogOutput.h"
 
 #include <limits>
 
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
index 3000fd1dee..6c42ff9ebb 100644
--- a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogPotentiometer.h"
+#include "frc/AnalogPotentiometer.h"
 
-#include "RobotController.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/RobotController.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp
index 959154f321..1e9c2e1f05 100644
--- a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogTrigger.h"
+#include "frc/AnalogTrigger.h"
 
 #include <memory>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "AnalogInput.h"
-#include "WPIErrors.h"
+#include "frc/AnalogInput.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp b/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp
index b10186553e..b2a8cd5634 100644
--- a/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogTriggerOutput.h"
+#include "frc/AnalogTriggerOutput.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "AnalogTrigger.h"
-#include "WPIErrors.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp b/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp
index 57c1d5170f..8452e38c4a 100644
--- a/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp
+++ b/wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "BuiltInAccelerometer.h"
+#include "frc/BuiltInAccelerometer.h"
 
-#include <HAL/Accelerometer.h>
-#include <HAL/HAL.h>
+#include <hal/Accelerometer.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/CAN.cpp b/wpilibc/src/main/native/cpp/CAN.cpp
index 42fc3efc67..d2f8ac4b56 100644
--- a/wpilibc/src/main/native/cpp/CAN.cpp
+++ b/wpilibc/src/main/native/cpp/CAN.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "CAN.h"
+#include "frc/CAN.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Compressor.cpp b/wpilibc/src/main/native/cpp/Compressor.cpp
index 314eada407..48e1ed6fbd 100644
--- a/wpilibc/src/main/native/cpp/Compressor.cpp
+++ b/wpilibc/src/main/native/cpp/Compressor.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Compressor.h"
+#include "frc/Compressor.h"
 
-#include <HAL/Compressor.h>
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
-#include <HAL/Solenoid.h>
+#include <hal/Compressor.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
+#include <hal/Solenoid.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/ControllerPower.cpp b/wpilibc/src/main/native/cpp/ControllerPower.cpp
index 1c6ae6757b..d3012eaeff 100644
--- a/wpilibc/src/main/native/cpp/ControllerPower.cpp
+++ b/wpilibc/src/main/native/cpp/ControllerPower.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ControllerPower.h"
+#include "frc/ControllerPower.h"
 
 #include <stdint.h>
 
-#include <HAL/HAL.h>
-#include <HAL/Power.h>
+#include <hal/HAL.h>
+#include <hal/Power.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Counter.cpp b/wpilibc/src/main/native/cpp/Counter.cpp
index 857fcd51ec..9779af680f 100644
--- a/wpilibc/src/main/native/cpp/Counter.cpp
+++ b/wpilibc/src/main/native/cpp/Counter.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Counter.h"
+#include "frc/Counter.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "AnalogTrigger.h"
-#include "DigitalInput.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/DigitalInput.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/DMC60.cpp b/wpilibc/src/main/native/cpp/DMC60.cpp
index dd0a5604e6..786e9ad551 100644
--- a/wpilibc/src/main/native/cpp/DMC60.cpp
+++ b/wpilibc/src/main/native/cpp/DMC60.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DMC60.h"
+#include "frc/DMC60.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp b/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp
index d361cd3a59..9abdfce813 100644
--- a/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp
+++ b/wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp
@@ -5,20 +5,20 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalGlitchFilter.h"
+#include "frc/DigitalGlitchFilter.h"
 
 #include <algorithm>
 #include <array>
 
-#include <HAL/Constants.h>
-#include <HAL/DIO.h>
-#include <HAL/HAL.h>
+#include <hal/Constants.h>
+#include <hal/DIO.h>
+#include <hal/HAL.h>
 
-#include "Counter.h"
-#include "Encoder.h"
-#include "SensorUtil.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Counter.h"
+#include "frc/Encoder.h"
+#include "frc/SensorUtil.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/DigitalInput.cpp b/wpilibc/src/main/native/cpp/DigitalInput.cpp
index a1fee59643..35f5b006df 100644
--- a/wpilibc/src/main/native/cpp/DigitalInput.cpp
+++ b/wpilibc/src/main/native/cpp/DigitalInput.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalInput.h"
+#include "frc/DigitalInput.h"
 
 #include <limits>
 
-#include <HAL/DIO.h>
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
+#include <hal/DIO.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/DigitalOutput.cpp b/wpilibc/src/main/native/cpp/DigitalOutput.cpp
index 28b517d40a..725d812f88 100644
--- a/wpilibc/src/main/native/cpp/DigitalOutput.cpp
+++ b/wpilibc/src/main/native/cpp/DigitalOutput.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalOutput.h"
+#include "frc/DigitalOutput.h"
 
 #include <limits>
 
-#include <HAL/DIO.h>
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
+#include <hal/DIO.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp b/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp
index 9f157744b0..ee96a5f89f 100644
--- a/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp
+++ b/wpilibc/src/main/native/cpp/DoubleSolenoid.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DoubleSolenoid.h"
+#include "frc/DoubleSolenoid.h"
 
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
-#include <HAL/Solenoid.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
+#include <hal/Solenoid.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/DriverStation.cpp
index 29eb05ce7f..cc9bf28a3c 100644
--- a/wpilibc/src/main/native/cpp/DriverStation.cpp
+++ b/wpilibc/src/main/native/cpp/DriverStation.cpp
@@ -5,24 +5,24 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DriverStation.h"
+#include "frc/DriverStation.h"
 
 #include <chrono>
 
-#include <HAL/HAL.h>
-#include <HAL/Power.h>
-#include <HAL/cpp/Log.h>
+#include <hal/HAL.h>
+#include <hal/Power.h>
+#include <hal/cpp/Log.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableEntry.h>
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringRef.h>
 
-#include "AnalogInput.h"
-#include "MotorSafetyHelper.h"
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/AnalogInput.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/cpp/Encoder.cpp b/wpilibc/src/main/native/cpp/Encoder.cpp
index 9e11537c63..ffbedaab21 100644
--- a/wpilibc/src/main/native/cpp/Encoder.cpp
+++ b/wpilibc/src/main/native/cpp/Encoder.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Encoder.h"
+#include "frc/Encoder.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DigitalInput.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/DigitalInput.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Error.cpp b/wpilibc/src/main/native/cpp/Error.cpp
index 03f238fc6d..f758032a36 100644
--- a/wpilibc/src/main/native/cpp/Error.cpp
+++ b/wpilibc/src/main/native/cpp/Error.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Error.h"
+#include "frc/Error.h"
 
 #include <wpi/Path.h>
 
-#include "DriverStation.h"
-#include "Timer.h"
-#include "Utility.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/ErrorBase.cpp b/wpilibc/src/main/native/cpp/ErrorBase.cpp
index d801d5e2d9..947e53b38a 100644
--- a/wpilibc/src/main/native/cpp/ErrorBase.cpp
+++ b/wpilibc/src/main/native/cpp/ErrorBase.cpp
@@ -5,20 +5,20 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
 #include <set>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <wpi/Format.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
 #define WPI_ERRORS_DEFINE_STRINGS
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/GamepadBase.cpp b/wpilibc/src/main/native/cpp/GamepadBase.cpp
index 3be392b590..4eeb7442b2 100644
--- a/wpilibc/src/main/native/cpp/GamepadBase.cpp
+++ b/wpilibc/src/main/native/cpp/GamepadBase.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GamepadBase.h"
+#include "frc/GamepadBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/GearTooth.cpp b/wpilibc/src/main/native/cpp/GearTooth.cpp
index 245814f13b..fba5a24e05 100644
--- a/wpilibc/src/main/native/cpp/GearTooth.cpp
+++ b/wpilibc/src/main/native/cpp/GearTooth.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GearTooth.h"
+#include "frc/GearTooth.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/GenericHID.cpp b/wpilibc/src/main/native/cpp/GenericHID.cpp
index 5587c2daca..d1a3112978 100644
--- a/wpilibc/src/main/native/cpp/GenericHID.cpp
+++ b/wpilibc/src/main/native/cpp/GenericHID.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "WPIErrors.h"
+#include "frc/DriverStation.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/GyroBase.cpp b/wpilibc/src/main/native/cpp/GyroBase.cpp
index c5caf8e76a..ec67675d24 100644
--- a/wpilibc/src/main/native/cpp/GyroBase.cpp
+++ b/wpilibc/src/main/native/cpp/GyroBase.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GyroBase.h"
+#include "frc/GyroBase.h"
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/I2C.cpp b/wpilibc/src/main/native/cpp/I2C.cpp
index f29dec797e..05b5907aef 100644
--- a/wpilibc/src/main/native/cpp/I2C.cpp
+++ b/wpilibc/src/main/native/cpp/I2C.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "I2C.h"
+#include "frc/I2C.h"
 
-#include <HAL/HAL.h>
-#include <HAL/I2C.h>
+#include <hal/HAL.h>
+#include <hal/I2C.h>
 
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp b/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp
index 12b94f706b..a8769aabd9 100644
--- a/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp
+++ b/wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "InterruptableSensorBase.h"
+#include "frc/InterruptableSensorBase.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/IterativeRobot.cpp b/wpilibc/src/main/native/cpp/IterativeRobot.cpp
index 47380038ca..0f3add326d 100644
--- a/wpilibc/src/main/native/cpp/IterativeRobot.cpp
+++ b/wpilibc/src/main/native/cpp/IterativeRobot.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "IterativeRobot.h"
+#include "frc/IterativeRobot.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
+#include "frc/DriverStation.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
index 8bdaea25ed..e93a34e363 100644
--- a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
+++ b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
@@ -5,19 +5,19 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "IterativeRobotBase.h"
+#include "frc/IterativeRobotBase.h"
 
 #include <cstdio>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "Commands/Scheduler.h"
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SmartDashboard.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Jaguar.cpp b/wpilibc/src/main/native/cpp/Jaguar.cpp
index 2db7701512..7bde6ba215 100644
--- a/wpilibc/src/main/native/cpp/Jaguar.cpp
+++ b/wpilibc/src/main/native/cpp/Jaguar.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Jaguar.h"
+#include "frc/Jaguar.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Joystick.cpp b/wpilibc/src/main/native/cpp/Joystick.cpp
index f8ae094c54..da77d94657 100644
--- a/wpilibc/src/main/native/cpp/Joystick.cpp
+++ b/wpilibc/src/main/native/cpp/Joystick.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Joystick.h"
+#include "frc/Joystick.h"
 
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "WPIErrors.h"
+#include "frc/DriverStation.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/JoystickBase.cpp b/wpilibc/src/main/native/cpp/JoystickBase.cpp
index c2822d6fde..8e6858cfb0 100644
--- a/wpilibc/src/main/native/cpp/JoystickBase.cpp
+++ b/wpilibc/src/main/native/cpp/JoystickBase.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "JoystickBase.h"
+#include "frc/JoystickBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp b/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp
index 5fbb931d6a..8e892bd95f 100644
--- a/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp
+++ b/wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "MotorSafetyHelper.h"
+#include "frc/MotorSafetyHelper.h"
 
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "DriverStation.h"
-#include "MotorSafety.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/DriverStation.h"
+#include "frc/MotorSafety.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/NidecBrushless.cpp b/wpilibc/src/main/native/cpp/NidecBrushless.cpp
index ca42ecd990..6117ded2c2 100644
--- a/wpilibc/src/main/native/cpp/NidecBrushless.cpp
+++ b/wpilibc/src/main/native/cpp/NidecBrushless.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "NidecBrushless.h"
+#include "frc/NidecBrushless.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Notifier.cpp b/wpilibc/src/main/native/cpp/Notifier.cpp
index 0ba42292de..b4260714a8 100644
--- a/wpilibc/src/main/native/cpp/Notifier.cpp
+++ b/wpilibc/src/main/native/cpp/Notifier.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Notifier.h"
+#include "frc/Notifier.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PIDBase.cpp b/wpilibc/src/main/native/cpp/PIDBase.cpp
index cbe6742fa9..e5eb8a5d41 100644
--- a/wpilibc/src/main/native/cpp/PIDBase.cpp
+++ b/wpilibc/src/main/native/cpp/PIDBase.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDBase.h"
+#include "frc/PIDBase.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "PIDOutput.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/PIDOutput.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PIDController.cpp b/wpilibc/src/main/native/cpp/PIDController.cpp
index 2a4dedc4b0..b1c51c62db 100644
--- a/wpilibc/src/main/native/cpp/PIDController.cpp
+++ b/wpilibc/src/main/native/cpp/PIDController.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDController.h"
+#include "frc/PIDController.h"
 
-#include "Notifier.h"
-#include "PIDOutput.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/Notifier.h"
+#include "frc/PIDOutput.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PIDSource.cpp b/wpilibc/src/main/native/cpp/PIDSource.cpp
index 577f564763..28291ddc21 100644
--- a/wpilibc/src/main/native/cpp/PIDSource.cpp
+++ b/wpilibc/src/main/native/cpp/PIDSource.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDSource.h"
+#include "frc/PIDSource.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PWM.cpp b/wpilibc/src/main/native/cpp/PWM.cpp
index 1a548a2e21..a9a4abe67f 100644
--- a/wpilibc/src/main/native/cpp/PWM.cpp
+++ b/wpilibc/src/main/native/cpp/PWM.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWM.h"
+#include "frc/PWM.h"
 
-#include <HAL/HAL.h>
-#include <HAL/PWM.h>
-#include <HAL/Ports.h>
+#include <hal/HAL.h>
+#include <hal/PWM.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PWMSpeedController.cpp b/wpilibc/src/main/native/cpp/PWMSpeedController.cpp
index 8f5309f979..bd3cf148b1 100644
--- a/wpilibc/src/main/native/cpp/PWMSpeedController.cpp
+++ b/wpilibc/src/main/native/cpp/PWMSpeedController.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp b/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp
index add2d4c261..ccb50b6128 100644
--- a/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp
+++ b/wpilibc/src/main/native/cpp/PWMTalonSRX.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWMTalonSRX.h"
+#include "frc/PWMTalonSRX.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp b/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp
index 4b6b5187bf..6acda13f87 100644
--- a/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp
+++ b/wpilibc/src/main/native/cpp/PWMVictorSPX.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWMVictorSPX.h"
+#include "frc/PWMVictorSPX.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp
index b739cfc31e..8872028e1d 100644
--- a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp
+++ b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PowerDistributionPanel.h"
+#include "frc/PowerDistributionPanel.h"
 
-#include <HAL/HAL.h>
-#include <HAL/PDP.h>
-#include <HAL/Ports.h>
+#include <hal/HAL.h>
+#include <hal/PDP.h>
+#include <hal/Ports.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Preferences.cpp b/wpilibc/src/main/native/cpp/Preferences.cpp
index ddea670646..7a896d1c4a 100644
--- a/wpilibc/src/main/native/cpp/Preferences.cpp
+++ b/wpilibc/src/main/native/cpp/Preferences.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Preferences.h"
+#include "frc/Preferences.h"
 
 #include <algorithm>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/StringRef.h>
 
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Relay.cpp b/wpilibc/src/main/native/cpp/Relay.cpp
index 9ce14034c5..8252430ce9 100644
--- a/wpilibc/src/main/native/cpp/Relay.cpp
+++ b/wpilibc/src/main/native/cpp/Relay.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Relay.h"
+#include "frc/Relay.h"
 
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
-#include <HAL/Relay.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
+#include <hal/Relay.h>
 #include <wpi/raw_ostream.h>
 
-#include "MotorSafetyHelper.h"
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Resource.cpp b/wpilibc/src/main/native/cpp/Resource.cpp
index 987f9eae56..e2c53d48ff 100644
--- a/wpilibc/src/main/native/cpp/Resource.cpp
+++ b/wpilibc/src/main/native/cpp/Resource.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Resource.h"
+#include "frc/Resource.h"
 
-#include "ErrorBase.h"
-#include "WPIErrors.h"
+#include "frc/ErrorBase.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/RobotBase.cpp b/wpilibc/src/main/native/cpp/RobotBase.cpp
index 48e8c4f4d3..849363fc6f 100644
--- a/wpilibc/src/main/native/cpp/RobotBase.cpp
+++ b/wpilibc/src/main/native/cpp/RobotBase.cpp
@@ -5,21 +5,21 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotBase.h"
+#include "frc/RobotBase.h"
 
 #include <cstdio>
 
-#include <HAL/HAL.h>
+#include <cameraserver/CameraServerShared.h>
+#include <hal/HAL.h>
 #include <networktables/NetworkTableInstance.h>
 
-#include "CameraServerShared.h"
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "RobotState.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Utility.h"
-#include "WPIErrors.h"
 #include "WPILibVersion.h"
+#include "frc/DriverStation.h"
+#include "frc/RobotState.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SmartDashboard.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/RobotController.cpp b/wpilibc/src/main/native/cpp/RobotController.cpp
index 8c9a01a475..347440d5ad 100644
--- a/wpilibc/src/main/native/cpp/RobotController.cpp
+++ b/wpilibc/src/main/native/cpp/RobotController.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotController.h"
+#include "frc/RobotController.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/RobotDrive.cpp b/wpilibc/src/main/native/cpp/RobotDrive.cpp
index 3f6733e60d..e27b5547bb 100644
--- a/wpilibc/src/main/native/cpp/RobotDrive.cpp
+++ b/wpilibc/src/main/native/cpp/RobotDrive.cpp
@@ -5,18 +5,18 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotDrive.h"
+#include "frc/RobotDrive.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "GenericHID.h"
-#include "Joystick.h"
-#include "Talon.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/GenericHID.h"
+#include "frc/Joystick.h"
+#include "frc/Talon.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/RobotState.cpp b/wpilibc/src/main/native/cpp/RobotState.cpp
index c706d678d5..f5da5c1201 100644
--- a/wpilibc/src/main/native/cpp/RobotState.cpp
+++ b/wpilibc/src/main/native/cpp/RobotState.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotState.h"
+#include "frc/RobotState.h"
 
-#include "DriverStation.h"
+#include "frc/DriverStation.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SD540.cpp b/wpilibc/src/main/native/cpp/SD540.cpp
index 9b26d4e620..977ae7bbd7 100644
--- a/wpilibc/src/main/native/cpp/SD540.cpp
+++ b/wpilibc/src/main/native/cpp/SD540.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SD540.h"
+#include "frc/SD540.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SPI.cpp b/wpilibc/src/main/native/cpp/SPI.cpp
index f7e34b7ddb..d07ac5f2d5 100644
--- a/wpilibc/src/main/native/cpp/SPI.cpp
+++ b/wpilibc/src/main/native/cpp/SPI.cpp
@@ -5,18 +5,18 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SPI.h"
+#include "frc/SPI.h"
 
 #include <cstring>
 
-#include <HAL/HAL.h>
-#include <HAL/SPI.h>
+#include <hal/HAL.h>
+#include <hal/SPI.h>
 #include <wpi/SmallVector.h>
 #include <wpi/mutex.h>
 
-#include "DigitalSource.h"
-#include "Notifier.h"
-#include "WPIErrors.h"
+#include "frc/DigitalSource.h"
+#include "frc/Notifier.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SafePWM.cpp b/wpilibc/src/main/native/cpp/SafePWM.cpp
index fdb271d3cd..e2ae5d5e82 100644
--- a/wpilibc/src/main/native/cpp/SafePWM.cpp
+++ b/wpilibc/src/main/native/cpp/SafePWM.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SafePWM.h"
+#include "frc/SafePWM.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SampleRobot.cpp b/wpilibc/src/main/native/cpp/SampleRobot.cpp
index 438b2fd7fb..2ab60fe54f 100644
--- a/wpilibc/src/main/native/cpp/SampleRobot.cpp
+++ b/wpilibc/src/main/native/cpp/SampleRobot.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SampleRobot.h"
+#include "frc/SampleRobot.h"
 
 #include <networktables/NetworkTable.h>
 #include <wpi/raw_ostream.h>
 
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/livewindow/LiveWindow.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SensorUtil.cpp b/wpilibc/src/main/native/cpp/SensorUtil.cpp
index 6b6ce3707d..652244424d 100644
--- a/wpilibc/src/main/native/cpp/SensorUtil.cpp
+++ b/wpilibc/src/main/native/cpp/SensorUtil.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SensorUtil.h"
+#include "frc/SensorUtil.h"
 
-#include <HAL/AnalogInput.h>
-#include <HAL/AnalogOutput.h>
-#include <HAL/DIO.h>
-#include <HAL/HAL.h>
-#include <HAL/PDP.h>
-#include <HAL/PWM.h>
-#include <HAL/Ports.h>
-#include <HAL/Relay.h>
-#include <HAL/Solenoid.h>
+#include <hal/AnalogInput.h>
+#include <hal/AnalogOutput.h>
+#include <hal/DIO.h>
+#include <hal/HAL.h>
+#include <hal/PDP.h>
+#include <hal/PWM.h>
+#include <hal/Ports.h>
+#include <hal/Relay.h>
+#include <hal/Solenoid.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SerialPort.cpp b/wpilibc/src/main/native/cpp/SerialPort.cpp
index d3b68206b4..16caae9ec8 100644
--- a/wpilibc/src/main/native/cpp/SerialPort.cpp
+++ b/wpilibc/src/main/native/cpp/SerialPort.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SerialPort.h"
+#include "frc/SerialPort.h"
 
-#include <HAL/HAL.h>
-#include <HAL/SerialPort.h>
+#include <hal/HAL.h>
+#include <hal/SerialPort.h>
 
 // static ViStatus _VI_FUNCH ioCompleteHandler (ViSession vi, ViEventType
 // eventType, ViEvent event, ViAddr userHandle);
diff --git a/wpilibc/src/main/native/cpp/Servo.cpp b/wpilibc/src/main/native/cpp/Servo.cpp
index 0e883791a1..fc8242d45c 100644
--- a/wpilibc/src/main/native/cpp/Servo.cpp
+++ b/wpilibc/src/main/native/cpp/Servo.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Servo.h"
+#include "frc/Servo.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Solenoid.cpp b/wpilibc/src/main/native/cpp/Solenoid.cpp
index 43c65dfc56..7b5ebf4e4b 100644
--- a/wpilibc/src/main/native/cpp/Solenoid.cpp
+++ b/wpilibc/src/main/native/cpp/Solenoid.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Solenoid.h"
+#include "frc/Solenoid.h"
 
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
-#include <HAL/Solenoid.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
+#include <hal/Solenoid.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SolenoidBase.cpp b/wpilibc/src/main/native/cpp/SolenoidBase.cpp
index 6cbc94f873..c0b79a5fde 100644
--- a/wpilibc/src/main/native/cpp/SolenoidBase.cpp
+++ b/wpilibc/src/main/native/cpp/SolenoidBase.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SolenoidBase.h"
+#include "frc/SolenoidBase.h"
 
-#include <HAL/HAL.h>
-#include <HAL/Solenoid.h>
+#include <hal/HAL.h>
+#include <hal/Solenoid.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Spark.cpp b/wpilibc/src/main/native/cpp/Spark.cpp
index 681a349219..fcfcb961a2 100644
--- a/wpilibc/src/main/native/cpp/Spark.cpp
+++ b/wpilibc/src/main/native/cpp/Spark.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Spark.h"
+#include "frc/Spark.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp b/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp
index 4b9f010d67..5b3521bc44 100644
--- a/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp
+++ b/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SpeedControllerGroup.h"
+#include "frc/SpeedControllerGroup.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SynchronousPID.cpp b/wpilibc/src/main/native/cpp/SynchronousPID.cpp
index 04e09f3593..8269ede33b 100644
--- a/wpilibc/src/main/native/cpp/SynchronousPID.cpp
+++ b/wpilibc/src/main/native/cpp/SynchronousPID.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SynchronousPID.h"
+#include "frc/SynchronousPID.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Talon.cpp b/wpilibc/src/main/native/cpp/Talon.cpp
index d1fe8224f5..34f659ad74 100644
--- a/wpilibc/src/main/native/cpp/Talon.cpp
+++ b/wpilibc/src/main/native/cpp/Talon.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Talon.h"
+#include "frc/Talon.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Threads.cpp b/wpilibc/src/main/native/cpp/Threads.cpp
index 0a44df3060..7713f668ee 100644
--- a/wpilibc/src/main/native/cpp/Threads.cpp
+++ b/wpilibc/src/main/native/cpp/Threads.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Threads.h"
+#include "frc/Threads.h"
 
-#include <HAL/HAL.h>
-#include <HAL/Threads.h>
+#include <hal/HAL.h>
+#include <hal/Threads.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/TimedRobot.cpp b/wpilibc/src/main/native/cpp/TimedRobot.cpp
index 55380bd6a2..0f23557a0f 100644
--- a/wpilibc/src/main/native/cpp/TimedRobot.cpp
+++ b/wpilibc/src/main/native/cpp/TimedRobot.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "TimedRobot.h"
+#include "frc/TimedRobot.h"
 
 #include <stdint.h>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Timer.cpp b/wpilibc/src/main/native/cpp/Timer.cpp
index 480ae4f9c6..ae4a66ed27 100644
--- a/wpilibc/src/main/native/cpp/Timer.cpp
+++ b/wpilibc/src/main/native/cpp/Timer.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Timer.h"
+#include "frc/Timer.h"
 
 #include <chrono>
 #include <thread>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "RobotController.h"
+#include "frc/DriverStation.h"
+#include "frc/RobotController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/cpp/Ultrasonic.cpp b/wpilibc/src/main/native/cpp/Ultrasonic.cpp
index 908d256b59..4758fbd8fd 100644
--- a/wpilibc/src/main/native/cpp/Ultrasonic.cpp
+++ b/wpilibc/src/main/native/cpp/Ultrasonic.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Ultrasonic.h"
+#include "frc/Ultrasonic.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Counter.h"
-#include "DigitalInput.h"
-#include "DigitalOutput.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Counter.h"
+#include "frc/DigitalInput.h"
+#include "frc/DigitalOutput.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Utility.cpp b/wpilibc/src/main/native/cpp/Utility.cpp
index 7c929a0521..503b6d0797 100644
--- a/wpilibc/src/main/native/cpp/Utility.cpp
+++ b/wpilibc/src/main/native/cpp/Utility.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Utility.h"
+#include "frc/Utility.h"
 
 #ifndef _WIN32
 #include <cxxabi.h>
@@ -16,13 +16,13 @@
 #include <cstdlib>
 #include <cstring>
 
+#include <hal/DriverStation.h>
+#include <hal/HAL.h>
 #include <wpi/Path.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "ErrorBase.h"
-#include "HAL/DriverStation.h"
-#include "HAL/HAL.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Victor.cpp b/wpilibc/src/main/native/cpp/Victor.cpp
index dc4a5f52a9..2c29ecea24 100644
--- a/wpilibc/src/main/native/cpp/Victor.cpp
+++ b/wpilibc/src/main/native/cpp/Victor.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Victor.h"
+#include "frc/Victor.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/VictorSP.cpp b/wpilibc/src/main/native/cpp/VictorSP.cpp
index e615a03a4b..5e2b6b9731 100644
--- a/wpilibc/src/main/native/cpp/VictorSP.cpp
+++ b/wpilibc/src/main/native/cpp/VictorSP.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "VictorSP.h"
+#include "frc/VictorSP.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Watchdog.cpp b/wpilibc/src/main/native/cpp/Watchdog.cpp
index c82ba1ff2f..2d88afd513 100644
--- a/wpilibc/src/main/native/cpp/Watchdog.cpp
+++ b/wpilibc/src/main/native/cpp/Watchdog.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Watchdog.h"
+#include "frc/Watchdog.h"
 
 #include <wpi/raw_ostream.h>
 
-#include "Timer.h"
+#include "frc/Timer.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/XboxController.cpp b/wpilibc/src/main/native/cpp/XboxController.cpp
index 6fb8213302..80744386a9 100644
--- a/wpilibc/src/main/native/cpp/XboxController.cpp
+++ b/wpilibc/src/main/native/cpp/XboxController.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "XboxController.h"
+#include "frc/XboxController.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/Button.cpp b/wpilibc/src/main/native/cpp/buttons/Button.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Buttons/Button.cpp
rename to wpilibc/src/main/native/cpp/buttons/Button.cpp
index 9e73951ae9..45ede654f3 100644
--- a/wpilibc/src/main/native/cpp/Buttons/Button.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/Button.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/Button.h"
+#include "frc/buttons/Button.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/ButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp
similarity index 90%
rename from wpilibc/src/main/native/cpp/Buttons/ButtonScheduler.cpp
rename to wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp
index d10a3bfad0..1e10255366 100644
--- a/wpilibc/src/main/native/cpp/Buttons/ButtonScheduler.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
-#include "Commands/Scheduler.h"
+#include "frc/commands/Scheduler.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/CancelButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp
similarity index 89%
rename from wpilibc/src/main/native/cpp/Buttons/CancelButtonScheduler.cpp
rename to wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp
index 74a77c7a6e..f00378f10a 100644
--- a/wpilibc/src/main/native/cpp/Buttons/CancelButtonScheduler.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/CancelButtonScheduler.h"
+#include "frc/buttons/CancelButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/HeldButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp
similarity index 89%
rename from wpilibc/src/main/native/cpp/Buttons/HeldButtonScheduler.cpp
rename to wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp
index 55420f03d9..1d5e3f6c9e 100644
--- a/wpilibc/src/main/native/cpp/Buttons/HeldButtonScheduler.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/HeldButtonScheduler.h"
+#include "frc/buttons/HeldButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/InternalButton.cpp b/wpilibc/src/main/native/cpp/buttons/InternalButton.cpp
similarity index 95%
rename from wpilibc/src/main/native/cpp/Buttons/InternalButton.cpp
rename to wpilibc/src/main/native/cpp/buttons/InternalButton.cpp
index b19b377867..cac67c45cc 100644
--- a/wpilibc/src/main/native/cpp/Buttons/InternalButton.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/InternalButton.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/InternalButton.h"
+#include "frc/buttons/InternalButton.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/JoystickButton.cpp b/wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp
similarity index 94%
rename from wpilibc/src/main/native/cpp/Buttons/JoystickButton.cpp
rename to wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp
index 047d5b6be9..2c93be2b70 100644
--- a/wpilibc/src/main/native/cpp/Buttons/JoystickButton.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/JoystickButton.h"
+#include "frc/buttons/JoystickButton.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp b/wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp
rename to wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp
index 0ac5ffff6b..5e8b1e071c 100644
--- a/wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/NetworkButton.h"
+#include "frc/buttons/NetworkButton.h"
 
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/main/native/cpp/Buttons/PressedButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp
similarity index 88%
rename from wpilibc/src/main/native/cpp/Buttons/PressedButtonScheduler.cpp
rename to wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp
index a98b363ab8..63da57f781 100644
--- a/wpilibc/src/main/native/cpp/Buttons/PressedButtonScheduler.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/PressedButtonScheduler.h"
+#include "frc/buttons/PressedButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/ReleasedButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp
similarity index 88%
rename from wpilibc/src/main/native/cpp/Buttons/ReleasedButtonScheduler.cpp
rename to wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp
index 0da8694755..4edd09ae6a 100644
--- a/wpilibc/src/main/native/cpp/Buttons/ReleasedButtonScheduler.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/ReleasedButtonScheduler.h"
+#include "frc/buttons/ReleasedButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/ToggleButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp
similarity index 89%
rename from wpilibc/src/main/native/cpp/Buttons/ToggleButtonScheduler.cpp
rename to wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp
index db45edcefc..059077291a 100644
--- a/wpilibc/src/main/native/cpp/Buttons/ToggleButtonScheduler.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/ToggleButtonScheduler.h"
+#include "frc/buttons/ToggleButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Buttons/Trigger.cpp b/wpilibc/src/main/native/cpp/buttons/Trigger.cpp
similarity index 82%
rename from wpilibc/src/main/native/cpp/Buttons/Trigger.cpp
rename to wpilibc/src/main/native/cpp/buttons/Trigger.cpp
index a845f34e44..2ccaaf22a1 100644
--- a/wpilibc/src/main/native/cpp/Buttons/Trigger.cpp
+++ b/wpilibc/src/main/native/cpp/buttons/Trigger.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/Button.h"
-#include "Buttons/CancelButtonScheduler.h"
-#include "Buttons/HeldButtonScheduler.h"
-#include "Buttons/PressedButtonScheduler.h"
-#include "Buttons/ReleasedButtonScheduler.h"
-#include "Buttons/ToggleButtonScheduler.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/buttons/Button.h"
+#include "frc/buttons/CancelButtonScheduler.h"
+#include "frc/buttons/HeldButtonScheduler.h"
+#include "frc/buttons/PressedButtonScheduler.h"
+#include "frc/buttons/ReleasedButtonScheduler.h"
+#include "frc/buttons/ToggleButtonScheduler.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/Command.cpp b/wpilibc/src/main/native/cpp/commands/Command.cpp
similarity index 95%
rename from wpilibc/src/main/native/cpp/Commands/Command.cpp
rename to wpilibc/src/main/native/cpp/commands/Command.cpp
index 25c1ec0910..10ce8760d1 100644
--- a/wpilibc/src/main/native/cpp/Commands/Command.cpp
+++ b/wpilibc/src/main/native/cpp/commands/Command.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 #include <typeinfo>
 
-#include "Commands/CommandGroup.h"
-#include "Commands/Scheduler.h"
-#include "LiveWindow/LiveWindow.h"
-#include "RobotState.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/RobotState.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
+#include "frc/commands/CommandGroup.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/CommandGroup.cpp b/wpilibc/src/main/native/cpp/commands/CommandGroup.cpp
similarity index 99%
rename from wpilibc/src/main/native/cpp/Commands/CommandGroup.cpp
rename to wpilibc/src/main/native/cpp/commands/CommandGroup.cpp
index 7e6e7a1727..2042260ab5 100644
--- a/wpilibc/src/main/native/cpp/Commands/CommandGroup.cpp
+++ b/wpilibc/src/main/native/cpp/commands/CommandGroup.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CommandGroup.h"
+#include "frc/commands/CommandGroup.h"
 
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/CommandGroupEntry.cpp b/wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp
similarity index 91%
rename from wpilibc/src/main/native/cpp/Commands/CommandGroupEntry.cpp
rename to wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp
index 3cfc4ea7ad..7a75f00490 100644
--- a/wpilibc/src/main/native/cpp/Commands/CommandGroupEntry.cpp
+++ b/wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CommandGroupEntry.h"
+#include "frc/commands/CommandGroupEntry.h"
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/ConditionalCommand.cpp b/wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Commands/ConditionalCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp
index 7b650bca5e..39bf8ac716 100644
--- a/wpilibc/src/main/native/cpp/Commands/ConditionalCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/ConditionalCommand.h"
+#include "frc/commands/ConditionalCommand.h"
 
 #include <iostream>
 
-#include "Commands/Scheduler.h"
+#include "frc/commands/Scheduler.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/InstantCommand.cpp b/wpilibc/src/main/native/cpp/commands/InstantCommand.cpp
similarity index 93%
rename from wpilibc/src/main/native/cpp/Commands/InstantCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/InstantCommand.cpp
index b3f6906988..aa4f7e6a16 100644
--- a/wpilibc/src/main/native/cpp/Commands/InstantCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/InstantCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/InstantCommand.h"
+#include "frc/commands/InstantCommand.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/PIDCommand.cpp b/wpilibc/src/main/native/cpp/commands/PIDCommand.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Commands/PIDCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/PIDCommand.cpp
index e2c394934c..949dccaa47 100644
--- a/wpilibc/src/main/native/cpp/Commands/PIDCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/PIDCommand.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PIDCommand.h"
+#include "frc/commands/PIDCommand.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/PIDSubsystem.cpp b/wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp
similarity index 97%
rename from wpilibc/src/main/native/cpp/Commands/PIDSubsystem.cpp
rename to wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp
index a1ac29b1ba..0893da3898 100644
--- a/wpilibc/src/main/native/cpp/Commands/PIDSubsystem.cpp
+++ b/wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PIDSubsystem.h"
+#include "frc/commands/PIDSubsystem.h"
 
-#include "PIDController.h"
+#include "frc/PIDController.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp b/wpilibc/src/main/native/cpp/commands/PrintCommand.cpp
similarity index 95%
rename from wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/PrintCommand.cpp
index 01a3b42710..b4bea248a3 100644
--- a/wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/PrintCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PrintCommand.h"
+#include "frc/commands/PrintCommand.h"
 
 #include <wpi/raw_ostream.h>
 
diff --git a/wpilibc/src/main/native/cpp/Commands/Scheduler.cpp b/wpilibc/src/main/native/cpp/commands/Scheduler.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Commands/Scheduler.cpp
rename to wpilibc/src/main/native/cpp/commands/Scheduler.cpp
index d4a3bf072c..98481f17c5 100644
--- a/wpilibc/src/main/native/cpp/Commands/Scheduler.cpp
+++ b/wpilibc/src/main/native/cpp/commands/Scheduler.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Scheduler.h"
+#include "frc/commands/Scheduler.h"
 
 #include <algorithm>
 #include <set>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Buttons/ButtonScheduler.h"
-#include "Commands/Subsystem.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/buttons/ButtonScheduler.h"
+#include "frc/commands/Subsystem.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/StartCommand.cpp b/wpilibc/src/main/native/cpp/commands/StartCommand.cpp
similarity index 94%
rename from wpilibc/src/main/native/cpp/Commands/StartCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/StartCommand.cpp
index df8a141a85..8884124083 100644
--- a/wpilibc/src/main/native/cpp/Commands/StartCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/StartCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/StartCommand.h"
+#include "frc/commands/StartCommand.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/Subsystem.cpp b/wpilibc/src/main/native/cpp/commands/Subsystem.cpp
similarity index 93%
rename from wpilibc/src/main/native/cpp/Commands/Subsystem.cpp
rename to wpilibc/src/main/native/cpp/commands/Subsystem.cpp
index 7dd0a8c813..308642f920 100644
--- a/wpilibc/src/main/native/cpp/Commands/Subsystem.cpp
+++ b/wpilibc/src/main/native/cpp/commands/Subsystem.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Subsystem.h"
+#include "frc/commands/Subsystem.h"
 
-#include "Commands/Command.h"
-#include "Commands/Scheduler.h"
-#include "LiveWindow/LiveWindow.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/commands/Command.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/TimedCommand.cpp b/wpilibc/src/main/native/cpp/commands/TimedCommand.cpp
similarity index 94%
rename from wpilibc/src/main/native/cpp/Commands/TimedCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/TimedCommand.cpp
index 141c716ace..d5c6b8c82f 100644
--- a/wpilibc/src/main/native/cpp/Commands/TimedCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/TimedCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/TimedCommand.h"
+#include "frc/commands/TimedCommand.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/WaitCommand.cpp b/wpilibc/src/main/native/cpp/commands/WaitCommand.cpp
similarity index 95%
rename from wpilibc/src/main/native/cpp/Commands/WaitCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/WaitCommand.cpp
index aadb450e7d..225d95bb92 100644
--- a/wpilibc/src/main/native/cpp/Commands/WaitCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/WaitCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/WaitCommand.h"
+#include "frc/commands/WaitCommand.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/WaitForChildren.cpp b/wpilibc/src/main/native/cpp/commands/WaitForChildren.cpp
similarity index 90%
rename from wpilibc/src/main/native/cpp/Commands/WaitForChildren.cpp
rename to wpilibc/src/main/native/cpp/commands/WaitForChildren.cpp
index 7d63a48f0a..5c99c1b75d 100644
--- a/wpilibc/src/main/native/cpp/Commands/WaitForChildren.cpp
+++ b/wpilibc/src/main/native/cpp/commands/WaitForChildren.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/WaitForChildren.h"
+#include "frc/commands/WaitForChildren.h"
 
-#include "Commands/CommandGroup.h"
+#include "frc/commands/CommandGroup.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Commands/WaitUntilCommand.cpp b/wpilibc/src/main/native/cpp/commands/WaitUntilCommand.cpp
similarity index 92%
rename from wpilibc/src/main/native/cpp/Commands/WaitUntilCommand.cpp
rename to wpilibc/src/main/native/cpp/commands/WaitUntilCommand.cpp
index 58f96d9b70..6e24b6b5ad 100644
--- a/wpilibc/src/main/native/cpp/Commands/WaitUntilCommand.cpp
+++ b/wpilibc/src/main/native/cpp/commands/WaitUntilCommand.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/WaitUntilCommand.h"
+#include "frc/commands/WaitUntilCommand.h"
 
-#include "Timer.h"
+#include "frc/Timer.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Drive/DifferentialDrive.cpp b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
similarity index 97%
rename from wpilibc/src/main/native/cpp/Drive/DifferentialDrive.cpp
rename to wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
index a12a4af98f..71e9c0691a 100644
--- a/wpilibc/src/main/native/cpp/Drive/DifferentialDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Drive/DifferentialDrive.h"
+#include "frc/drive/DifferentialDrive.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "SpeedController.h"
+#include "frc/SpeedController.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Drive/KilloughDrive.cpp b/wpilibc/src/main/native/cpp/drive/KilloughDrive.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Drive/KilloughDrive.cpp
rename to wpilibc/src/main/native/cpp/drive/KilloughDrive.cpp
index 9ccc165ff8..48bcbc5e9e 100644
--- a/wpilibc/src/main/native/cpp/Drive/KilloughDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/KilloughDrive.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Drive/KilloughDrive.h"
+#include "frc/drive/KilloughDrive.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "SpeedController.h"
+#include "frc/SpeedController.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Drive/MecanumDrive.cpp b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
similarity index 96%
rename from wpilibc/src/main/native/cpp/Drive/MecanumDrive.cpp
rename to wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
index f972139de2..c5c9cbecdd 100644
--- a/wpilibc/src/main/native/cpp/Drive/MecanumDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Drive/MecanumDrive.h"
+#include "frc/drive/MecanumDrive.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Drive/Vector2d.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "SpeedController.h"
+#include "frc/SpeedController.h"
+#include "frc/drive/Vector2d.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Drive/RobotDriveBase.cpp b/wpilibc/src/main/native/cpp/drive/RobotDriveBase.cpp
similarity index 95%
rename from wpilibc/src/main/native/cpp/Drive/RobotDriveBase.cpp
rename to wpilibc/src/main/native/cpp/drive/RobotDriveBase.cpp
index f1a3efcd3b..0280e9fc2b 100644
--- a/wpilibc/src/main/native/cpp/Drive/RobotDriveBase.cpp
+++ b/wpilibc/src/main/native/cpp/drive/RobotDriveBase.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Drive/RobotDriveBase.h"
+#include "frc/drive/RobotDriveBase.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Base.h"
-#include "SpeedController.h"
+#include "frc/Base.h"
+#include "frc/SpeedController.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Drive/Vector2d.cpp b/wpilibc/src/main/native/cpp/drive/Vector2d.cpp
similarity index 97%
rename from wpilibc/src/main/native/cpp/Drive/Vector2d.cpp
rename to wpilibc/src/main/native/cpp/drive/Vector2d.cpp
index 5b119c15b2..3d4b689a31 100644
--- a/wpilibc/src/main/native/cpp/Drive/Vector2d.cpp
+++ b/wpilibc/src/main/native/cpp/drive/Vector2d.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Drive/Vector2d.h"
+#include "frc/drive/Vector2d.h"
 
 #include <cmath>
 
diff --git a/wpilibc/src/main/native/cpp/Filters/Filter.cpp b/wpilibc/src/main/native/cpp/filters/Filter.cpp
similarity index 94%
rename from wpilibc/src/main/native/cpp/Filters/Filter.cpp
rename to wpilibc/src/main/native/cpp/filters/Filter.cpp
index e9744c2417..c25d7aff4f 100644
--- a/wpilibc/src/main/native/cpp/Filters/Filter.cpp
+++ b/wpilibc/src/main/native/cpp/filters/Filter.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Filters/Filter.h"
+#include "frc/filters/Filter.h"
 
-#include "Base.h"
+#include "frc/Base.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Filters/LinearDigitalFilter.cpp b/wpilibc/src/main/native/cpp/filters/LinearDigitalFilter.cpp
similarity index 98%
rename from wpilibc/src/main/native/cpp/Filters/LinearDigitalFilter.cpp
rename to wpilibc/src/main/native/cpp/filters/LinearDigitalFilter.cpp
index 4ff9e1a990..1405f4e708 100644
--- a/wpilibc/src/main/native/cpp/Filters/LinearDigitalFilter.cpp
+++ b/wpilibc/src/main/native/cpp/filters/LinearDigitalFilter.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Filters/LinearDigitalFilter.h"
+#include "frc/filters/LinearDigitalFilter.h"
 
 #include <cassert>
 #include <cmath>
diff --git a/wpilibc/src/main/native/cpp/interfaces/Potentiometer.cpp b/wpilibc/src/main/native/cpp/interfaces/Potentiometer.cpp
index b8f3e03403..44f4aab3a0 100644
--- a/wpilibc/src/main/native/cpp/interfaces/Potentiometer.cpp
+++ b/wpilibc/src/main/native/cpp/interfaces/Potentiometer.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "interfaces/Potentiometer.h"
+#include "frc/interfaces/Potentiometer.h"
 
-#include <Utility.h>
+#include "frc/Utility.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
similarity index 98%
rename from wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp
rename to wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
index da1b192445..8a4badc780 100644
--- a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp
+++ b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LiveWindow/LiveWindow.h"
+#include "frc/livewindow/LiveWindow.h"
 
 #include <algorithm>
 
@@ -17,8 +17,8 @@
 #include <wpi/mutex.h>
 #include <wpi/raw_ostream.h>
 
-#include "Commands/Scheduler.h"
-#include "SmartDashboard/SendableBuilderImpl.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/smartdashboard/SendableBuilderImpl.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindowSendable.cpp b/wpilibc/src/main/native/cpp/livewindow/LiveWindowSendable.cpp
similarity index 90%
rename from wpilibc/src/main/native/cpp/LiveWindow/LiveWindowSendable.cpp
rename to wpilibc/src/main/native/cpp/livewindow/LiveWindowSendable.cpp
index 54f598f68a..7f03f529c5 100644
--- a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindowSendable.cpp
+++ b/wpilibc/src/main/native/cpp/livewindow/LiveWindowSendable.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "LiveWindow/LiveWindowSendable.h"
+#include "frc/livewindow/LiveWindowSendable.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/NamedSendable.cpp b/wpilibc/src/main/native/cpp/smartdashboard/NamedSendable.cpp
similarity index 94%
rename from wpilibc/src/main/native/cpp/SmartDashboard/NamedSendable.cpp
rename to wpilibc/src/main/native/cpp/smartdashboard/NamedSendable.cpp
index 3f1d3292ea..61028b36cf 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/NamedSendable.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/NamedSendable.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SmartDashboard/NamedSendable.h"
+#include "frc/smartdashboard/NamedSendable.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/SendableBase.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SendableBase.cpp
similarity index 95%
rename from wpilibc/src/main/native/cpp/SmartDashboard/SendableBase.cpp
rename to wpilibc/src/main/native/cpp/smartdashboard/SendableBase.cpp
index ad531e27c8..dc954ae7a1 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/SendableBase.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SendableBase.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SmartDashboard/SendableBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
-#include "LiveWindow/LiveWindow.h"
+#include "frc/livewindow/LiveWindow.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/SendableBuilderImpl.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
similarity index 99%
rename from wpilibc/src/main/native/cpp/SmartDashboard/SendableBuilderImpl.cpp
rename to wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
index 011f330b7a..1d05be3073 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/SendableBuilderImpl.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
@@ -5,12 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SmartDashboard/SendableBuilderImpl.h"
+#include "frc/smartdashboard/SendableBuilderImpl.h"
 
+#include <ntcore_cpp.h>
 #include <wpi/SmallString.h>
 
-#include "ntcore_cpp.h"
-
 using namespace frc;
 
 void SendableBuilderImpl::SetTable(std::shared_ptr<nt::NetworkTable> table) {
diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/SendableChooserBase.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp
similarity index 91%
rename from wpilibc/src/main/native/cpp/SmartDashboard/SendableChooserBase.cpp
rename to wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp
index 5452c2065b..3b03796b3e 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/SendableChooserBase.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SmartDashboard/SendableChooserBase.h"
+#include "frc/smartdashboard/SendableChooserBase.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
similarity index 97%
rename from wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
rename to wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
index 53895894de..98e556815a 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SmartDashboard/SmartDashboard.h"
+#include "frc/smartdashboard/SmartDashboard.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/StringMap.h>
 #include <wpi/mutex.h>
 
-#include "SmartDashboard/Sendable.h"
-#include "SmartDashboard/SendableBuilderImpl.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/Sendable.h"
+#include "frc/smartdashboard/SendableBuilderImpl.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/include/WPILib.h b/wpilibc/src/main/native/include/WPILib.h
deleted file mode 100644
index ce1743923a..0000000000
--- a/wpilibc/src/main/native/include/WPILib.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* Copyright (c) 2008-2018 FIRST. All Rights Reserved.                        */
-/* Open Source Software - may be modified and shared by FRC teams. The code   */
-/* must be accompanied by the FIRST BSD license file in the root directory of */
-/* the project.                                                               */
-/*----------------------------------------------------------------------------*/
-
-#pragma once
-
-#include "ADXL345_I2C.h"
-#include "ADXL345_SPI.h"
-#include "ADXL362.h"
-#include "ADXRS450_Gyro.h"
-#include "AnalogAccelerometer.h"
-#include "AnalogGyro.h"
-#include "AnalogInput.h"
-#include "AnalogOutput.h"
-#include "AnalogPotentiometer.h"
-#include "AnalogTrigger.h"
-#include "AnalogTriggerOutput.h"
-#include "BuiltInAccelerometer.h"
-#include "Buttons/InternalButton.h"
-#include "Buttons/JoystickButton.h"
-#include "Buttons/NetworkButton.h"
-#include "CameraServer.h"
-#include "Commands/Command.h"
-#include "Commands/CommandGroup.h"
-#include "Commands/PIDCommand.h"
-#include "Commands/PIDSubsystem.h"
-#include "Commands/PrintCommand.h"
-#include "Commands/Scheduler.h"
-#include "Commands/StartCommand.h"
-#include "Commands/Subsystem.h"
-#include "Commands/WaitCommand.h"
-#include "Commands/WaitForChildren.h"
-#include "Commands/WaitUntilCommand.h"
-#include "Compressor.h"
-#include "ControllerPower.h"
-#include "Counter.h"
-#include "DMC60.h"
-#include "DigitalInput.h"
-#include "DigitalOutput.h"
-#include "DigitalSource.h"
-#include "DoubleSolenoid.h"
-#include "Drive/DifferentialDrive.h"
-#include "Drive/KilloughDrive.h"
-#include "Drive/MecanumDrive.h"
-#include "DriverStation.h"
-#include "Encoder.h"
-#include "ErrorBase.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "GearTooth.h"
-#include "GenericHID.h"
-#include "I2C.h"
-#include "InterruptableSensorBase.h"
-#include "IterativeRobot.h"
-#include "Jaguar.h"
-#include "Joystick.h"
-#include "NidecBrushless.h"
-#include "Notifier.h"
-#include "PIDController.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
-#include "PWM.h"
-#include "PWMSpeedController.h"
-#include "PWMTalonSRX.h"
-#include "PWMVictorSPX.h"
-#include "PowerDistributionPanel.h"
-#include "Preferences.h"
-#include "Relay.h"
-#include "RobotBase.h"
-#include "RobotController.h"
-#include "RobotDrive.h"
-#include "SD540.h"
-#include "SPI.h"
-#include "SampleRobot.h"
-#include "SensorUtil.h"
-#include "SerialPort.h"
-#include "Servo.h"
-#include "SmartDashboard/SendableChooser.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Solenoid.h"
-#include "Spark.h"
-#include "SpeedController.h"
-#include "SpeedControllerGroup.h"
-#include "Talon.h"
-#include "Threads.h"
-#include "TimedRobot.h"
-#include "Timer.h"
-#include "Ultrasonic.h"
-#include "Utility.h"
-#include "Victor.h"
-#include "VictorSP.h"
-#include "WPIErrors.h"
-#include "XboxController.h"
-#include "interfaces/Accelerometer.h"
-#include "interfaces/Gyro.h"
-#include "interfaces/Potentiometer.h"
-#include "vision/VisionRunner.h"
diff --git a/wpilibc/src/main/native/include/ADXL345_I2C.h b/wpilibc/src/main/native/include/frc/ADXL345_I2C.h
similarity index 95%
rename from wpilibc/src/main/native/include/ADXL345_I2C.h
rename to wpilibc/src/main/native/include/frc/ADXL345_I2C.h
index eba5117a97..bfd39187ac 100644
--- a/wpilibc/src/main/native/include/ADXL345_I2C.h
+++ b/wpilibc/src/main/native/include/frc/ADXL345_I2C.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "I2C.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/I2C.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/ADXL345_SPI.h b/wpilibc/src/main/native/include/frc/ADXL345_SPI.h
similarity index 95%
rename from wpilibc/src/main/native/include/ADXL345_SPI.h
rename to wpilibc/src/main/native/include/frc/ADXL345_SPI.h
index da83550ec4..d3a3894035 100644
--- a/wpilibc/src/main/native/include/ADXL345_SPI.h
+++ b/wpilibc/src/main/native/include/frc/ADXL345_SPI.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SPI.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/SPI.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/ADXL362.h b/wpilibc/src/main/native/include/frc/ADXL362.h
similarity index 93%
rename from wpilibc/src/main/native/include/ADXL362.h
rename to wpilibc/src/main/native/include/frc/ADXL362.h
index 06d0ea5072..0c394b756f 100644
--- a/wpilibc/src/main/native/include/ADXL362.h
+++ b/wpilibc/src/main/native/include/frc/ADXL362.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SPI.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/SPI.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/ADXRS450_Gyro.h b/wpilibc/src/main/native/include/frc/ADXRS450_Gyro.h
similarity index 98%
rename from wpilibc/src/main/native/include/ADXRS450_Gyro.h
rename to wpilibc/src/main/native/include/frc/ADXRS450_Gyro.h
index bc84290f33..a9636ed21b 100644
--- a/wpilibc/src/main/native/include/ADXRS450_Gyro.h
+++ b/wpilibc/src/main/native/include/frc/ADXRS450_Gyro.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "GyroBase.h"
-#include "SPI.h"
+#include "frc/GyroBase.h"
+#include "frc/SPI.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogAccelerometer.h b/wpilibc/src/main/native/include/frc/AnalogAccelerometer.h
similarity index 96%
rename from wpilibc/src/main/native/include/AnalogAccelerometer.h
rename to wpilibc/src/main/native/include/frc/AnalogAccelerometer.h
index c32f800d8c..c8de331951 100644
--- a/wpilibc/src/main/native/include/AnalogAccelerometer.h
+++ b/wpilibc/src/main/native/include/frc/AnalogAccelerometer.h
@@ -9,10 +9,10 @@
 
 #include <memory>
 
-#include "AnalogInput.h"
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogInput.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogGyro.h b/wpilibc/src/main/native/include/frc/AnalogGyro.h
similarity index 99%
rename from wpilibc/src/main/native/include/AnalogGyro.h
rename to wpilibc/src/main/native/include/frc/AnalogGyro.h
index de973de106..6cb075eef5 100644
--- a/wpilibc/src/main/native/include/AnalogGyro.h
+++ b/wpilibc/src/main/native/include/frc/AnalogGyro.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "GyroBase.h"
+#include "frc/GyroBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogInput.h b/wpilibc/src/main/native/include/frc/AnalogInput.h
similarity index 98%
rename from wpilibc/src/main/native/include/AnalogInput.h
rename to wpilibc/src/main/native/include/frc/AnalogInput.h
index 094f098616..40fd80516c 100644
--- a/wpilibc/src/main/native/include/AnalogInput.h
+++ b/wpilibc/src/main/native/include/frc/AnalogInput.h
@@ -9,11 +9,11 @@
 
 #include <stdint.h>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogOutput.h b/wpilibc/src/main/native/include/frc/AnalogOutput.h
similarity index 93%
rename from wpilibc/src/main/native/include/AnalogOutput.h
rename to wpilibc/src/main/native/include/frc/AnalogOutput.h
index 27f36a5a3f..673125ebcd 100644
--- a/wpilibc/src/main/native/include/AnalogOutput.h
+++ b/wpilibc/src/main/native/include/frc/AnalogOutput.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <HAL/AnalogOutput.h>
+#include <hal/AnalogOutput.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogPotentiometer.h b/wpilibc/src/main/native/include/frc/AnalogPotentiometer.h
similarity index 96%
rename from wpilibc/src/main/native/include/AnalogPotentiometer.h
rename to wpilibc/src/main/native/include/frc/AnalogPotentiometer.h
index c18c53d358..94a6c2001a 100644
--- a/wpilibc/src/main/native/include/AnalogPotentiometer.h
+++ b/wpilibc/src/main/native/include/frc/AnalogPotentiometer.h
@@ -9,10 +9,10 @@
 
 #include <memory>
 
-#include "AnalogInput.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Potentiometer.h"
+#include "frc/AnalogInput.h"
+#include "frc/ErrorBase.h"
+#include "frc/interfaces/Potentiometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogTrigger.h b/wpilibc/src/main/native/include/frc/AnalogTrigger.h
similarity index 96%
rename from wpilibc/src/main/native/include/AnalogTrigger.h
rename to wpilibc/src/main/native/include/frc/AnalogTrigger.h
index ca803c58ee..03b99b241d 100644
--- a/wpilibc/src/main/native/include/AnalogTrigger.h
+++ b/wpilibc/src/main/native/include/frc/AnalogTrigger.h
@@ -9,11 +9,11 @@
 
 #include <memory>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "AnalogTriggerOutput.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogTriggerOutput.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogTriggerOutput.h b/wpilibc/src/main/native/include/frc/AnalogTriggerOutput.h
similarity index 98%
rename from wpilibc/src/main/native/include/AnalogTriggerOutput.h
rename to wpilibc/src/main/native/include/frc/AnalogTriggerOutput.h
index 0ea59cb601..6acd3dd1d9 100644
--- a/wpilibc/src/main/native/include/AnalogTriggerOutput.h
+++ b/wpilibc/src/main/native/include/frc/AnalogTriggerOutput.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <HAL/AnalogTrigger.h>
+#include <hal/AnalogTrigger.h>
 
-#include "DigitalSource.h"
+#include "frc/DigitalSource.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/AnalogTriggerType.h b/wpilibc/src/main/native/include/frc/AnalogTriggerType.h
similarity index 100%
rename from wpilibc/src/main/native/include/AnalogTriggerType.h
rename to wpilibc/src/main/native/include/frc/AnalogTriggerType.h
diff --git a/wpilibc/src/main/native/include/Base.h b/wpilibc/src/main/native/include/frc/Base.h
similarity index 100%
rename from wpilibc/src/main/native/include/Base.h
rename to wpilibc/src/main/native/include/frc/Base.h
diff --git a/wpilibc/src/main/native/include/BuiltInAccelerometer.h b/wpilibc/src/main/native/include/frc/BuiltInAccelerometer.h
similarity index 93%
rename from wpilibc/src/main/native/include/BuiltInAccelerometer.h
rename to wpilibc/src/main/native/include/frc/BuiltInAccelerometer.h
index 9c71527d2d..82fbc7164e 100644
--- a/wpilibc/src/main/native/include/BuiltInAccelerometer.h
+++ b/wpilibc/src/main/native/include/frc/BuiltInAccelerometer.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/CAN.h b/wpilibc/src/main/native/include/frc/CAN.h
similarity index 98%
rename from wpilibc/src/main/native/include/CAN.h
rename to wpilibc/src/main/native/include/frc/CAN.h
index 00db574a53..c4f7f5b0f8 100644
--- a/wpilibc/src/main/native/include/CAN.h
+++ b/wpilibc/src/main/native/include/frc/CAN.h
@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include <HAL/CANAPI.h>
+#include <hal/CANAPI.h>
 #include <wpi/ArrayRef.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 struct CANData {
diff --git a/wpilibc/src/main/native/include/Compressor.h b/wpilibc/src/main/native/include/frc/Compressor.h
similarity index 97%
rename from wpilibc/src/main/native/include/Compressor.h
rename to wpilibc/src/main/native/include/frc/Compressor.h
index d5e4b33192..d36f84066d 100644
--- a/wpilibc/src/main/native/include/Compressor.h
+++ b/wpilibc/src/main/native/include/frc/Compressor.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/SensorUtil.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Controller.h b/wpilibc/src/main/native/include/frc/Controller.h
similarity index 100%
rename from wpilibc/src/main/native/include/Controller.h
rename to wpilibc/src/main/native/include/frc/Controller.h
diff --git a/wpilibc/src/main/native/include/ControllerPower.h b/wpilibc/src/main/native/include/frc/ControllerPower.h
similarity index 100%
rename from wpilibc/src/main/native/include/ControllerPower.h
rename to wpilibc/src/main/native/include/frc/ControllerPower.h
diff --git a/wpilibc/src/main/native/include/Counter.h b/wpilibc/src/main/native/include/frc/Counter.h
similarity index 98%
rename from wpilibc/src/main/native/include/Counter.h
rename to wpilibc/src/main/native/include/frc/Counter.h
index 45ea4d0ab0..eb7a82f9aa 100644
--- a/wpilibc/src/main/native/include/Counter.h
+++ b/wpilibc/src/main/native/include/frc/Counter.h
@@ -9,13 +9,13 @@
 
 #include <memory>
 
-#include <HAL/Counter.h>
-#include <HAL/Types.h>
+#include <hal/Counter.h>
+#include <hal/Types.h>
 
-#include "AnalogTrigger.h"
-#include "CounterBase.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/CounterBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/CounterBase.h b/wpilibc/src/main/native/include/frc/CounterBase.h
similarity index 100%
rename from wpilibc/src/main/native/include/CounterBase.h
rename to wpilibc/src/main/native/include/frc/CounterBase.h
diff --git a/wpilibc/src/main/native/include/DMC60.h b/wpilibc/src/main/native/include/frc/DMC60.h
similarity index 95%
rename from wpilibc/src/main/native/include/DMC60.h
rename to wpilibc/src/main/native/include/frc/DMC60.h
index d74659aacf..c1b30ba4d4 100644
--- a/wpilibc/src/main/native/include/DMC60.h
+++ b/wpilibc/src/main/native/include/frc/DMC60.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/DigitalGlitchFilter.h b/wpilibc/src/main/native/include/frc/DigitalGlitchFilter.h
similarity index 96%
rename from wpilibc/src/main/native/include/DigitalGlitchFilter.h
rename to wpilibc/src/main/native/include/frc/DigitalGlitchFilter.h
index b6f62972c9..59d7a3326c 100644
--- a/wpilibc/src/main/native/include/DigitalGlitchFilter.h
+++ b/wpilibc/src/main/native/include/frc/DigitalGlitchFilter.h
@@ -13,9 +13,9 @@
 
 #include <wpi/mutex.h>
 
-#include "DigitalSource.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/DigitalSource.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/DigitalInput.h b/wpilibc/src/main/native/include/frc/DigitalInput.h
similarity index 98%
rename from wpilibc/src/main/native/include/DigitalInput.h
rename to wpilibc/src/main/native/include/frc/DigitalInput.h
index 99398bb7ba..9355560244 100644
--- a/wpilibc/src/main/native/include/DigitalInput.h
+++ b/wpilibc/src/main/native/include/frc/DigitalInput.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "DigitalSource.h"
+#include "frc/DigitalSource.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/DigitalOutput.h b/wpilibc/src/main/native/include/frc/DigitalOutput.h
similarity index 97%
rename from wpilibc/src/main/native/include/DigitalOutput.h
rename to wpilibc/src/main/native/include/frc/DigitalOutput.h
index 6f31055f21..8f9ff744c6 100644
--- a/wpilibc/src/main/native/include/DigitalOutput.h
+++ b/wpilibc/src/main/native/include/frc/DigitalOutput.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/DigitalSource.h b/wpilibc/src/main/native/include/frc/DigitalSource.h
similarity index 95%
rename from wpilibc/src/main/native/include/DigitalSource.h
rename to wpilibc/src/main/native/include/frc/DigitalSource.h
index 74bab0b482..af63b409ed 100644
--- a/wpilibc/src/main/native/include/DigitalSource.h
+++ b/wpilibc/src/main/native/include/frc/DigitalSource.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "InterruptableSensorBase.h"
+#include "frc/InterruptableSensorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/DoubleSolenoid.h b/wpilibc/src/main/native/include/frc/DoubleSolenoid.h
similarity index 98%
rename from wpilibc/src/main/native/include/DoubleSolenoid.h
rename to wpilibc/src/main/native/include/frc/DoubleSolenoid.h
index 84b91fce72..ea8b901b0d 100644
--- a/wpilibc/src/main/native/include/DoubleSolenoid.h
+++ b/wpilibc/src/main/native/include/frc/DoubleSolenoid.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "SolenoidBase.h"
+#include "frc/SolenoidBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/DriverStation.h b/wpilibc/src/main/native/include/frc/DriverStation.h
similarity index 99%
rename from wpilibc/src/main/native/include/DriverStation.h
rename to wpilibc/src/main/native/include/frc/DriverStation.h
index 3927a81716..bf0c05776a 100644
--- a/wpilibc/src/main/native/include/DriverStation.h
+++ b/wpilibc/src/main/native/include/frc/DriverStation.h
@@ -13,14 +13,14 @@
 #include <string>
 #include <thread>
 
-#include <HAL/DriverStation.h>
+#include <hal/DriverStation.h>
 #include <wpi/Twine.h>
 #include <wpi/condition_variable.h>
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
-#include "RobotState.h"
+#include "frc/ErrorBase.h"
+#include "frc/RobotState.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Encoder.h b/wpilibc/src/main/native/include/frc/Encoder.h
similarity index 98%
rename from wpilibc/src/main/native/include/Encoder.h
rename to wpilibc/src/main/native/include/frc/Encoder.h
index 60f302efea..217ba48df9 100644
--- a/wpilibc/src/main/native/include/Encoder.h
+++ b/wpilibc/src/main/native/include/frc/Encoder.h
@@ -9,13 +9,13 @@
 
 #include <memory>
 
-#include <HAL/Encoder.h>
+#include <hal/Encoder.h>
 
-#include "Counter.h"
-#include "CounterBase.h"
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/Counter.h"
+#include "frc/CounterBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Error.h b/wpilibc/src/main/native/include/frc/Error.h
similarity index 98%
rename from wpilibc/src/main/native/include/Error.h
rename to wpilibc/src/main/native/include/frc/Error.h
index 274345112d..3a4ba6b1a9 100644
--- a/wpilibc/src/main/native/include/Error.h
+++ b/wpilibc/src/main/native/include/frc/Error.h
@@ -20,7 +20,7 @@
 #undef GetMessage
 #endif
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/ErrorBase.h b/wpilibc/src/main/native/include/frc/ErrorBase.h
similarity index 99%
rename from wpilibc/src/main/native/include/ErrorBase.h
rename to wpilibc/src/main/native/include/frc/ErrorBase.h
index 44c913bd67..b8afb7c768 100644
--- a/wpilibc/src/main/native/include/ErrorBase.h
+++ b/wpilibc/src/main/native/include/frc/ErrorBase.h
@@ -11,8 +11,8 @@
 #include <wpi/Twine.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
-#include "Error.h"
+#include "frc/Base.h"
+#include "frc/Error.h"
 
 #define wpi_setErrnoErrorWithContext(context) \
   this->SetErrnoError((context), __FILE__, __FUNCTION__, __LINE__)
diff --git a/wpilibc/src/main/native/include/GamepadBase.h b/wpilibc/src/main/native/include/frc/GamepadBase.h
similarity index 97%
rename from wpilibc/src/main/native/include/GamepadBase.h
rename to wpilibc/src/main/native/include/frc/GamepadBase.h
index 21c89f4803..ae6f8e4879 100644
--- a/wpilibc/src/main/native/include/GamepadBase.h
+++ b/wpilibc/src/main/native/include/frc/GamepadBase.h
@@ -9,7 +9,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/GearTooth.h b/wpilibc/src/main/native/include/frc/GearTooth.h
similarity index 99%
rename from wpilibc/src/main/native/include/GearTooth.h
rename to wpilibc/src/main/native/include/frc/GearTooth.h
index 009f96dfa8..6b735deaed 100644
--- a/wpilibc/src/main/native/include/GearTooth.h
+++ b/wpilibc/src/main/native/include/frc/GearTooth.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include "Counter.h"
+#include "frc/Counter.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/GenericHID.h b/wpilibc/src/main/native/include/frc/GenericHID.h
similarity index 99%
rename from wpilibc/src/main/native/include/GenericHID.h
rename to wpilibc/src/main/native/include/frc/GenericHID.h
index 3ff54c488b..ee66879428 100644
--- a/wpilibc/src/main/native/include/GenericHID.h
+++ b/wpilibc/src/main/native/include/frc/GenericHID.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/GyroBase.h b/wpilibc/src/main/native/include/frc/GyroBase.h
similarity index 89%
rename from wpilibc/src/main/native/include/GyroBase.h
rename to wpilibc/src/main/native/include/frc/GyroBase.h
index 0782465dbc..881abcb497 100644
--- a/wpilibc/src/main/native/include/GyroBase.h
+++ b/wpilibc/src/main/native/include/frc/GyroBase.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Gyro.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/interfaces/Gyro.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/I2C.h b/wpilibc/src/main/native/include/frc/I2C.h
similarity index 99%
rename from wpilibc/src/main/native/include/I2C.h
rename to wpilibc/src/main/native/include/frc/I2C.h
index bf04e3bedd..ecda61c689 100644
--- a/wpilibc/src/main/native/include/I2C.h
+++ b/wpilibc/src/main/native/include/frc/I2C.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 enum HAL_I2CPort : int32_t;
 
diff --git a/wpilibc/src/main/native/include/InterruptableSensorBase.h b/wpilibc/src/main/native/include/frc/InterruptableSensorBase.h
similarity index 96%
rename from wpilibc/src/main/native/include/InterruptableSensorBase.h
rename to wpilibc/src/main/native/include/frc/InterruptableSensorBase.h
index d70db3c289..f2612b746a 100644
--- a/wpilibc/src/main/native/include/InterruptableSensorBase.h
+++ b/wpilibc/src/main/native/include/frc/InterruptableSensorBase.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <HAL/Interrupts.h>
+#include <hal/Interrupts.h>
 
-#include "AnalogTriggerType.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogTriggerType.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/IterativeRobot.h b/wpilibc/src/main/native/include/frc/IterativeRobot.h
similarity index 97%
rename from wpilibc/src/main/native/include/IterativeRobot.h
rename to wpilibc/src/main/native/include/frc/IterativeRobot.h
index 7ef6218a08..730215c036 100644
--- a/wpilibc/src/main/native/include/IterativeRobot.h
+++ b/wpilibc/src/main/native/include/frc/IterativeRobot.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "IterativeRobotBase.h"
+#include "frc/IterativeRobotBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/IterativeRobotBase.h b/wpilibc/src/main/native/include/frc/IterativeRobotBase.h
similarity index 98%
rename from wpilibc/src/main/native/include/IterativeRobotBase.h
rename to wpilibc/src/main/native/include/frc/IterativeRobotBase.h
index 82c3842267..2eedf90ec4 100644
--- a/wpilibc/src/main/native/include/IterativeRobotBase.h
+++ b/wpilibc/src/main/native/include/frc/IterativeRobotBase.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "RobotBase.h"
-#include "Watchdog.h"
+#include "frc/RobotBase.h"
+#include "frc/Watchdog.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Jaguar.h b/wpilibc/src/main/native/include/frc/Jaguar.h
similarity index 96%
rename from wpilibc/src/main/native/include/Jaguar.h
rename to wpilibc/src/main/native/include/frc/Jaguar.h
index 2d170801bc..4a8c60cbde 100644
--- a/wpilibc/src/main/native/include/Jaguar.h
+++ b/wpilibc/src/main/native/include/frc/Jaguar.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Joystick.h b/wpilibc/src/main/native/include/frc/Joystick.h
similarity index 99%
rename from wpilibc/src/main/native/include/Joystick.h
rename to wpilibc/src/main/native/include/frc/Joystick.h
index 4236f6e377..432dd6dbc8 100644
--- a/wpilibc/src/main/native/include/Joystick.h
+++ b/wpilibc/src/main/native/include/frc/Joystick.h
@@ -11,7 +11,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/JoystickBase.h b/wpilibc/src/main/native/include/frc/JoystickBase.h
similarity index 97%
rename from wpilibc/src/main/native/include/JoystickBase.h
rename to wpilibc/src/main/native/include/frc/JoystickBase.h
index 0cbffd0006..83ff1953d9 100644
--- a/wpilibc/src/main/native/include/JoystickBase.h
+++ b/wpilibc/src/main/native/include/frc/JoystickBase.h
@@ -9,7 +9,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/MotorSafety.h b/wpilibc/src/main/native/include/frc/MotorSafety.h
similarity index 100%
rename from wpilibc/src/main/native/include/MotorSafety.h
rename to wpilibc/src/main/native/include/frc/MotorSafety.h
diff --git a/wpilibc/src/main/native/include/MotorSafetyHelper.h b/wpilibc/src/main/native/include/frc/MotorSafetyHelper.h
similarity index 99%
rename from wpilibc/src/main/native/include/MotorSafetyHelper.h
rename to wpilibc/src/main/native/include/frc/MotorSafetyHelper.h
index 9d5ac319e3..eb53917a37 100644
--- a/wpilibc/src/main/native/include/MotorSafetyHelper.h
+++ b/wpilibc/src/main/native/include/frc/MotorSafetyHelper.h
@@ -11,7 +11,7 @@
 
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/NidecBrushless.h b/wpilibc/src/main/native/include/frc/NidecBrushless.h
similarity index 94%
rename from wpilibc/src/main/native/include/NidecBrushless.h
rename to wpilibc/src/main/native/include/frc/NidecBrushless.h
index 2f3417f12b..d3353746a3 100644
--- a/wpilibc/src/main/native/include/NidecBrushless.h
+++ b/wpilibc/src/main/native/include/frc/NidecBrushless.h
@@ -9,13 +9,13 @@
 
 #include <atomic>
 
-#include "DigitalOutput.h"
-#include "ErrorBase.h"
-#include "MotorSafety.h"
-#include "MotorSafetyHelper.h"
-#include "PWM.h"
-#include "SmartDashboard/SendableBase.h"
-#include "SpeedController.h"
+#include "frc/DigitalOutput.h"
+#include "frc/ErrorBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/PWM.h"
+#include "frc/SpeedController.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Notifier.h b/wpilibc/src/main/native/include/frc/Notifier.h
similarity index 98%
rename from wpilibc/src/main/native/include/Notifier.h
rename to wpilibc/src/main/native/include/frc/Notifier.h
index 6eec7a422a..8e8970449f 100644
--- a/wpilibc/src/main/native/include/Notifier.h
+++ b/wpilibc/src/main/native/include/frc/Notifier.h
@@ -14,10 +14,10 @@
 #include <thread>
 #include <utility>
 
-#include <HAL/Notifier.h>
+#include <hal/Notifier.h>
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PIDBase.h b/wpilibc/src/main/native/include/frc/PIDBase.h
similarity index 98%
rename from wpilibc/src/main/native/include/PIDBase.h
rename to wpilibc/src/main/native/include/frc/PIDBase.h
index f20537f66f..966df1e918 100644
--- a/wpilibc/src/main/native/include/PIDBase.h
+++ b/wpilibc/src/main/native/include/frc/PIDBase.h
@@ -13,13 +13,13 @@
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "PIDInterface.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
-#include "Timer.h"
+#include "frc/Base.h"
+#include "frc/PIDInterface.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/Timer.h"
+#include "frc/filters/LinearDigitalFilter.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PIDController.h b/wpilibc/src/main/native/include/frc/PIDController.h
similarity index 95%
rename from wpilibc/src/main/native/include/PIDController.h
rename to wpilibc/src/main/native/include/frc/PIDController.h
index 8f4d9a0bee..ee78d353c1 100644
--- a/wpilibc/src/main/native/include/PIDController.h
+++ b/wpilibc/src/main/native/include/frc/PIDController.h
@@ -13,13 +13,13 @@
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
-#include "Controller.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "Notifier.h"
-#include "PIDBase.h"
-#include "PIDSource.h"
-#include "Timer.h"
+#include "frc/Base.h"
+#include "frc/Controller.h"
+#include "frc/Notifier.h"
+#include "frc/PIDBase.h"
+#include "frc/PIDSource.h"
+#include "frc/Timer.h"
+#include "frc/filters/LinearDigitalFilter.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PIDInterface.h b/wpilibc/src/main/native/include/frc/PIDInterface.h
similarity index 100%
rename from wpilibc/src/main/native/include/PIDInterface.h
rename to wpilibc/src/main/native/include/frc/PIDInterface.h
diff --git a/wpilibc/src/main/native/include/PIDOutput.h b/wpilibc/src/main/native/include/frc/PIDOutput.h
similarity index 97%
rename from wpilibc/src/main/native/include/PIDOutput.h
rename to wpilibc/src/main/native/include/frc/PIDOutput.h
index 5bc9210d9e..37fb2a1287 100644
--- a/wpilibc/src/main/native/include/PIDOutput.h
+++ b/wpilibc/src/main/native/include/frc/PIDOutput.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PIDSource.h b/wpilibc/src/main/native/include/frc/PIDSource.h
similarity index 100%
rename from wpilibc/src/main/native/include/PIDSource.h
rename to wpilibc/src/main/native/include/frc/PIDSource.h
diff --git a/wpilibc/src/main/native/include/PWM.h b/wpilibc/src/main/native/include/frc/PWM.h
similarity index 98%
rename from wpilibc/src/main/native/include/PWM.h
rename to wpilibc/src/main/native/include/frc/PWM.h
index 76ffb30980..dd5cecb315 100644
--- a/wpilibc/src/main/native/include/PWM.h
+++ b/wpilibc/src/main/native/include/frc/PWM.h
@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PWMSpeedController.h b/wpilibc/src/main/native/include/frc/PWMSpeedController.h
similarity index 96%
rename from wpilibc/src/main/native/include/PWMSpeedController.h
rename to wpilibc/src/main/native/include/frc/PWMSpeedController.h
index 8895a30733..02d8606e78 100644
--- a/wpilibc/src/main/native/include/PWMSpeedController.h
+++ b/wpilibc/src/main/native/include/frc/PWMSpeedController.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "SafePWM.h"
-#include "SpeedController.h"
+#include "frc/SafePWM.h"
+#include "frc/SpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PWMTalonSRX.h b/wpilibc/src/main/native/include/frc/PWMTalonSRX.h
similarity index 96%
rename from wpilibc/src/main/native/include/PWMTalonSRX.h
rename to wpilibc/src/main/native/include/frc/PWMTalonSRX.h
index d217001aa4..c26a4bc577 100644
--- a/wpilibc/src/main/native/include/PWMTalonSRX.h
+++ b/wpilibc/src/main/native/include/frc/PWMTalonSRX.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PWMVictorSPX.h b/wpilibc/src/main/native/include/frc/PWMVictorSPX.h
similarity index 96%
rename from wpilibc/src/main/native/include/PWMVictorSPX.h
rename to wpilibc/src/main/native/include/frc/PWMVictorSPX.h
index 369bdadd66..d873dcff06 100644
--- a/wpilibc/src/main/native/include/PWMVictorSPX.h
+++ b/wpilibc/src/main/native/include/frc/PWMVictorSPX.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/PowerDistributionPanel.h b/wpilibc/src/main/native/include/frc/PowerDistributionPanel.h
similarity index 96%
rename from wpilibc/src/main/native/include/PowerDistributionPanel.h
rename to wpilibc/src/main/native/include/frc/PowerDistributionPanel.h
index e887996470..5e5724e968 100644
--- a/wpilibc/src/main/native/include/PowerDistributionPanel.h
+++ b/wpilibc/src/main/native/include/frc/PowerDistributionPanel.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Preferences.h b/wpilibc/src/main/native/include/frc/Preferences.h
similarity index 99%
rename from wpilibc/src/main/native/include/Preferences.h
rename to wpilibc/src/main/native/include/frc/Preferences.h
index 958da9f85c..0ed8b2be4c 100644
--- a/wpilibc/src/main/native/include/Preferences.h
+++ b/wpilibc/src/main/native/include/frc/Preferences.h
@@ -15,7 +15,7 @@
 
 #include <networktables/NetworkTable.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Relay.h b/wpilibc/src/main/native/include/frc/Relay.h
similarity index 97%
rename from wpilibc/src/main/native/include/Relay.h
rename to wpilibc/src/main/native/include/frc/Relay.h
index 7454288486..10f7903489 100644
--- a/wpilibc/src/main/native/include/Relay.h
+++ b/wpilibc/src/main/native/include/frc/Relay.h
@@ -9,12 +9,12 @@
 
 #include <memory>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 #include <wpi/raw_ostream.h>
 
-#include "ErrorBase.h"
-#include "MotorSafety.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Resource.h b/wpilibc/src/main/native/include/frc/Resource.h
similarity index 99%
rename from wpilibc/src/main/native/include/Resource.h
rename to wpilibc/src/main/native/include/frc/Resource.h
index 838176804f..1bf5be0695 100644
--- a/wpilibc/src/main/native/include/Resource.h
+++ b/wpilibc/src/main/native/include/frc/Resource.h
@@ -15,7 +15,7 @@
 
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/RobotBase.h b/wpilibc/src/main/native/include/frc/RobotBase.h
similarity index 98%
rename from wpilibc/src/main/native/include/RobotBase.h
rename to wpilibc/src/main/native/include/frc/RobotBase.h
index 9a5e0d167f..063ee8ace9 100644
--- a/wpilibc/src/main/native/include/RobotBase.h
+++ b/wpilibc/src/main/native/include/frc/RobotBase.h
@@ -9,10 +9,10 @@
 
 #include <thread>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <wpi/raw_ostream.h>
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/RobotController.h b/wpilibc/src/main/native/include/frc/RobotController.h
similarity index 100%
rename from wpilibc/src/main/native/include/RobotController.h
rename to wpilibc/src/main/native/include/frc/RobotController.h
diff --git a/wpilibc/src/main/native/include/RobotDrive.h b/wpilibc/src/main/native/include/frc/RobotDrive.h
similarity index 99%
rename from wpilibc/src/main/native/include/RobotDrive.h
rename to wpilibc/src/main/native/include/frc/RobotDrive.h
index 584f239257..031af564aa 100644
--- a/wpilibc/src/main/native/include/RobotDrive.h
+++ b/wpilibc/src/main/native/include/frc/RobotDrive.h
@@ -12,9 +12,9 @@
 #include <wpi/deprecated.h>
 #include <wpi/raw_ostream.h>
 
-#include "ErrorBase.h"
-#include "MotorSafety.h"
-#include "MotorSafetyHelper.h"
+#include "frc/ErrorBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/MotorSafetyHelper.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/RobotState.h b/wpilibc/src/main/native/include/frc/RobotState.h
similarity index 100%
rename from wpilibc/src/main/native/include/RobotState.h
rename to wpilibc/src/main/native/include/frc/RobotState.h
diff --git a/wpilibc/src/main/native/include/SD540.h b/wpilibc/src/main/native/include/frc/SD540.h
similarity index 95%
rename from wpilibc/src/main/native/include/SD540.h
rename to wpilibc/src/main/native/include/frc/SD540.h
index cc006fdae4..26b83088e8 100644
--- a/wpilibc/src/main/native/include/SD540.h
+++ b/wpilibc/src/main/native/include/frc/SD540.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SPI.h b/wpilibc/src/main/native/include/frc/SPI.h
similarity index 99%
rename from wpilibc/src/main/native/include/SPI.h
rename to wpilibc/src/main/native/include/frc/SPI.h
index 5acf5baf67..4d8ed4d7e3 100644
--- a/wpilibc/src/main/native/include/SPI.h
+++ b/wpilibc/src/main/native/include/frc/SPI.h
@@ -14,7 +14,7 @@
 #include <wpi/ArrayRef.h>
 #include <wpi/deprecated.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 enum HAL_SPIPort : int32_t;
 
diff --git a/wpilibc/src/main/native/include/SafePWM.h b/wpilibc/src/main/native/include/frc/SafePWM.h
similarity index 97%
rename from wpilibc/src/main/native/include/SafePWM.h
rename to wpilibc/src/main/native/include/frc/SafePWM.h
index 0ffa8bcb06..722e310f78 100644
--- a/wpilibc/src/main/native/include/SafePWM.h
+++ b/wpilibc/src/main/native/include/frc/SafePWM.h
@@ -11,9 +11,9 @@
 
 #include <wpi/raw_ostream.h>
 
-#include "MotorSafety.h"
-#include "MotorSafetyHelper.h"
-#include "PWM.h"
+#include "frc/MotorSafety.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/PWM.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SampleRobot.h b/wpilibc/src/main/native/include/frc/SampleRobot.h
similarity index 99%
rename from wpilibc/src/main/native/include/SampleRobot.h
rename to wpilibc/src/main/native/include/frc/SampleRobot.h
index 2b7ec89da8..7ea29a45e9 100644
--- a/wpilibc/src/main/native/include/SampleRobot.h
+++ b/wpilibc/src/main/native/include/frc/SampleRobot.h
@@ -9,7 +9,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "RobotBase.h"
+#include "frc/RobotBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SensorUtil.h b/wpilibc/src/main/native/include/frc/SensorUtil.h
similarity index 100%
rename from wpilibc/src/main/native/include/SensorUtil.h
rename to wpilibc/src/main/native/include/frc/SensorUtil.h
diff --git a/wpilibc/src/main/native/include/SerialPort.h b/wpilibc/src/main/native/include/frc/SerialPort.h
similarity index 99%
rename from wpilibc/src/main/native/include/SerialPort.h
rename to wpilibc/src/main/native/include/frc/SerialPort.h
index f427280034..fdfdd865a4 100644
--- a/wpilibc/src/main/native/include/SerialPort.h
+++ b/wpilibc/src/main/native/include/frc/SerialPort.h
@@ -13,7 +13,7 @@
 #include <wpi/Twine.h>
 #include <wpi/deprecated.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Servo.h b/wpilibc/src/main/native/include/frc/Servo.h
similarity index 98%
rename from wpilibc/src/main/native/include/Servo.h
rename to wpilibc/src/main/native/include/frc/Servo.h
index d702fa9f4a..a9c1345c79 100644
--- a/wpilibc/src/main/native/include/Servo.h
+++ b/wpilibc/src/main/native/include/frc/Servo.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "SafePWM.h"
-#include "SpeedController.h"
+#include "frc/SafePWM.h"
+#include "frc/SpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Solenoid.h b/wpilibc/src/main/native/include/frc/Solenoid.h
similarity index 97%
rename from wpilibc/src/main/native/include/Solenoid.h
rename to wpilibc/src/main/native/include/frc/Solenoid.h
index c0f4372dca..0acf2c0fcc 100644
--- a/wpilibc/src/main/native/include/Solenoid.h
+++ b/wpilibc/src/main/native/include/frc/Solenoid.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "SolenoidBase.h"
+#include "frc/SolenoidBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SolenoidBase.h b/wpilibc/src/main/native/include/frc/SolenoidBase.h
similarity index 98%
rename from wpilibc/src/main/native/include/SolenoidBase.h
rename to wpilibc/src/main/native/include/frc/SolenoidBase.h
index 8b52c55385..5d0b157055 100644
--- a/wpilibc/src/main/native/include/SolenoidBase.h
+++ b/wpilibc/src/main/native/include/frc/SolenoidBase.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Spark.h b/wpilibc/src/main/native/include/frc/Spark.h
similarity index 95%
rename from wpilibc/src/main/native/include/Spark.h
rename to wpilibc/src/main/native/include/frc/Spark.h
index 7b91ad59e6..8507e3cf14 100644
--- a/wpilibc/src/main/native/include/Spark.h
+++ b/wpilibc/src/main/native/include/frc/Spark.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SpeedController.h b/wpilibc/src/main/native/include/frc/SpeedController.h
similarity index 98%
rename from wpilibc/src/main/native/include/SpeedController.h
rename to wpilibc/src/main/native/include/frc/SpeedController.h
index 28cb254a26..49a828b37b 100644
--- a/wpilibc/src/main/native/include/SpeedController.h
+++ b/wpilibc/src/main/native/include/frc/SpeedController.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PIDOutput.h"
+#include "frc/PIDOutput.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SpeedControllerGroup.h b/wpilibc/src/main/native/include/frc/SpeedControllerGroup.h
similarity index 91%
rename from wpilibc/src/main/native/include/SpeedControllerGroup.h
rename to wpilibc/src/main/native/include/frc/SpeedControllerGroup.h
index b14fbd9597..ed32a50ba8 100644
--- a/wpilibc/src/main/native/include/SpeedControllerGroup.h
+++ b/wpilibc/src/main/native/include/frc/SpeedControllerGroup.h
@@ -10,8 +10,8 @@
 #include <functional>
 #include <vector>
 
-#include "SmartDashboard/SendableBase.h"
-#include "SpeedController.h"
+#include "frc/SpeedController.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
@@ -39,4 +39,4 @@ class SpeedControllerGroup : public SendableBase, public SpeedController {
 
 }  // namespace frc
 
-#include "SpeedControllerGroup.inc"
+#include "frc/SpeedControllerGroup.inc"
diff --git a/wpilibc/src/main/native/include/SpeedControllerGroup.inc b/wpilibc/src/main/native/include/frc/SpeedControllerGroup.inc
similarity index 100%
rename from wpilibc/src/main/native/include/SpeedControllerGroup.inc
rename to wpilibc/src/main/native/include/frc/SpeedControllerGroup.inc
diff --git a/wpilibc/src/main/native/include/SynchronousPID.h b/wpilibc/src/main/native/include/frc/SynchronousPID.h
similarity index 98%
rename from wpilibc/src/main/native/include/SynchronousPID.h
rename to wpilibc/src/main/native/include/frc/SynchronousPID.h
index 498d579538..fedf053a41 100644
--- a/wpilibc/src/main/native/include/SynchronousPID.h
+++ b/wpilibc/src/main/native/include/frc/SynchronousPID.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PIDBase.h"
+#include "frc/PIDBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Talon.h b/wpilibc/src/main/native/include/frc/Talon.h
similarity index 96%
rename from wpilibc/src/main/native/include/Talon.h
rename to wpilibc/src/main/native/include/frc/Talon.h
index d095631c9a..41331a52d0 100644
--- a/wpilibc/src/main/native/include/Talon.h
+++ b/wpilibc/src/main/native/include/frc/Talon.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Threads.h b/wpilibc/src/main/native/include/frc/Threads.h
similarity index 100%
rename from wpilibc/src/main/native/include/Threads.h
rename to wpilibc/src/main/native/include/frc/Threads.h
diff --git a/wpilibc/src/main/native/include/TimedRobot.h b/wpilibc/src/main/native/include/frc/TimedRobot.h
similarity index 94%
rename from wpilibc/src/main/native/include/TimedRobot.h
rename to wpilibc/src/main/native/include/frc/TimedRobot.h
index 383847de15..7d1c4619ee 100644
--- a/wpilibc/src/main/native/include/TimedRobot.h
+++ b/wpilibc/src/main/native/include/frc/TimedRobot.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <HAL/Notifier.h>
+#include <hal/Notifier.h>
 
-#include "ErrorBase.h"
-#include "IterativeRobotBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/IterativeRobotBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Timer.h b/wpilibc/src/main/native/include/frc/Timer.h
similarity index 99%
rename from wpilibc/src/main/native/include/Timer.h
rename to wpilibc/src/main/native/include/frc/Timer.h
index d0b438b79b..c9e8ba4b4c 100644
--- a/wpilibc/src/main/native/include/Timer.h
+++ b/wpilibc/src/main/native/include/frc/Timer.h
@@ -10,7 +10,7 @@
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Ultrasonic.h b/wpilibc/src/main/native/include/frc/Ultrasonic.h
similarity index 98%
rename from wpilibc/src/main/native/include/Ultrasonic.h
rename to wpilibc/src/main/native/include/frc/Ultrasonic.h
index 113d1d6724..a1b247206b 100644
--- a/wpilibc/src/main/native/include/Ultrasonic.h
+++ b/wpilibc/src/main/native/include/frc/Ultrasonic.h
@@ -12,10 +12,10 @@
 #include <thread>
 #include <vector>
 
-#include "Counter.h"
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/Counter.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Utility.h b/wpilibc/src/main/native/include/frc/Utility.h
similarity index 100%
rename from wpilibc/src/main/native/include/Utility.h
rename to wpilibc/src/main/native/include/frc/Utility.h
diff --git a/wpilibc/src/main/native/include/Victor.h b/wpilibc/src/main/native/include/frc/Victor.h
similarity index 96%
rename from wpilibc/src/main/native/include/Victor.h
rename to wpilibc/src/main/native/include/frc/Victor.h
index a00b59d9b5..ef35e8c94c 100644
--- a/wpilibc/src/main/native/include/Victor.h
+++ b/wpilibc/src/main/native/include/frc/Victor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/VictorSP.h b/wpilibc/src/main/native/include/frc/VictorSP.h
similarity index 96%
rename from wpilibc/src/main/native/include/VictorSP.h
rename to wpilibc/src/main/native/include/frc/VictorSP.h
index 2e66542430..96776d2d70 100644
--- a/wpilibc/src/main/native/include/VictorSP.h
+++ b/wpilibc/src/main/native/include/frc/VictorSP.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/WPIErrors.h b/wpilibc/src/main/native/include/frc/WPIErrors.h
similarity index 100%
rename from wpilibc/src/main/native/include/WPIErrors.h
rename to wpilibc/src/main/native/include/frc/WPIErrors.h
diff --git a/wpilibc/src/main/native/include/frc/WPILib.h b/wpilibc/src/main/native/include/frc/WPILib.h
new file mode 100644
index 0000000000..27c7b690a8
--- /dev/null
+++ b/wpilibc/src/main/native/include/frc/WPILib.h
@@ -0,0 +1,100 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2008-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#include <cameraserver/CameraServer.h>
+#include <vision/VisionRunner.h>
+
+#include "frc/ADXL345_I2C.h"
+#include "frc/ADXL345_SPI.h"
+#include "frc/ADXL362.h"
+#include "frc/ADXRS450_Gyro.h"
+#include "frc/AnalogAccelerometer.h"
+#include "frc/AnalogGyro.h"
+#include "frc/AnalogInput.h"
+#include "frc/AnalogOutput.h"
+#include "frc/AnalogPotentiometer.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/AnalogTriggerOutput.h"
+#include "frc/BuiltInAccelerometer.h"
+#include "frc/Compressor.h"
+#include "frc/ControllerPower.h"
+#include "frc/Counter.h"
+#include "frc/DMC60.h"
+#include "frc/DigitalInput.h"
+#include "frc/DigitalOutput.h"
+#include "frc/DigitalSource.h"
+#include "frc/DoubleSolenoid.h"
+#include "frc/DriverStation.h"
+#include "frc/Encoder.h"
+#include "frc/ErrorBase.h"
+#include "frc/GearTooth.h"
+#include "frc/GenericHID.h"
+#include "frc/I2C.h"
+#include "frc/InterruptableSensorBase.h"
+#include "frc/IterativeRobot.h"
+#include "frc/Jaguar.h"
+#include "frc/Joystick.h"
+#include "frc/NidecBrushless.h"
+#include "frc/Notifier.h"
+#include "frc/PIDController.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/PWM.h"
+#include "frc/PWMSpeedController.h"
+#include "frc/PWMTalonSRX.h"
+#include "frc/PWMVictorSPX.h"
+#include "frc/PowerDistributionPanel.h"
+#include "frc/Preferences.h"
+#include "frc/Relay.h"
+#include "frc/RobotBase.h"
+#include "frc/RobotController.h"
+#include "frc/RobotDrive.h"
+#include "frc/SD540.h"
+#include "frc/SPI.h"
+#include "frc/SampleRobot.h"
+#include "frc/SensorUtil.h"
+#include "frc/SerialPort.h"
+#include "frc/Servo.h"
+#include "frc/Solenoid.h"
+#include "frc/Spark.h"
+#include "frc/SpeedController.h"
+#include "frc/SpeedControllerGroup.h"
+#include "frc/Talon.h"
+#include "frc/Threads.h"
+#include "frc/TimedRobot.h"
+#include "frc/Timer.h"
+#include "frc/Ultrasonic.h"
+#include "frc/Utility.h"
+#include "frc/Victor.h"
+#include "frc/VictorSP.h"
+#include "frc/WPIErrors.h"
+#include "frc/XboxController.h"
+#include "frc/buttons/InternalButton.h"
+#include "frc/buttons/JoystickButton.h"
+#include "frc/buttons/NetworkButton.h"
+#include "frc/commands/Command.h"
+#include "frc/commands/CommandGroup.h"
+#include "frc/commands/PIDCommand.h"
+#include "frc/commands/PIDSubsystem.h"
+#include "frc/commands/PrintCommand.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/commands/StartCommand.h"
+#include "frc/commands/Subsystem.h"
+#include "frc/commands/WaitCommand.h"
+#include "frc/commands/WaitForChildren.h"
+#include "frc/commands/WaitUntilCommand.h"
+#include "frc/drive/DifferentialDrive.h"
+#include "frc/drive/KilloughDrive.h"
+#include "frc/drive/MecanumDrive.h"
+#include "frc/filters/LinearDigitalFilter.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/interfaces/Gyro.h"
+#include "frc/interfaces/Potentiometer.h"
+#include "frc/smartdashboard/SendableChooser.h"
+#include "frc/smartdashboard/SmartDashboard.h"
diff --git a/wpilibc/src/main/native/include/Watchdog.h b/wpilibc/src/main/native/include/frc/Watchdog.h
similarity index 98%
rename from wpilibc/src/main/native/include/Watchdog.h
rename to wpilibc/src/main/native/include/frc/Watchdog.h
index b6006e7bf7..cc64d772e8 100644
--- a/wpilibc/src/main/native/include/Watchdog.h
+++ b/wpilibc/src/main/native/include/frc/Watchdog.h
@@ -12,7 +12,7 @@
 #include <wpi/StringMap.h>
 #include <wpi/StringRef.h>
 
-#include "Notifier.h"
+#include "frc/Notifier.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/XboxController.h b/wpilibc/src/main/native/include/frc/XboxController.h
similarity index 99%
rename from wpilibc/src/main/native/include/XboxController.h
rename to wpilibc/src/main/native/include/frc/XboxController.h
index d4e1a087af..17655d56a1 100644
--- a/wpilibc/src/main/native/include/XboxController.h
+++ b/wpilibc/src/main/native/include/frc/XboxController.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/Button.h b/wpilibc/src/main/native/include/frc/buttons/Button.h
similarity index 97%
rename from wpilibc/src/main/native/include/Buttons/Button.h
rename to wpilibc/src/main/native/include/frc/buttons/Button.h
index 4a8b5428f8..a80d96e03e 100644
--- a/wpilibc/src/main/native/include/Buttons/Button.h
+++ b/wpilibc/src/main/native/include/frc/buttons/Button.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Buttons/Trigger.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Trigger.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/ButtonScheduler.h b/wpilibc/src/main/native/include/frc/buttons/ButtonScheduler.h
similarity index 100%
rename from wpilibc/src/main/native/include/Buttons/ButtonScheduler.h
rename to wpilibc/src/main/native/include/frc/buttons/ButtonScheduler.h
diff --git a/wpilibc/src/main/native/include/Buttons/CancelButtonScheduler.h b/wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h
similarity index 95%
rename from wpilibc/src/main/native/include/Buttons/CancelButtonScheduler.h
rename to wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h
index 9b90a7970c..d74799f845 100644
--- a/wpilibc/src/main/native/include/Buttons/CancelButtonScheduler.h
+++ b/wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/HeldButtonScheduler.h b/wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h
similarity index 94%
rename from wpilibc/src/main/native/include/Buttons/HeldButtonScheduler.h
rename to wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h
index f7600e51a2..82f8628898 100644
--- a/wpilibc/src/main/native/include/Buttons/HeldButtonScheduler.h
+++ b/wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/InternalButton.h b/wpilibc/src/main/native/include/frc/buttons/InternalButton.h
similarity index 96%
rename from wpilibc/src/main/native/include/Buttons/InternalButton.h
rename to wpilibc/src/main/native/include/frc/buttons/InternalButton.h
index aa4c93b290..19c6924941 100644
--- a/wpilibc/src/main/native/include/Buttons/InternalButton.h
+++ b/wpilibc/src/main/native/include/frc/buttons/InternalButton.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/Button.h"
+#include "frc/buttons/Button.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/JoystickButton.h b/wpilibc/src/main/native/include/frc/buttons/JoystickButton.h
similarity index 92%
rename from wpilibc/src/main/native/include/Buttons/JoystickButton.h
rename to wpilibc/src/main/native/include/frc/buttons/JoystickButton.h
index a7ed9c2f39..1f36efdd49 100644
--- a/wpilibc/src/main/native/include/Buttons/JoystickButton.h
+++ b/wpilibc/src/main/native/include/frc/buttons/JoystickButton.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Buttons/Button.h"
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
+#include "frc/buttons/Button.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/NetworkButton.h b/wpilibc/src/main/native/include/frc/buttons/NetworkButton.h
similarity index 96%
rename from wpilibc/src/main/native/include/Buttons/NetworkButton.h
rename to wpilibc/src/main/native/include/frc/buttons/NetworkButton.h
index 3296adc05d..9eab4ce39c 100644
--- a/wpilibc/src/main/native/include/Buttons/NetworkButton.h
+++ b/wpilibc/src/main/native/include/frc/buttons/NetworkButton.h
@@ -13,7 +13,7 @@
 #include <networktables/NetworkTableEntry.h>
 #include <wpi/Twine.h>
 
-#include "Buttons/Button.h"
+#include "frc/buttons/Button.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/PressedButtonScheduler.h b/wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h
similarity index 95%
rename from wpilibc/src/main/native/include/Buttons/PressedButtonScheduler.h
rename to wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h
index ceab9decd1..43604f839a 100644
--- a/wpilibc/src/main/native/include/Buttons/PressedButtonScheduler.h
+++ b/wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/ReleasedButtonScheduler.h b/wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h
similarity index 95%
rename from wpilibc/src/main/native/include/Buttons/ReleasedButtonScheduler.h
rename to wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h
index c0782b85b6..b4d2c70bdc 100644
--- a/wpilibc/src/main/native/include/Buttons/ReleasedButtonScheduler.h
+++ b/wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/ToggleButtonScheduler.h b/wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h
similarity index 95%
rename from wpilibc/src/main/native/include/Buttons/ToggleButtonScheduler.h
rename to wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h
index 5e875e9feb..28831b8de4 100644
--- a/wpilibc/src/main/native/include/Buttons/ToggleButtonScheduler.h
+++ b/wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Buttons/Trigger.h b/wpilibc/src/main/native/include/frc/buttons/Trigger.h
similarity index 97%
rename from wpilibc/src/main/native/include/Buttons/Trigger.h
rename to wpilibc/src/main/native/include/frc/buttons/Trigger.h
index c25c25b47c..e5b0eb409c 100644
--- a/wpilibc/src/main/native/include/Buttons/Trigger.h
+++ b/wpilibc/src/main/native/include/frc/buttons/Trigger.h
@@ -9,7 +9,7 @@
 
 #include <atomic>
 
-#include "SmartDashboard/SendableBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/circular_buffer.h b/wpilibc/src/main/native/include/frc/circular_buffer.h
similarity index 97%
rename from wpilibc/src/main/native/include/circular_buffer.h
rename to wpilibc/src/main/native/include/frc/circular_buffer.h
index f54f94604b..1bc68d31d2 100644
--- a/wpilibc/src/main/native/include/circular_buffer.h
+++ b/wpilibc/src/main/native/include/frc/circular_buffer.h
@@ -59,4 +59,4 @@ class circular_buffer {
 
 }  // namespace frc
 
-#include "circular_buffer.inc"
+#include "frc/circular_buffer.inc"
diff --git a/wpilibc/src/main/native/include/circular_buffer.inc b/wpilibc/src/main/native/include/frc/circular_buffer.inc
similarity index 100%
rename from wpilibc/src/main/native/include/circular_buffer.inc
rename to wpilibc/src/main/native/include/frc/circular_buffer.inc
diff --git a/wpilibc/src/main/native/include/Commands/Command.h b/wpilibc/src/main/native/include/frc/commands/Command.h
similarity index 99%
rename from wpilibc/src/main/native/include/Commands/Command.h
rename to wpilibc/src/main/native/include/frc/commands/Command.h
index 3e619af191..de9e2d5234 100644
--- a/wpilibc/src/main/native/include/Commands/Command.h
+++ b/wpilibc/src/main/native/include/frc/commands/Command.h
@@ -13,8 +13,8 @@
 
 #include <wpi/Twine.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/CommandGroup.h b/wpilibc/src/main/native/include/frc/commands/CommandGroup.h
similarity index 98%
rename from wpilibc/src/main/native/include/Commands/CommandGroup.h
rename to wpilibc/src/main/native/include/frc/commands/CommandGroup.h
index 8aa81b228f..3c08f34647 100644
--- a/wpilibc/src/main/native/include/Commands/CommandGroup.h
+++ b/wpilibc/src/main/native/include/frc/commands/CommandGroup.h
@@ -11,8 +11,8 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
-#include "Commands/CommandGroupEntry.h"
+#include "frc/commands/Command.h"
+#include "frc/commands/CommandGroupEntry.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/CommandGroupEntry.h b/wpilibc/src/main/native/include/frc/commands/CommandGroupEntry.h
similarity index 100%
rename from wpilibc/src/main/native/include/Commands/CommandGroupEntry.h
rename to wpilibc/src/main/native/include/frc/commands/CommandGroupEntry.h
diff --git a/wpilibc/src/main/native/include/Commands/ConditionalCommand.h b/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h
similarity index 98%
rename from wpilibc/src/main/native/include/Commands/ConditionalCommand.h
rename to wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h
index f4586716c9..722d38602b 100644
--- a/wpilibc/src/main/native/include/Commands/ConditionalCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h
@@ -9,7 +9,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/InstantCommand.h b/wpilibc/src/main/native/include/frc/commands/InstantCommand.h
similarity index 96%
rename from wpilibc/src/main/native/include/Commands/InstantCommand.h
rename to wpilibc/src/main/native/include/frc/commands/InstantCommand.h
index e8ee66161a..a188bbcffc 100644
--- a/wpilibc/src/main/native/include/Commands/InstantCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/InstantCommand.h
@@ -9,7 +9,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/PIDCommand.h b/wpilibc/src/main/native/include/frc/commands/PIDCommand.h
similarity index 93%
rename from wpilibc/src/main/native/include/Commands/PIDCommand.h
rename to wpilibc/src/main/native/include/frc/commands/PIDCommand.h
index 42be0889b2..5df6341105 100644
--- a/wpilibc/src/main/native/include/Commands/PIDCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/PIDCommand.h
@@ -11,10 +11,10 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
-#include "PIDController.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
+#include "frc/PIDController.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/PIDSubsystem.h b/wpilibc/src/main/native/include/frc/commands/PIDSubsystem.h
similarity index 98%
rename from wpilibc/src/main/native/include/Commands/PIDSubsystem.h
rename to wpilibc/src/main/native/include/frc/commands/PIDSubsystem.h
index 22f50d6c4b..734c3877a5 100644
--- a/wpilibc/src/main/native/include/Commands/PIDSubsystem.h
+++ b/wpilibc/src/main/native/include/frc/commands/PIDSubsystem.h
@@ -11,10 +11,10 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Subsystem.h"
-#include "PIDController.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
+#include "frc/PIDController.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/commands/Subsystem.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/PrintCommand.h b/wpilibc/src/main/native/include/frc/commands/PrintCommand.h
similarity index 95%
rename from wpilibc/src/main/native/include/Commands/PrintCommand.h
rename to wpilibc/src/main/native/include/frc/commands/PrintCommand.h
index 5a5365ff7b..9fead6b175 100644
--- a/wpilibc/src/main/native/include/Commands/PrintCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/PrintCommand.h
@@ -11,7 +11,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/InstantCommand.h"
+#include "frc/commands/InstantCommand.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/Scheduler.h b/wpilibc/src/main/native/include/frc/commands/Scheduler.h
similarity index 96%
rename from wpilibc/src/main/native/include/Commands/Scheduler.h
rename to wpilibc/src/main/native/include/frc/commands/Scheduler.h
index bf96dad28c..fbb70f898a 100644
--- a/wpilibc/src/main/native/include/Commands/Scheduler.h
+++ b/wpilibc/src/main/native/include/frc/commands/Scheduler.h
@@ -15,9 +15,9 @@
 #include <networktables/NetworkTableEntry.h>
 #include <wpi/mutex.h>
 
-#include "Commands/Command.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/commands/Command.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/StartCommand.h b/wpilibc/src/main/native/include/frc/commands/StartCommand.h
similarity index 94%
rename from wpilibc/src/main/native/include/Commands/StartCommand.h
rename to wpilibc/src/main/native/include/frc/commands/StartCommand.h
index 71168eb915..50d6b10609 100644
--- a/wpilibc/src/main/native/include/Commands/StartCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/StartCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Commands/InstantCommand.h"
+#include "frc/commands/InstantCommand.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/Subsystem.h b/wpilibc/src/main/native/include/frc/commands/Subsystem.h
similarity index 97%
rename from wpilibc/src/main/native/include/Commands/Subsystem.h
rename to wpilibc/src/main/native/include/frc/commands/Subsystem.h
index ac034aca98..4cde4bfeb9 100644
--- a/wpilibc/src/main/native/include/Commands/Subsystem.h
+++ b/wpilibc/src/main/native/include/frc/commands/Subsystem.h
@@ -12,9 +12,9 @@
 #include <wpi/StringRef.h>
 #include <wpi/Twine.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/Sendable.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/Sendable.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/TimedCommand.h b/wpilibc/src/main/native/include/frc/commands/TimedCommand.h
similarity index 97%
rename from wpilibc/src/main/native/include/Commands/TimedCommand.h
rename to wpilibc/src/main/native/include/frc/commands/TimedCommand.h
index 8cce38ed01..da5585ace5 100644
--- a/wpilibc/src/main/native/include/Commands/TimedCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/TimedCommand.h
@@ -9,7 +9,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/WaitCommand.h b/wpilibc/src/main/native/include/frc/commands/WaitCommand.h
similarity index 96%
rename from wpilibc/src/main/native/include/Commands/WaitCommand.h
rename to wpilibc/src/main/native/include/frc/commands/WaitCommand.h
index f09cc02272..48d28ebc5c 100644
--- a/wpilibc/src/main/native/include/Commands/WaitCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/WaitCommand.h
@@ -9,7 +9,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/TimedCommand.h"
+#include "frc/commands/TimedCommand.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/WaitForChildren.h b/wpilibc/src/main/native/include/frc/commands/WaitForChildren.h
similarity index 95%
rename from wpilibc/src/main/native/include/Commands/WaitForChildren.h
rename to wpilibc/src/main/native/include/frc/commands/WaitForChildren.h
index cefe9f9e7f..720905eee1 100644
--- a/wpilibc/src/main/native/include/Commands/WaitForChildren.h
+++ b/wpilibc/src/main/native/include/frc/commands/WaitForChildren.h
@@ -9,7 +9,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/WaitUntilCommand.h b/wpilibc/src/main/native/include/frc/commands/WaitUntilCommand.h
similarity index 97%
rename from wpilibc/src/main/native/include/Commands/WaitUntilCommand.h
rename to wpilibc/src/main/native/include/frc/commands/WaitUntilCommand.h
index aacba28489..13cb125bcf 100644
--- a/wpilibc/src/main/native/include/Commands/WaitUntilCommand.h
+++ b/wpilibc/src/main/native/include/frc/commands/WaitUntilCommand.h
@@ -9,7 +9,7 @@
 
 #include <wpi/Twine.h>
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Drive/DifferentialDrive.h b/wpilibc/src/main/native/include/frc/drive/DifferentialDrive.h
similarity index 99%
rename from wpilibc/src/main/native/include/Drive/DifferentialDrive.h
rename to wpilibc/src/main/native/include/frc/drive/DifferentialDrive.h
index 9a7f377ea9..5f9db3512f 100644
--- a/wpilibc/src/main/native/include/Drive/DifferentialDrive.h
+++ b/wpilibc/src/main/native/include/frc/drive/DifferentialDrive.h
@@ -9,7 +9,7 @@
 
 #include <wpi/raw_ostream.h>
 
-#include "Drive/RobotDriveBase.h"
+#include "frc/drive/RobotDriveBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Drive/KilloughDrive.h b/wpilibc/src/main/native/include/frc/drive/KilloughDrive.h
similarity index 98%
rename from wpilibc/src/main/native/include/Drive/KilloughDrive.h
rename to wpilibc/src/main/native/include/frc/drive/KilloughDrive.h
index 1fa71501ed..5abfe20d4f 100644
--- a/wpilibc/src/main/native/include/Drive/KilloughDrive.h
+++ b/wpilibc/src/main/native/include/frc/drive/KilloughDrive.h
@@ -11,8 +11,8 @@
 
 #include <wpi/raw_ostream.h>
 
-#include "Drive/RobotDriveBase.h"
-#include "Drive/Vector2d.h"
+#include "frc/drive/RobotDriveBase.h"
+#include "frc/drive/Vector2d.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Drive/MecanumDrive.h b/wpilibc/src/main/native/include/frc/drive/MecanumDrive.h
similarity index 99%
rename from wpilibc/src/main/native/include/Drive/MecanumDrive.h
rename to wpilibc/src/main/native/include/frc/drive/MecanumDrive.h
index 15a458b6b4..bc771ce161 100644
--- a/wpilibc/src/main/native/include/Drive/MecanumDrive.h
+++ b/wpilibc/src/main/native/include/frc/drive/MecanumDrive.h
@@ -11,7 +11,7 @@
 
 #include <wpi/raw_ostream.h>
 
-#include "Drive/RobotDriveBase.h"
+#include "frc/drive/RobotDriveBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Drive/RobotDriveBase.h b/wpilibc/src/main/native/include/frc/drive/RobotDriveBase.h
similarity index 96%
rename from wpilibc/src/main/native/include/Drive/RobotDriveBase.h
rename to wpilibc/src/main/native/include/frc/drive/RobotDriveBase.h
index 5566a7ee3e..3662fb59ec 100644
--- a/wpilibc/src/main/native/include/Drive/RobotDriveBase.h
+++ b/wpilibc/src/main/native/include/frc/drive/RobotDriveBase.h
@@ -12,9 +12,9 @@
 #include <wpi/ArrayRef.h>
 #include <wpi/raw_ostream.h>
 
-#include "MotorSafety.h"
-#include "MotorSafetyHelper.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Drive/Vector2d.h b/wpilibc/src/main/native/include/frc/drive/Vector2d.h
similarity index 100%
rename from wpilibc/src/main/native/include/Drive/Vector2d.h
rename to wpilibc/src/main/native/include/frc/drive/Vector2d.h
diff --git a/wpilibc/src/main/native/include/Filters/Filter.h b/wpilibc/src/main/native/include/frc/filters/Filter.h
similarity index 98%
rename from wpilibc/src/main/native/include/Filters/Filter.h
rename to wpilibc/src/main/native/include/frc/filters/Filter.h
index 3168c5e77d..6c5ef43e10 100644
--- a/wpilibc/src/main/native/include/Filters/Filter.h
+++ b/wpilibc/src/main/native/include/frc/filters/Filter.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "PIDSource.h"
+#include "frc/PIDSource.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Filters/LinearDigitalFilter.h b/wpilibc/src/main/native/include/frc/filters/LinearDigitalFilter.h
similarity index 99%
rename from wpilibc/src/main/native/include/Filters/LinearDigitalFilter.h
rename to wpilibc/src/main/native/include/frc/filters/LinearDigitalFilter.h
index 325d238ec3..2e62c6c803 100644
--- a/wpilibc/src/main/native/include/Filters/LinearDigitalFilter.h
+++ b/wpilibc/src/main/native/include/frc/filters/LinearDigitalFilter.h
@@ -12,8 +12,8 @@
 
 #include <wpi/ArrayRef.h>
 
-#include "Filter.h"
-#include "circular_buffer.h"
+#include "frc/circular_buffer.h"
+#include "frc/filters/Filter.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/interfaces/Accelerometer.h b/wpilibc/src/main/native/include/frc/interfaces/Accelerometer.h
similarity index 100%
rename from wpilibc/src/main/native/include/interfaces/Accelerometer.h
rename to wpilibc/src/main/native/include/frc/interfaces/Accelerometer.h
diff --git a/wpilibc/src/main/native/include/interfaces/Gyro.h b/wpilibc/src/main/native/include/frc/interfaces/Gyro.h
similarity index 100%
rename from wpilibc/src/main/native/include/interfaces/Gyro.h
rename to wpilibc/src/main/native/include/frc/interfaces/Gyro.h
diff --git a/wpilibc/src/main/native/include/interfaces/Potentiometer.h b/wpilibc/src/main/native/include/frc/interfaces/Potentiometer.h
similarity index 97%
rename from wpilibc/src/main/native/include/interfaces/Potentiometer.h
rename to wpilibc/src/main/native/include/frc/interfaces/Potentiometer.h
index e3992963d8..0b2c7e360e 100644
--- a/wpilibc/src/main/native/include/interfaces/Potentiometer.h
+++ b/wpilibc/src/main/native/include/frc/interfaces/Potentiometer.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PIDSource.h"
+#include "frc/PIDSource.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/LiveWindow/LiveWindow.h b/wpilibc/src/main/native/include/frc/livewindow/LiveWindow.h
similarity index 99%
rename from wpilibc/src/main/native/include/LiveWindow/LiveWindow.h
rename to wpilibc/src/main/native/include/frc/livewindow/LiveWindow.h
index 60be1d1bb3..1c5477684e 100644
--- a/wpilibc/src/main/native/include/LiveWindow/LiveWindow.h
+++ b/wpilibc/src/main/native/include/frc/livewindow/LiveWindow.h
@@ -12,7 +12,7 @@
 #include <wpi/Twine.h>
 #include <wpi/deprecated.h>
 
-#include "SmartDashboard/Sendable.h"
+#include "frc/smartdashboard/Sendable.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/LiveWindow/LiveWindowSendable.h b/wpilibc/src/main/native/include/frc/livewindow/LiveWindowSendable.h
similarity index 97%
rename from wpilibc/src/main/native/include/LiveWindow/LiveWindowSendable.h
rename to wpilibc/src/main/native/include/frc/livewindow/LiveWindowSendable.h
index b5e7bfff37..1d62efbe46 100644
--- a/wpilibc/src/main/native/include/LiveWindow/LiveWindowSendable.h
+++ b/wpilibc/src/main/native/include/frc/livewindow/LiveWindowSendable.h
@@ -11,7 +11,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "SmartDashboard/Sendable.h"
+#include "frc/smartdashboard/Sendable.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/NamedSendable.h b/wpilibc/src/main/native/include/frc/smartdashboard/NamedSendable.h
similarity index 96%
rename from wpilibc/src/main/native/include/SmartDashboard/NamedSendable.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/NamedSendable.h
index bb308bcf9b..1e8ea92fd6 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/NamedSendable.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/NamedSendable.h
@@ -11,7 +11,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "SmartDashboard/Sendable.h"
+#include "frc/smartdashboard/Sendable.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/Sendable.h b/wpilibc/src/main/native/include/frc/smartdashboard/Sendable.h
similarity index 100%
rename from wpilibc/src/main/native/include/SmartDashboard/Sendable.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/Sendable.h
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableBase.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBase.h
similarity index 98%
rename from wpilibc/src/main/native/include/SmartDashboard/SendableBase.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/SendableBase.h
index c1fe1bc74d..dba38d3438 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableBase.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBase.h
@@ -12,7 +12,7 @@
 
 #include <wpi/mutex.h>
 
-#include "Sendable.h"
+#include "frc/smartdashboard/Sendable.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h
similarity index 100%
rename from wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
similarity index 99%
rename from wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
index 759eaffaab..ab80d4c6ce 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
@@ -20,7 +20,7 @@
 #include <wpi/SmallVector.h>
 #include <wpi/Twine.h>
 
-#include "SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h
similarity index 92%
rename from wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h
index b0a2c01a57..4da98ad19e 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h
@@ -12,7 +12,8 @@
 #include <wpi/StringMap.h>
 #include <wpi/StringRef.h>
 
-#include "SmartDashboard/SendableChooserBase.h"
+#include "frc/smartdashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableChooserBase.h"
 
 namespace frc {
 
@@ -55,4 +56,4 @@ class SendableChooser : public SendableChooserBase {
 
 }  // namespace frc
 
-#include "SendableChooser.inc"
+#include "frc/smartdashboard/SendableChooser.inc"
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.inc b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.inc
similarity index 99%
rename from wpilibc/src/main/native/include/SmartDashboard/SendableChooser.inc
rename to wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.inc
index 15a7efd1fb..3b9f731a58 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableChooser.inc
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.inc
@@ -15,8 +15,6 @@
 
 #include <wpi/StringRef.h>
 
-#include "SendableBuilder.h"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooserBase.h
similarity index 96%
rename from wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/SendableChooserBase.h
index 6c4ec2d9ea..b77fc02e57 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooserBase.h
@@ -11,7 +11,7 @@
 
 #include <networktables/NetworkTableEntry.h>
 
-#include "SmartDashboard/SendableBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h b/wpilibc/src/main/native/include/frc/smartdashboard/SmartDashboard.h
similarity index 99%
rename from wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h
rename to wpilibc/src/main/native/include/frc/smartdashboard/SmartDashboard.h
index 15d3f3c9d9..903fb8b8b6 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SmartDashboard.h
@@ -13,8 +13,8 @@
 
 #include <networktables/NetworkTableValue.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/test/native/c/test.c b/wpilibc/src/test/native/c/test.c
index 45d83b50b4..105e289cc8 100644
--- a/wpilibc/src/test/native/c/test.c
+++ b/wpilibc/src/test/native/c/test.c
@@ -5,7 +5,6 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <HAL/HAL.h>
-
-#include "cscore.h"
-#include "ntcore.h"
+#include <cscore.h>
+#include <hal/HAL.h>
+#include <ntcore.h>
diff --git a/wpilibc/src/test/native/cpp/main.cpp b/wpilibc/src/test/native/cpp/main.cpp
index 298f23c1f8..0e00efa33d 100644
--- a/wpilibc/src/test/native/cpp/main.cpp
+++ b/wpilibc/src/test/native/cpp/main.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 #include "gtest/gtest.h"
 
diff --git a/wpilibcExamples/.styleguide b/wpilibcExamples/.styleguide
new file mode 100644
index 0000000000..d39dee7d7b
--- /dev/null
+++ b/wpilibcExamples/.styleguide
@@ -0,0 +1,22 @@
+cppHeaderFileInclude {
+  \.h$
+  \.hpp$
+  \.inc$
+}
+
+cppSrcFileInclude {
+  \.cpp$
+}
+
+includeOtherLibs {
+  ^HAL/
+  ^cameraserver/
+  ^cscore
+  ^frc/
+  ^networktables/
+  ^ntcore
+  ^opencv2/
+  ^support/
+  ^vision/
+  ^wpi/
+}
diff --git a/wpilibcExamples/src/main/cpp/commands/command/ReplaceMeCommand.h b/wpilibcExamples/src/main/cpp/commands/command/ReplaceMeCommand.h
index 9762deac18..49a3139ee6 100644
--- a/wpilibcExamples/src/main/cpp/commands/command/ReplaceMeCommand.h
+++ b/wpilibcExamples/src/main/cpp/commands/command/ReplaceMeCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 class ReplaceMeCommand : public frc::Command {
  public:
diff --git a/wpilibcExamples/src/main/cpp/commands/commandgroup/ReplaceMeCommandGroup.h b/wpilibcExamples/src/main/cpp/commands/commandgroup/ReplaceMeCommandGroup.h
index bafef5ddcc..a58f586278 100644
--- a/wpilibcExamples/src/main/cpp/commands/commandgroup/ReplaceMeCommandGroup.h
+++ b/wpilibcExamples/src/main/cpp/commands/commandgroup/ReplaceMeCommandGroup.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 class ReplaceMeCommandGroup : public frc::CommandGroup {
  public:
diff --git a/wpilibcExamples/src/main/cpp/commands/instant/ReplaceMeInstantCommand.h b/wpilibcExamples/src/main/cpp/commands/instant/ReplaceMeInstantCommand.h
index b1ff17210a..b50b61767f 100644
--- a/wpilibcExamples/src/main/cpp/commands/instant/ReplaceMeInstantCommand.h
+++ b/wpilibcExamples/src/main/cpp/commands/instant/ReplaceMeInstantCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Commands/InstantCommand.h"
+#include <frc/commands/InstantCommand.h>
 
 class ReplaceMeInstantCommand : public frc::InstantCommand {
  public:
diff --git a/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.cpp b/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.cpp
index 8466110f74..f446f8ebac 100644
--- a/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.cpp
@@ -7,8 +7,8 @@
 
 #include "ReplaceMePIDSubsystem.h"
 
-#include <LiveWindow/LiveWindow.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/livewindow/LiveWindow.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 ReplaceMePIDSubsystem::ReplaceMePIDSubsystem()
     : PIDSubsystem("ReplaceMePIDSubsystem", 1.0, 0.0, 0.0) {
diff --git a/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.h b/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.h
index a7d51b6c1b..2ab3d926c1 100644
--- a/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/commands/pidsubsystem/ReplaceMePIDSubsystem.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/PIDSubsystem.h>
+#include <frc/commands/PIDSubsystem.h>
 
 class ReplaceMePIDSubsystem : public frc::PIDSubsystem {
  public:
diff --git a/wpilibcExamples/src/main/cpp/commands/subsystem/ReplaceMeSubsystem.h b/wpilibcExamples/src/main/cpp/commands/subsystem/ReplaceMeSubsystem.h
index aacb8f8877..de84a48930 100644
--- a/wpilibcExamples/src/main/cpp/commands/subsystem/ReplaceMeSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/commands/subsystem/ReplaceMeSubsystem.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Subsystem.h>
+#include <frc/commands/Subsystem.h>
 
 class ReplaceMeSubsystem : public frc::Subsystem {
  private:
diff --git a/wpilibcExamples/src/main/cpp/commands/timed/ReplaceMeTimedCommand.h b/wpilibcExamples/src/main/cpp/commands/timed/ReplaceMeTimedCommand.h
index 1c31c71d2b..bf55e45fb5 100644
--- a/wpilibcExamples/src/main/cpp/commands/timed/ReplaceMeTimedCommand.h
+++ b/wpilibcExamples/src/main/cpp/commands/timed/ReplaceMeTimedCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Commands/TimedCommand.h"
+#include <frc/commands/TimedCommand.h>
 
 class ReplaceMeTimedCommand : public frc::TimedCommand {
  public:
diff --git a/wpilibcExamples/src/main/cpp/commands/trigger/ReplaceMeTrigger.h b/wpilibcExamples/src/main/cpp/commands/trigger/ReplaceMeTrigger.h
index a369c6bb64..9da7ef8838 100644
--- a/wpilibcExamples/src/main/cpp/commands/trigger/ReplaceMeTrigger.h
+++ b/wpilibcExamples/src/main/cpp/commands/trigger/ReplaceMeTrigger.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Buttons/Trigger.h>
+#include <frc/buttons/Trigger.h>
 
 class ReplaceMeTrigger : public frc::Trigger {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
index b071614a72..9cc8a2c984 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <Drive/DifferentialDrive.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Spark.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
+#include <frc/drive/DifferentialDrive.h>
 
 /**
  * This is a demo program showing the use of the DifferentialDrive class.
diff --git a/wpilibcExamples/src/main/cpp/examples/AxisCameraSample/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/AxisCameraSample/cpp/Robot.cpp
index c139d5cd64..b58fc7f97e 100644
--- a/wpilibcExamples/src/main/cpp/examples/AxisCameraSample/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/AxisCameraSample/cpp/Robot.cpp
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <CameraServer.h>
-#include <IterativeRobot.h>
+#include <cameraserver/CameraServer.h>
+#include <frc/IterativeRobot.h>
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/types.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
diff --git a/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp
index c1340a7c2b..695db1e7d9 100644
--- a/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <IterativeRobot.h>
-#include <PowerDistributionPanel.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/IterativeRobot.h>
+#include <frc/PowerDistributionPanel.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 /**
  * This is a sample program showing how to retrieve information from the Power
diff --git a/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp
index 0602f8ba27..c0312335a4 100644
--- a/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <Encoder.h>
-#include <IterativeRobot.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/Encoder.h>
+#include <frc/IterativeRobot.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 /**
  * Sample program displaying the value of a quadrature encoder on the
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/OI.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/OI.cpp
index 6b97aed9ed..bd0e922c03 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/OI.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/OI.cpp
@@ -7,15 +7,15 @@
 
 #include "OI.h"
 
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
-#include "Commands/Autonomous.h"
-#include "Commands/CloseClaw.h"
-#include "Commands/OpenClaw.h"
-#include "Commands/Pickup.h"
-#include "Commands/Place.h"
-#include "Commands/PrepareToPickup.h"
-#include "Commands/SetElevatorSetpoint.h"
+#include "commands/Autonomous.h"
+#include "commands/CloseClaw.h"
+#include "commands/OpenClaw.h"
+#include "commands/Pickup.h"
+#include "commands/Place.h"
+#include "commands/PrepareToPickup.h"
+#include "commands/SetElevatorSetpoint.h"
 
 OI::OI() {
   frc::SmartDashboard::PutData("Open Claw", new OpenClaw());
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Autonomous.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Autonomous.cpp
similarity index 78%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Autonomous.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Autonomous.cpp
index 54369da3ad..30ce002890 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Autonomous.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Autonomous.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Autonomous.h"
+#include "commands/Autonomous.h"
 
-#include "Commands/CloseClaw.h"
-#include "Commands/DriveStraight.h"
-#include "Commands/Pickup.h"
-#include "Commands/Place.h"
-#include "Commands/PrepareToPickup.h"
-#include "Commands/SetDistanceToBox.h"
-#include "Commands/SetWristSetpoint.h"
+#include "commands/CloseClaw.h"
+#include "commands/DriveStraight.h"
+#include "commands/Pickup.h"
+#include "commands/Place.h"
+#include "commands/PrepareToPickup.h"
+#include "commands/SetDistanceToBox.h"
+#include "commands/SetWristSetpoint.h"
 
 Autonomous::Autonomous() : frc::CommandGroup("Autonomous") {
   AddSequential(new PrepareToPickup());
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/CloseClaw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/CloseClaw.cpp
similarity index 97%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/CloseClaw.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/CloseClaw.cpp
index 01ed78c941..e1a2f6ec64 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/CloseClaw.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/CloseClaw.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CloseClaw.h"
+#include "commands/CloseClaw.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/DriveStraight.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/DriveStraight.cpp
similarity index 97%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/DriveStraight.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/DriveStraight.cpp
index 51b8326c03..dfd1744cf6 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/DriveStraight.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/DriveStraight.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/DriveStraight.h"
+#include "commands/DriveStraight.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/OpenClaw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/OpenClaw.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/OpenClaw.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/OpenClaw.cpp
index b382eddf82..175f3c16bc 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/OpenClaw.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/OpenClaw.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/OpenClaw.h"
+#include "commands/OpenClaw.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Pickup.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Pickup.cpp
similarity index 82%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Pickup.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Pickup.cpp
index 42433d9a0d..b5d8dd14b1 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Pickup.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Pickup.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Pickup.h"
+#include "commands/Pickup.h"
 
-#include "Commands/CloseClaw.h"
-#include "Commands/SetElevatorSetpoint.h"
-#include "Commands/SetWristSetpoint.h"
+#include "commands/CloseClaw.h"
+#include "commands/SetElevatorSetpoint.h"
+#include "commands/SetWristSetpoint.h"
 
 Pickup::Pickup() : frc::CommandGroup("Pickup") {
   AddSequential(new CloseClaw());
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Place.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Place.cpp
similarity index 82%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Place.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Place.cpp
index 026056bf90..cf31d3ca80 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Place.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Place.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Place.h"
+#include "commands/Place.h"
 
-#include "Commands/OpenClaw.h"
-#include "Commands/SetElevatorSetpoint.h"
-#include "Commands/SetWristSetpoint.h"
+#include "commands/OpenClaw.h"
+#include "commands/SetElevatorSetpoint.h"
+#include "commands/SetWristSetpoint.h"
 
 Place::Place() : frc::CommandGroup("Place") {
   AddSequential(new SetElevatorSetpoint(0.25));
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/PrepareToPickup.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/PrepareToPickup.cpp
similarity index 81%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/PrepareToPickup.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/PrepareToPickup.cpp
index 94d575659e..af8f0c7330 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/PrepareToPickup.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/PrepareToPickup.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PrepareToPickup.h"
+#include "commands/PrepareToPickup.h"
 
-#include "Commands/OpenClaw.h"
-#include "Commands/SetElevatorSetpoint.h"
-#include "Commands/SetWristSetpoint.h"
+#include "commands/OpenClaw.h"
+#include "commands/SetElevatorSetpoint.h"
+#include "commands/SetWristSetpoint.h"
 
 PrepareToPickup::PrepareToPickup() : frc::CommandGroup("PrepareToPickup") {
   AddParallel(new OpenClaw());
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetDistanceToBox.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetDistanceToBox.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetDistanceToBox.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetDistanceToBox.cpp
index 1e723a19dc..a0921e800d 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetDistanceToBox.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetDistanceToBox.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/SetDistanceToBox.h"
+#include "commands/SetDistanceToBox.h"
 
-#include <PIDController.h>
+#include <frc/PIDController.h>
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetElevatorSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetElevatorSetpoint.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetElevatorSetpoint.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetElevatorSetpoint.cpp
index 28c799a008..afe85e594f 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetElevatorSetpoint.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetElevatorSetpoint.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/SetElevatorSetpoint.h"
+#include "commands/SetElevatorSetpoint.h"
 
 #include <cmath>
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetWristSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetWristSetpoint.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetWristSetpoint.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetWristSetpoint.cpp
index d59497a8da..e9dc2af2d9 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetWristSetpoint.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetWristSetpoint.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/SetWristSetpoint.h"
+#include "commands/SetWristSetpoint.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/TankDriveWithJoystick.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/TankDriveWithJoystick.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/TankDriveWithJoystick.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/TankDriveWithJoystick.cpp
index ca47e4c36e..a1be9a3d9a 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/TankDriveWithJoystick.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/TankDriveWithJoystick.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/TankDriveWithJoystick.h"
+#include "commands/TankDriveWithJoystick.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Claw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Claw.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Claw.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Claw.cpp
index 7ff5e88e33..8bad17f800 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Claw.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Claw.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Claw.h"
+#include "subsystems/Claw.h"
 
 Claw::Claw() : frc::Subsystem("Claw") {
   // Let's show everything on the LiveWindow
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/DriveTrain.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/DriveTrain.cpp
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/DriveTrain.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/DriveTrain.cpp
index 8cb719f9a2..4110485f32 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/DriveTrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/DriveTrain.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/DriveTrain.h"
+#include "subsystems/DriveTrain.h"
 
-#include <Joystick.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/Joystick.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
-#include "Commands/TankDriveWithJoystick.h"
+#include "commands/TankDriveWithJoystick.h"
 
 DriveTrain::DriveTrain() : frc::Subsystem("DriveTrain") {
 // Encoders may measure differently in the real world and in
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Elevator.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Elevator.cpp
similarity index 90%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Elevator.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Elevator.cpp
index 4b87fc1dc1..531848134b 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Elevator.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Elevator.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Elevator.h"
+#include "subsystems/Elevator.h"
 
-#include <LiveWindow/LiveWindow.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/livewindow/LiveWindow.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 Elevator::Elevator() : frc::PIDSubsystem("Elevator", kP_real, kI_real, 0.0) {
 #ifdef SIMULATION  // Check for simulation and update PID values
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Wrist.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Wrist.cpp
similarity index 93%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Wrist.cpp
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Wrist.cpp
index 3b64e30bce..9bab812e34 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Wrist.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Wrist.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Wrist.h"
+#include "subsystems/Wrist.h"
 
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 Wrist::Wrist() : frc::PIDSubsystem("Wrist", kP_real, 0.0, 0.0) {
 #ifdef SIMULATION  // Check for simulation and update PID values
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/OI.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/OI.h
index 7bf4649ed2..77e50b908d 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/OI.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/OI.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <Buttons/JoystickButton.h>
-#include <Joystick.h>
+#include <frc/Joystick.h>
+#include <frc/buttons/JoystickButton.h>
 
 class OI {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h
index a00009fe2e..f4a1428a58 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h
@@ -7,18 +7,18 @@
 
 #pragma once
 
-#include <Commands/Command.h>
-#include <Commands/Scheduler.h>
-#include <IterativeRobot.h>
-#include <LiveWindow/LiveWindow.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/IterativeRobot.h>
+#include <frc/commands/Command.h>
+#include <frc/commands/Scheduler.h>
+#include <frc/livewindow/LiveWindow.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
-#include "Commands/Autonomous.h"
 #include "OI.h"
-#include "Subsystems/Claw.h"
-#include "Subsystems/DriveTrain.h"
-#include "Subsystems/Elevator.h"
-#include "Subsystems/Wrist.h"
+#include "commands/Autonomous.h"
+#include "subsystems/Claw.h"
+#include "subsystems/DriveTrain.h"
+#include "subsystems/Elevator.h"
+#include "subsystems/Wrist.h"
 
 class Robot : public frc::IterativeRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Autonomous.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Autonomous.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Autonomous.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Autonomous.h
index 50a1dcdf44..e90098e309 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Autonomous.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Autonomous.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * The main autonomous command to pickup and deliver the soda to the box.
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/CloseClaw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/CloseClaw.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/CloseClaw.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/CloseClaw.h
index 0d36509ae8..bda8a5f329 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/CloseClaw.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/CloseClaw.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Opens the claw for one second. Real robots should use sensors, stalling
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/DriveStraight.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/DriveStraight.h
similarity index 92%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/DriveStraight.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/DriveStraight.h
index f5548e19a9..f03e46ce99 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/DriveStraight.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/DriveStraight.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <Commands/Command.h>
-#include <PIDController.h>
-#include <PIDOutput.h>
-#include <PIDSource.h>
+#include <frc/PIDController.h>
+#include <frc/PIDOutput.h>
+#include <frc/PIDSource.h>
+#include <frc/commands/Command.h>
 
 /**
  * Drive the given distance straight (negative values go backwards).
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/OpenClaw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/OpenClaw.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/OpenClaw.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/OpenClaw.h
index 501bd038dc..c2a7cfbeee 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/OpenClaw.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/OpenClaw.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Opens the claw for one second. Real robots should use sensors, stalling
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Pickup.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Pickup.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Pickup.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Pickup.h
index 05c9da7ed1..ed68990c51 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Pickup.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Pickup.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Pickup a soda can (if one is between the open claws) and
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Place.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Place.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Place.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Place.h
index 56e2d72609..769539310a 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Place.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Place.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Place a held soda can onto the platform.
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/PrepareToPickup.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/PrepareToPickup.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/PrepareToPickup.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/PrepareToPickup.h
index e59e7c8b51..c58035d0c9 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/PrepareToPickup.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/PrepareToPickup.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Make sure the robot is in a state to pickup soda cans.
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetDistanceToBox.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetDistanceToBox.h
similarity index 92%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetDistanceToBox.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetDistanceToBox.h
index e31416ed38..884a09b481 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetDistanceToBox.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetDistanceToBox.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <Commands/Command.h>
-#include <PIDController.h>
-#include <PIDOutput.h>
-#include <PIDSource.h>
+#include <frc/PIDController.h>
+#include <frc/PIDOutput.h>
+#include <frc/PIDSource.h>
+#include <frc/commands/Command.h>
 
 /**
  * Drive until the robot is the given distance away from the box. Uses a local
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetElevatorSetpoint.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetElevatorSetpoint.h
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetElevatorSetpoint.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetElevatorSetpoint.h
index 4a63944b23..388ac0e8e7 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetElevatorSetpoint.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetElevatorSetpoint.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Move the elevator to a given location. This command finishes when it is
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetWristSetpoint.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetWristSetpoint.h
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetWristSetpoint.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetWristSetpoint.h
index 7151dd5e07..effb173da4 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetWristSetpoint.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetWristSetpoint.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Move the wrist to a given angle. This command finishes when it is within
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/TankDriveWithJoystick.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/TankDriveWithJoystick.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/TankDriveWithJoystick.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/TankDriveWithJoystick.h
index 5a0bd867db..93370252c1 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/TankDriveWithJoystick.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/TankDriveWithJoystick.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Have the robot drive tank style using the PS3 Joystick until interrupted.
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Claw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Claw.h
similarity index 93%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Claw.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Claw.h
index 6f0c10adb8..778f406641 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Claw.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Claw.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <Commands/Subsystem.h>
-#include <DigitalInput.h>
-#include <Spark.h>
+#include <frc/DigitalInput.h>
+#include <frc/Spark.h>
+#include <frc/commands/Subsystem.h>
 
 /**
  * The claw subsystem is a simple system with a motor for opening and closing.
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/DriveTrain.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/DriveTrain.h
similarity index 90%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/DriveTrain.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/DriveTrain.h
index 9dec032a7b..bb9ab2d9e9 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/DriveTrain.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/DriveTrain.h
@@ -7,13 +7,13 @@
 
 #pragma once
 
-#include <AnalogGyro.h>
-#include <AnalogInput.h>
-#include <Commands/Subsystem.h>
-#include <Drive/DifferentialDrive.h>
-#include <Encoder.h>
-#include <Spark.h>
-#include <SpeedControllerGroup.h>
+#include <frc/AnalogGyro.h>
+#include <frc/AnalogInput.h>
+#include <frc/Encoder.h>
+#include <frc/Spark.h>
+#include <frc/SpeedControllerGroup.h>
+#include <frc/commands/Subsystem.h>
+#include <frc/drive/DifferentialDrive.h>
 
 namespace frc {
 class Joystick;
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Elevator.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Elevator.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Elevator.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Elevator.h
index b42d78364f..c0810207a4 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Elevator.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Elevator.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <AnalogPotentiometer.h>
-#include <Commands/PIDSubsystem.h>
-#include <Spark.h>
+#include <frc/AnalogPotentiometer.h>
+#include <frc/Spark.h>
+#include <frc/commands/PIDSubsystem.h>
 
 /**
  * The elevator subsystem uses PID to go to a given height. Unfortunately, in
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Wrist.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Wrist.h
similarity index 93%
rename from wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Wrist.h
rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Wrist.h
index 5ffe6b4341..8c4f0f227e 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Wrist.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Wrist.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <AnalogPotentiometer.h>
-#include <Commands/PIDSubsystem.h>
-#include <Spark.h>
+#include <frc/AnalogPotentiometer.h>
+#include <frc/Spark.h>
+#include <frc/commands/PIDSubsystem.h>
 
 /**
  * The wrist subsystem is like the elevator, but with a rotational joint instead
diff --git a/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp
index ee77a56e05..1bc05dd2fc 100644
--- a/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <Drive/DifferentialDrive.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <LiveWindow/LiveWindow.h>
-#include <Spark.h>
-#include <Timer.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
+#include <frc/Timer.h>
+#include <frc/drive/DifferentialDrive.h>
+#include <frc/livewindow/LiveWindow.h>
 
 class Robot : public frc::IterativeRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
index 8f7427ffd1..2f083df5ca 100644
--- a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
@@ -7,11 +7,11 @@
 
 #include <cmath>
 
-#include <AnalogGyro.h>
-#include <Drive/DifferentialDrive.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Spark.h>
+#include <frc/AnalogGyro.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
+#include <frc/drive/DifferentialDrive.h>
 
 /**
  * This is a sample program to demonstrate how to use a gyro sensor to make a
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp
index c8ec10bc7c..a861162feb 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <AnalogGyro.h>
-#include <Drive/MecanumDrive.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Spark.h>
+#include <frc/AnalogGyro.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
+#include <frc/drive/MecanumDrive.h>
 
 /**
  * This is a sample program that uses mecanum drive with a gyro sensor to
diff --git a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
index 7f4e559c5d..92d0ad1e6d 100644
--- a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
@@ -7,8 +7,8 @@
 
 #include <thread>
 
-#include <CameraServer.h>
-#include <IterativeRobot.h>
+#include <cameraserver/CameraServer.h>
+#include <frc/IterativeRobot.h>
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/types.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
index 1393203034..4c0407f6f1 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <Drive/MecanumDrive.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Spark.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
+#include <frc/drive/MecanumDrive.h>
 
 /**
  * This is a demo program showing how to use Mecanum control with the
diff --git a/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
index 32139892b8..79063222ad 100644
--- a/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Spark.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
 
 /**
  * This sample program shows how to control a motor using a joystick. In the
diff --git a/wpilibcExamples/src/main/cpp/examples/MotorControlEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MotorControlEncoder/cpp/Robot.cpp
index 97a3f52d91..2cd99f2e1b 100644
--- a/wpilibcExamples/src/main/cpp/examples/MotorControlEncoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MotorControlEncoder/cpp/Robot.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <Encoder.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <SmartDashboard/SmartDashboard.h>
-#include <Spark.h>
+#include <frc/Encoder.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Spark.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 constexpr double kPi = 3.14159265358979;
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/OI.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/OI.cpp
index 086d66cf85..c5fcb154f9 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/OI.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/OI.cpp
@@ -7,15 +7,16 @@
 
 #include "OI.h"
 
-#include "Commands/Collect.h"
-#include "Commands/DriveForward.h"
-#include "Commands/LowGoal.h"
-#include "Commands/SetCollectionSpeed.h"
-#include "Commands/SetPivotSetpoint.h"
-#include "Commands/Shoot.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Subsystems/Collector.h"
-#include "Subsystems/Pivot.h"
+#include <frc/smartdashboard/SmartDashboard.h>
+
+#include "commands/Collect.h"
+#include "commands/DriveForward.h"
+#include "commands/LowGoal.h"
+#include "commands/SetCollectionSpeed.h"
+#include "commands/SetPivotSetpoint.h"
+#include "commands/Shoot.h"
+#include "subsystems/Collector.h"
+#include "subsystems/Pivot.h"
 
 OI::OI() {
   m_r1.WhenPressed(new LowGoal());
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp
index 7eaeeedf5c..27e10902c2 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp
@@ -9,9 +9,9 @@
 
 #include <iostream>
 
-#include <Commands/Scheduler.h>
-#include <LiveWindow/LiveWindow.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/commands/Scheduler.h>
+#include <frc/livewindow/LiveWindow.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 DriveTrain Robot::drivetrain;
 Pivot Robot::pivot;
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CheckForHotGoal.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/CheckForHotGoal.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CheckForHotGoal.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/CheckForHotGoal.cpp
index 1a04de46b3..c5d80c0f75 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CheckForHotGoal.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/CheckForHotGoal.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CheckForHotGoal.h"
+#include "commands/CheckForHotGoal.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CloseClaw.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/CloseClaw.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CloseClaw.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/CloseClaw.cpp
index 63b925530f..8db41f34f5 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CloseClaw.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/CloseClaw.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CloseClaw.h"
+#include "commands/CloseClaw.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Collect.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/Collect.cpp
similarity index 80%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Collect.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/Collect.cpp
index 506eee0352..b51c2df4a9 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Collect.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/Collect.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Collect.h"
+#include "commands/Collect.h"
 
-#include "Commands/CloseClaw.h"
-#include "Commands/SetCollectionSpeed.h"
-#include "Commands/SetPivotSetpoint.h"
-#include "Commands/WaitForBall.h"
 #include "Robot.h"
+#include "commands/CloseClaw.h"
+#include "commands/SetCollectionSpeed.h"
+#include "commands/SetPivotSetpoint.h"
+#include "commands/WaitForBall.h"
 
 Collect::Collect() {
   AddSequential(new SetCollectionSpeed(Collector::kForward));
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveAndShootAutonomous.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveAndShootAutonomous.cpp
similarity index 77%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveAndShootAutonomous.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveAndShootAutonomous.cpp
index 512f6c5d2d..3486292668 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveAndShootAutonomous.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveAndShootAutonomous.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/DriveAndShootAutonomous.h"
+#include "commands/DriveAndShootAutonomous.h"
 
-#include "Commands/CheckForHotGoal.h"
-#include "Commands/CloseClaw.h"
-#include "Commands/DriveForward.h"
-#include "Commands/SetPivotSetpoint.h"
-#include "Commands/Shoot.h"
-#include "Commands/WaitForPressure.h"
 #include "Robot.h"
+#include "commands/CheckForHotGoal.h"
+#include "commands/CloseClaw.h"
+#include "commands/DriveForward.h"
+#include "commands/SetPivotSetpoint.h"
+#include "commands/Shoot.h"
+#include "commands/WaitForPressure.h"
 
 DriveAndShootAutonomous::DriveAndShootAutonomous() {
   AddSequential(new CloseClaw());
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveForward.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveForward.cpp
similarity index 98%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveForward.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveForward.cpp
index 3c3a11656a..1de584699f 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveForward.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveForward.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/DriveForward.h"
+#include "commands/DriveForward.h"
 
 #include <cmath>
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveWithJoystick.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveWithJoystick.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveWithJoystick.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveWithJoystick.cpp
index d262a97204..7704d70c59 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveWithJoystick.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/DriveWithJoystick.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/DriveWithJoystick.h"
+#include "commands/DriveWithJoystick.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/ExtendShooter.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/ExtendShooter.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/ExtendShooter.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/ExtendShooter.cpp
index f28cc5e9a5..53494c929c 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/ExtendShooter.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/ExtendShooter.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/ExtendShooter.h"
+#include "commands/ExtendShooter.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/LowGoal.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/LowGoal.cpp
similarity index 82%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/LowGoal.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/LowGoal.cpp
index 25c9103135..f4ed788a49 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/LowGoal.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/LowGoal.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/LowGoal.h"
+#include "commands/LowGoal.h"
 
-#include "Commands/ExtendShooter.h"
-#include "Commands/SetCollectionSpeed.h"
-#include "Commands/SetPivotSetpoint.h"
 #include "Robot.h"
+#include "commands/ExtendShooter.h"
+#include "commands/SetCollectionSpeed.h"
+#include "commands/SetPivotSetpoint.h"
 
 LowGoal::LowGoal() {
   AddSequential(new SetPivotSetpoint(Pivot::kLowGoal));
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/OpenClaw.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/OpenClaw.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/OpenClaw.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/OpenClaw.cpp
index c6f51ccb0c..4e4a9c8267 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/OpenClaw.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/OpenClaw.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/OpenClaw.h"
+#include "commands/OpenClaw.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetCollectionSpeed.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/SetCollectionSpeed.cpp
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetCollectionSpeed.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/SetCollectionSpeed.cpp
index 77c06f0cd2..2011a02e91 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetCollectionSpeed.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/SetCollectionSpeed.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/SetCollectionSpeed.h"
+#include "commands/SetCollectionSpeed.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetPivotSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/SetPivotSetpoint.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetPivotSetpoint.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/SetPivotSetpoint.cpp
index 566b69a75c..f9929de134 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetPivotSetpoint.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/SetPivotSetpoint.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/SetPivotSetpoint.h"
+#include "commands/SetPivotSetpoint.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Shoot.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/Shoot.cpp
similarity index 80%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Shoot.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/Shoot.cpp
index da7c67aa96..836ccd2791 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Shoot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/Shoot.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Shoot.h"
+#include "commands/Shoot.h"
 
-#include "Commands/ExtendShooter.h"
-#include "Commands/OpenClaw.h"
-#include "Commands/SetCollectionSpeed.h"
-#include "Commands/WaitForPressure.h"
 #include "Robot.h"
+#include "commands/ExtendShooter.h"
+#include "commands/OpenClaw.h"
+#include "commands/SetCollectionSpeed.h"
+#include "commands/WaitForPressure.h"
 
 Shoot::Shoot() {
   AddSequential(new WaitForPressure());
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForBall.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/WaitForBall.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForBall.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/WaitForBall.cpp
index 00167167ce..daf966567c 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForBall.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/WaitForBall.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/WaitForBall.h"
+#include "commands/WaitForBall.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForPressure.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/WaitForPressure.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForPressure.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/WaitForPressure.cpp
index 1da43831a7..00cc454485 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForPressure.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/commands/WaitForPressure.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/WaitForPressure.h"
+#include "commands/WaitForPressure.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Collector.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Collector.cpp
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Collector.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Collector.cpp
index a619c902ac..8f345ce82b 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Collector.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Collector.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Collector.h"
+#include "subsystems/Collector.h"
 
-#include <LiveWindow/LiveWindow.h>
+#include <frc/livewindow/LiveWindow.h>
 
 Collector::Collector() : frc::Subsystem("Collector") {
   // Put everything to the LiveWindow for testing.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/DriveTrain.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/DriveTrain.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/DriveTrain.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/DriveTrain.cpp
index d126653a65..53cb625d86 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/DriveTrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/DriveTrain.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/DriveTrain.h"
+#include "subsystems/DriveTrain.h"
 
 #include <cmath>
 
-#include <Joystick.h>
+#include <frc/Joystick.h>
 
-#include "Commands/DriveWithJoystick.h"
+#include "commands/DriveWithJoystick.h"
 
 DriveTrain::DriveTrain() : frc::Subsystem("DriveTrain") {
   // AddChild("Front Left CIM", m_frontLeftCIM);
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pivot.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Pivot.cpp
similarity index 98%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pivot.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Pivot.cpp
index f59619e935..861d583505 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pivot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Pivot.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Pivot.h"
+#include "subsystems/Pivot.h"
 
 Pivot::Pivot() : frc::PIDSubsystem("Pivot", 7.0, 0.0, 8.0) {
   SetAbsoluteTolerance(0.005);
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pneumatics.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Pneumatics.cpp
similarity index 92%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pneumatics.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Pneumatics.cpp
index a6b3118c04..dd1a8241d2 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pneumatics.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Pneumatics.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Pneumatics.h"
+#include "subsystems/Pneumatics.h"
 
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 Pneumatics::Pneumatics() : frc::Subsystem("Pneumatics") {
   AddChild("Pressure Sensor", m_pressureSensor);
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Shooter.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Shooter.cpp
similarity index 98%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Shooter.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Shooter.cpp
index 69133b3927..80d7ac3f3b 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Shooter.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/subsystems/Shooter.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/Shooter.h"
+#include "subsystems/Shooter.h"
 
 Shooter::Shooter() : Subsystem("Shooter") {
   // Put everything to the LiveWindow for testing.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Triggers/DoubleButton.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/triggers/DoubleButton.cpp
similarity index 92%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Triggers/DoubleButton.cpp
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/triggers/DoubleButton.cpp
index 3ef9d3a2fc..f2f7f647a6 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Triggers/DoubleButton.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/triggers/DoubleButton.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Triggers/DoubleButton.h"
+#include "triggers/DoubleButton.h"
 
-#include <Joystick.h>
+#include <frc/Joystick.h>
 
 DoubleButton::DoubleButton(frc::Joystick* joy, int button1, int button2)
     : m_joy(*joy) {
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/OI.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/OI.h
index aa98f268a7..2df4395b1a 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/OI.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/OI.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <Buttons/JoystickButton.h>
-#include <Joystick.h>
+#include <frc/Joystick.h>
+#include <frc/buttons/JoystickButton.h>
 
-#include "Triggers/DoubleButton.h"
+#include "triggers/DoubleButton.h"
 
 class OI {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Robot.h
index 9c4cc3a216..6db3275fb9 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Robot.h
@@ -7,18 +7,18 @@
 
 #pragma once
 
-#include <Commands/Command.h>
-#include <IterativeRobot.h>
-#include <SmartDashboard/SendableChooser.h>
+#include <frc/IterativeRobot.h>
+#include <frc/commands/Command.h>
+#include <frc/smartdashboard/SendableChooser.h>
 
-#include "Commands/DriveAndShootAutonomous.h"
-#include "Commands/DriveForward.h"
 #include "OI.h"
-#include "Subsystems/Collector.h"
-#include "Subsystems/DriveTrain.h"
-#include "Subsystems/Pivot.h"
-#include "Subsystems/Pneumatics.h"
-#include "Subsystems/Shooter.h"
+#include "commands/DriveAndShootAutonomous.h"
+#include "commands/DriveForward.h"
+#include "subsystems/Collector.h"
+#include "subsystems/DriveTrain.h"
+#include "subsystems/Pivot.h"
+#include "subsystems/Pneumatics.h"
+#include "subsystems/Shooter.h"
 
 class Robot : public frc::IterativeRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CheckForHotGoal.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/CheckForHotGoal.h
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CheckForHotGoal.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/CheckForHotGoal.h
index 2a663f6a78..9f42461da2 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CheckForHotGoal.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/CheckForHotGoal.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * This command looks for the hot goal and waits until it's detected or timed
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CloseClaw.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/CloseClaw.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CloseClaw.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/CloseClaw.h
index 88c1fe3be0..60f12a960c 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CloseClaw.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/CloseClaw.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/InstantCommand.h>
+#include <frc/commands/InstantCommand.h>
 
 /**
  * Close the claw.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Collect.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/Collect.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Collect.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/Collect.h
index f75b1df3b9..c2965c2df1 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Collect.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/Collect.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Get the robot set to collect balls.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveAndShootAutonomous.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveAndShootAutonomous.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveAndShootAutonomous.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveAndShootAutonomous.h
index 2d0adfd18d..e143738987 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveAndShootAutonomous.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveAndShootAutonomous.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Drive over the line and then shoot the ball. If the hot goal is not detected,
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveForward.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveForward.h
similarity index 97%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveForward.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveForward.h
index 4e1830071b..a89134eba2 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveForward.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveForward.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * This command drives the robot over a given distance with simple proportional
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveWithJoystick.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveWithJoystick.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveWithJoystick.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveWithJoystick.h
index 4cd5e9a449..e6d9b0e008 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveWithJoystick.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/DriveWithJoystick.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * This command allows PS3 joystick to drive the robot. It is always running
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/ExtendShooter.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/ExtendShooter.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/ExtendShooter.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/ExtendShooter.h
index 28798726e7..634860eb20 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/ExtendShooter.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/ExtendShooter.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/TimedCommand.h>
+#include <frc/commands/TimedCommand.h>
 
 /**
  * Extend the shooter and then retract it after a second.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/LowGoal.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/LowGoal.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/LowGoal.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/LowGoal.h
index b2fdf996c3..62237fe14d 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/LowGoal.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/LowGoal.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Spit the ball out into the low goal assuming that the robot is in front of
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/OpenClaw.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/OpenClaw.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/OpenClaw.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/OpenClaw.h
index a9ddeae987..0d788770c1 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/OpenClaw.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/OpenClaw.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Opens the claw
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetCollectionSpeed.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/SetCollectionSpeed.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetCollectionSpeed.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/SetCollectionSpeed.h
index d1ecb5ea97..24bb4e37f5 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetCollectionSpeed.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/SetCollectionSpeed.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/InstantCommand.h>
+#include <frc/commands/InstantCommand.h>
 
 /**
  * This command sets the collector rollers spinning at the given speed. Since
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetPivotSetpoint.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/SetPivotSetpoint.h
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetPivotSetpoint.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/SetPivotSetpoint.h
index 23d8fb05e1..8f8f615a33 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetPivotSetpoint.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/SetPivotSetpoint.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Moves the  pivot to a given angle. This command finishes when it is within
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Shoot.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/Shoot.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Shoot.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/Shoot.h
index fc414b318e..242221cfec 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Shoot.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/Shoot.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/CommandGroup.h>
+#include <frc/commands/CommandGroup.h>
 
 /**
  * Shoot the ball at the current angle.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForBall.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/WaitForBall.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForBall.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/WaitForBall.h
index 30fdd9c767..b6d8d99585 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForBall.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/WaitForBall.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Wait until the collector senses that it has the ball. This command does
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForPressure.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/WaitForPressure.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForPressure.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/WaitForPressure.h
index 959406a1e5..49e1f17559 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForPressure.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/commands/WaitForPressure.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 /**
  * Wait until the pneumatics are fully pressurized. This command does nothing
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Collector.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Collector.h
similarity index 94%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Collector.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Collector.h
index 430715008f..96fbd4726f 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Collector.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Collector.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <Commands/Subsystem.h>
-#include <DigitalInput.h>
-#include <Solenoid.h>
-#include <Spark.h>
+#include <frc/DigitalInput.h>
+#include <frc/Solenoid.h>
+#include <frc/Spark.h>
+#include <frc/commands/Subsystem.h>
 
 /**
  * The Collector subsystem has one motor for the rollers, a limit switch for
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/DriveTrain.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/DriveTrain.h
similarity index 91%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/DriveTrain.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/DriveTrain.h
index 5306525665..b263db81dd 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/DriveTrain.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/DriveTrain.h
@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include <AnalogGyro.h>
-#include <Commands/Subsystem.h>
-#include <Drive/DifferentialDrive.h>
-#include <Encoder.h>
-#include <Spark.h>
-#include <SpeedControllerGroup.h>
+#include <frc/AnalogGyro.h>
+#include <frc/Encoder.h>
+#include <frc/Spark.h>
+#include <frc/SpeedControllerGroup.h>
+#include <frc/commands/Subsystem.h>
+#include <frc/drive/DifferentialDrive.h>
 
 namespace frc {
 class Joystick;
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pivot.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pivot.h
similarity index 93%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pivot.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pivot.h
index ed979856d5..953949afe5 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pivot.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pivot.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <AnalogPotentiometer.h>
-#include <Commands/PIDSubsystem.h>
-#include <DigitalInput.h>
-#include <Spark.h>
+#include <frc/AnalogPotentiometer.h>
+#include <frc/DigitalInput.h>
+#include <frc/Spark.h>
+#include <frc/commands/PIDSubsystem.h>
 
 /**
  * The Pivot subsystem contains the Van-door motor and the pot for PID control
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pneumatics.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pneumatics.h
similarity index 93%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pneumatics.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pneumatics.h
index a867a10c7b..d3218959dd 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pneumatics.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pneumatics.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <AnalogInput.h>
-#include <Commands/Subsystem.h>
-#include <Compressor.h>
+#include <frc/AnalogInput.h>
+#include <frc/Compressor.h>
+#include <frc/commands/Subsystem.h>
 
 /**
  * The Pneumatics subsystem contains the compressor and a pressure sensor.
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Shooter.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Shooter.h
similarity index 96%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Shooter.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Shooter.h
index 25d400d728..43f111a879 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Shooter.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Shooter.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <Commands/Subsystem.h>
-#include <DigitalInput.h>
-#include <DoubleSolenoid.h>
-#include <Solenoid.h>
+#include <frc/DigitalInput.h>
+#include <frc/DoubleSolenoid.h>
+#include <frc/Solenoid.h>
+#include <frc/commands/Subsystem.h>
 
 /**
  * The Shooter subsystem handles shooting. The mechanism for shooting is
diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Triggers/DoubleButton.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/triggers/DoubleButton.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/examples/PacGoat/include/Triggers/DoubleButton.h
rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/triggers/DoubleButton.h
index 894a02981d..562154b0b7 100644
--- a/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Triggers/DoubleButton.h
+++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/triggers/DoubleButton.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Buttons/Trigger.h>
+#include <frc/buttons/Trigger.h>
 
 namespace frc {
 class Joystick;
diff --git a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp
index 0661135587..77732b6d23 100644
--- a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp
@@ -7,11 +7,11 @@
 
 #include <array>
 
-#include <AnalogInput.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <PIDController.h>
-#include <Spark.h>
+#include <frc/AnalogInput.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/PIDController.h>
+#include <frc/Spark.h>
 
 /**
  * This is a sample program to demonstrate how to use a soft potentiometer and a
diff --git a/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp
index ee39970717..a29611987d 100644
--- a/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <CameraServer.h>
-#include <IterativeRobot.h>
+#include <cameraserver/CameraServer.h>
+#include <frc/IterativeRobot.h>
 #include <wpi/raw_ostream.h>
 
 /**
diff --git a/wpilibcExamples/src/main/cpp/examples/Relay/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Relay/cpp/Robot.cpp
index 0bc016f3f0..3452615672 100644
--- a/wpilibcExamples/src/main/cpp/examples/Relay/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Relay/cpp/Robot.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Relay.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Relay.h>
 
 /**
  * This is a sample program which uses joystick buttons to control a relay.
diff --git a/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp
index 5f3fe13b25..e1911407c2 100644
--- a/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <DoubleSolenoid.h>
-#include <IterativeRobot.h>
-#include <Joystick.h>
-#include <Solenoid.h>
+#include <frc/DoubleSolenoid.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Joystick.h>
+#include <frc/Solenoid.h>
 
 /**
  * This is a sample program showing the use of the solenoid classes during
diff --git a/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp
index c89567d627..4d8e16cf10 100644
--- a/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <AnalogInput.h>
-#include <Drive/DifferentialDrive.h>
-#include <IterativeRobot.h>
-#include <Spark.h>
+#include <frc/AnalogInput.h>
+#include <frc/IterativeRobot.h>
+#include <frc/Spark.h>
+#include <frc/drive/DifferentialDrive.h>
 
 /**
  * This is a sample program demonstrating how to use an ultrasonic sensor and
diff --git a/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp
index 9bd6d0d704..ef5187799c 100644
--- a/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <AnalogInput.h>
-#include <Drive/DifferentialDrive.h>
-#include <IterativeRobot.h>
-#include <PIDController.h>
-#include <PIDOutput.h>
-#include <Spark.h>
+#include <frc/AnalogInput.h>
+#include <frc/IterativeRobot.h>
+#include <frc/PIDController.h>
+#include <frc/PIDOutput.h>
+#include <frc/Spark.h>
+#include <frc/drive/DifferentialDrive.h>
 
 /**
  * This is a sample program demonstrating how to use an ultrasonic sensor and
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp
index a196ec266f..5974f1f8b5 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp
@@ -7,7 +7,7 @@
 
 #include "OI.h"
 
-#include <WPILib.h>
+#include <frc/WPILib.h>
 
 OI::OI() {
   // Process operator interface input here.
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
index 7c73600509..09de0a2ef7 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
@@ -7,8 +7,8 @@
 
 #include "Robot.h"
 
-#include <Commands/Scheduler.h>
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/commands/Scheduler.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 ExampleSubsystem Robot::m_subsystem;
 OI Robot::m_oi;
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/ExampleCommand.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/ExampleCommand.cpp
similarity index 96%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/ExampleCommand.cpp
rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/ExampleCommand.cpp
index 0b476bfd22..fa83682d74 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/ExampleCommand.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/ExampleCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/ExampleCommand.h"
+#include "commands/ExampleCommand.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/MyAutoCommand.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/MyAutoCommand.cpp
similarity index 97%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/MyAutoCommand.cpp
rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/MyAutoCommand.cpp
index 1624875090..a8e94063dc 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/MyAutoCommand.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/MyAutoCommand.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/MyAutoCommand.h"
+#include "commands/MyAutoCommand.h"
 
 #include "Robot.h"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Subsystems/ExampleSubsystem.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/subsystems/ExampleSubsystem.cpp
similarity index 95%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Subsystems/ExampleSubsystem.cpp
rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/subsystems/ExampleSubsystem.cpp
index beda5724a1..cdde203c22 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Subsystems/ExampleSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/subsystems/ExampleSubsystem.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Subsystems/ExampleSubsystem.h"
+#include "subsystems/ExampleSubsystem.h"
 
 #include "RobotMap.h"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
index 1a246cf6f8..7dd5093369 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
@@ -7,14 +7,14 @@
 
 #pragma once
 
-#include <Commands/Command.h>
-#include <SmartDashboard/SendableChooser.h>
-#include <TimedRobot.h>
+#include <frc/TimedRobot.h>
+#include <frc/commands/Command.h>
+#include <frc/smartdashboard/SendableChooser.h>
 
-#include "Commands/ExampleCommand.h"
-#include "Commands/MyAutoCommand.h"
 #include "OI.h"
-#include "Subsystems/ExampleSubsystem.h"
+#include "commands/ExampleCommand.h"
+#include "commands/MyAutoCommand.h"
+#include "subsystems/ExampleSubsystem.h"
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/ExampleCommand.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/ExampleCommand.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.h
index 05f910a51e..1d11728dad 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/ExampleCommand.h
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 class ExampleCommand : public frc::Command {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/MyAutoCommand.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/MyAutoCommand.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/MyAutoCommand.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/MyAutoCommand.h
index d3970e614d..ce25e76f30 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/MyAutoCommand.h
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/MyAutoCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Command.h>
+#include <frc/commands/Command.h>
 
 class MyAutoCommand : public frc::Command {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Subsystems/ExampleSubsystem.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.h
similarity index 95%
rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Subsystems/ExampleSubsystem.h
rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.h
index 219ed11bb0..66bc329cf4 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Subsystems/ExampleSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <Commands/Subsystem.h>
+#include <frc/commands/Subsystem.h>
 
 class ExampleSubsystem : public frc::Subsystem {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp
index 22731e64c1..cc6e0c69c6 100644
--- a/wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp
@@ -9,7 +9,7 @@
 
 #include <iostream>
 
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 void Robot::RobotInit() {
   m_chooser.AddDefault(kAutoNameDefault, kAutoNameDefault);
diff --git a/wpilibcExamples/src/main/cpp/templates/iterative/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/iterative/include/Robot.h
index 05e233c526..2c70b8f254 100644
--- a/wpilibcExamples/src/main/cpp/templates/iterative/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/templates/iterative/include/Robot.h
@@ -9,8 +9,8 @@
 
 #include <string>
 
-#include <IterativeRobot.h>
-#include <SmartDashboard/SendableChooser.h>
+#include <frc/IterativeRobot.h>
+#include <frc/smartdashboard/SendableChooser.h>
 
 class Robot : public frc::IterativeRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp
index d7efdb882f..bfe6e00664 100644
--- a/wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp
@@ -9,8 +9,8 @@
 
 #include <iostream>
 
-#include <SmartDashboard/SmartDashboard.h>
-#include <Timer.h>
+#include <frc/Timer.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 Robot::Robot() {
   // Note SmartDashboard is not initialized here, wait until RobotInit() to make
diff --git a/wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h
index 0bc80c94b4..b9b601f354 100644
--- a/wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h
@@ -9,11 +9,11 @@
 
 #include <string>
 
-#include <Drive/DifferentialDrive.h>
-#include <Joystick.h>
-#include <SampleRobot.h>
-#include <SmartDashboard/SendableChooser.h>
-#include <Spark.h>
+#include <frc/Joystick.h>
+#include <frc/SampleRobot.h>
+#include <frc/Spark.h>
+#include <frc/drive/DifferentialDrive.h>
+#include <frc/smartdashboard/SendableChooser.h>
 
 /**
  * This is a demo program showing the use of the DifferentialDrive class. The
diff --git a/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
index ff6f86a3fd..c0850a590d 100644
--- a/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
@@ -9,7 +9,7 @@
 
 #include <iostream>
 
-#include <SmartDashboard/SmartDashboard.h>
+#include <frc/smartdashboard/SmartDashboard.h>
 
 void Robot::RobotInit() {
   m_chooser.AddDefault(kAutoNameDefault, kAutoNameDefault);
diff --git a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h
index e78d66f121..09183dcae1 100644
--- a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h
@@ -9,8 +9,8 @@
 
 #include <string>
 
-#include <SmartDashboard/SendableChooser.h>
-#include <TimedRobot.h>
+#include <frc/TimedRobot.h>
+#include <frc/smartdashboard/SendableChooser.h>
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp
index b27b935675..40fd87c1c1 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogInput.h"
-#include "AnalogOutput.h"
-#include "AnalogTrigger.h"
-#include "Counter.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/AnalogInput.h"
+#include "frc/AnalogOutput.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/Counter.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/AnalogPotentiometerTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/AnalogPotentiometerTest.cpp
index 940cbbfc8c..4497051a6d 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/AnalogPotentiometerTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/AnalogPotentiometerTest.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogPotentiometer.h"  // NOLINT(build/include_order)
+#include "frc/AnalogPotentiometer.h"  // NOLINT(build/include_order)
 
-#include "AnalogOutput.h"
-#include "RobotController.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/AnalogOutput.h"
+#include "frc/RobotController.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/BuiltInAccelerometerTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/BuiltInAccelerometerTest.cpp
index 11482101d7..bfb5f2124f 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/BuiltInAccelerometerTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/BuiltInAccelerometerTest.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "BuiltInAccelerometer.h"  // NOLINT(build/include_order)
+#include "frc/BuiltInAccelerometer.h"  // NOLINT(build/include_order)
 
-#include "Timer.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/CircularBufferTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/CircularBufferTest.cpp
index 47d222e6b7..276bc21e94 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/CircularBufferTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/CircularBufferTest.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "circular_buffer.h"  // NOLINT(build/include_order)
+#include "frc/circular_buffer.h"  // NOLINT(build/include_order)
 
 #include <array>
 
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/CounterTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/CounterTest.cpp
index 954fd6b83e..a3ddbd2e3a 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/CounterTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/CounterTest.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Counter.h"  // NOLINT(build/include_order)
+#include "frc/Counter.h"  // NOLINT(build/include_order)
 
-#include "Jaguar.h"
-#include "Talon.h"
 #include "TestBench.h"
-#include "Timer.h"
-#include "Victor.h"
+#include "frc/Jaguar.h"
+#include "frc/Talon.h"
+#include "frc/Timer.h"
+#include "frc/Victor.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/DIOLoopTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/DIOLoopTest.cpp
index 2eae1a4f62..10b64d595f 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/DIOLoopTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/DIOLoopTest.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalInput.h"  // NOLINT(build/include_order)
+#include "frc/DigitalInput.h"  // NOLINT(build/include_order)
 
-#include "DigitalOutput.h"  // NOLINT(build/include_order)
+#include "frc/DigitalOutput.h"  // NOLINT(build/include_order)
 
-#include "Counter.h"
-#include "InterruptableSensorBase.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/Counter.h"
+#include "frc/InterruptableSensorBase.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/DigitalGlitchFilterTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/DigitalGlitchFilterTest.cpp
index 5f32427655..fa39e79bd8 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/DigitalGlitchFilterTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/DigitalGlitchFilterTest.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalGlitchFilter.h"  // NOLINT(build/include_order)
+#include "frc/DigitalGlitchFilter.h"  // NOLINT(build/include_order)
 
-#include "Counter.h"
-#include "DigitalInput.h"
-#include "Encoder.h"
+#include "frc/Counter.h"
+#include "frc/DigitalInput.h"
+#include "frc/Encoder.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/DriverStationTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/DriverStationTest.cpp
index 717ec91d28..df8eef3418 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/DriverStationTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/DriverStationTest.cpp
@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DriverStation.h"  // NOLINT(build/include_order)
+#include "frc/DriverStation.h"  // NOLINT(build/include_order)
 
-#include "RobotController.h"
 #include "TestBench.h"
+#include "frc/RobotController.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp
index 8e8bcf2c22..bf5a8ee544 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Encoder.h"  // NOLINT(build/include_order)
+#include "frc/Encoder.h"  // NOLINT(build/include_order)
 
-#include "AnalogOutput.h"
-#include "AnalogTrigger.h"
-#include "DigitalOutput.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/AnalogOutput.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/DigitalOutput.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/FilterNoiseTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/FilterNoiseTest.cpp
index bfa3ebfcf2..58ab6b28a9 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/FilterNoiseTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/FilterNoiseTest.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Filters/LinearDigitalFilter.h"  // NOLINT(build/include_order)
+#include "frc/filters/LinearDigitalFilter.h"  // NOLINT(build/include_order)
 
 #include <cmath>
 #include <functional>
@@ -13,8 +13,8 @@
 #include <random>
 #include <thread>
 
-#include "Base.h"
 #include "TestBench.h"
+#include "frc/Base.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/FilterOutputTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/FilterOutputTest.cpp
index 45a23ce7ee..a8d25e2df5 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/FilterOutputTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/FilterOutputTest.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Filters/LinearDigitalFilter.h"  // NOLINT(build/include_order)
+#include "frc/filters/LinearDigitalFilter.h"  // NOLINT(build/include_order)
 
 #include <cmath>
 #include <functional>
@@ -13,8 +13,8 @@
 #include <random>
 #include <thread>
 
-#include "Base.h"
 #include "TestBench.h"
+#include "frc/Base.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp
index 9908b2993f..e750f888e5 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/MotorEncoderTest.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Encoder.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "Jaguar.h"
-#include "PIDController.h"
-#include "Talon.h"
 #include "TestBench.h"
-#include "Timer.h"
-#include "Victor.h"
+#include "frc/Encoder.h"
+#include "frc/Jaguar.h"
+#include "frc/PIDController.h"
+#include "frc/Talon.h"
+#include "frc/Timer.h"
+#include "frc/Victor.h"
+#include "frc/filters/LinearDigitalFilter.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/MotorInvertingTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/MotorInvertingTest.cpp
index 1d66c1b84d..1e73d972be 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/MotorInvertingTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/MotorInvertingTest.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Encoder.h"
-#include "Jaguar.h"
-#include "Talon.h"
 #include "TestBench.h"
-#include "Timer.h"
-#include "Victor.h"
+#include "frc/Encoder.h"
+#include "frc/Jaguar.h"
+#include "frc/Talon.h"
+#include "frc/Timer.h"
+#include "frc/Victor.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/NotifierTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/NotifierTest.cpp
index e181fa0a94..d7f0d6e508 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/NotifierTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/NotifierTest.cpp
@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Notifier.h"  // NOLINT(build/include_order)
+#include "frc/Notifier.h"  // NOLINT(build/include_order)
 
 #include <wpi/raw_ostream.h>
 
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/PCMTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/PCMTest.cpp
index d53a743416..5be4d3fe85 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/PCMTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/PCMTest.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogInput.h"
-#include "Compressor.h"
-#include "DigitalInput.h"
-#include "DigitalOutput.h"
-#include "DoubleSolenoid.h"
-#include "Solenoid.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/AnalogInput.h"
+#include "frc/Compressor.h"
+#include "frc/DigitalInput.h"
+#include "frc/DigitalOutput.h"
+#include "frc/DoubleSolenoid.h"
+#include "frc/Solenoid.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/PIDToleranceTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/PIDToleranceTest.cpp
index 0c267e71f5..ec3b85a94f 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/PIDToleranceTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/PIDToleranceTest.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDController.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/PIDController.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/PowerDistributionPanelTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/PowerDistributionPanelTest.cpp
index 32534e2121..959f03d455 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/PowerDistributionPanelTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/PowerDistributionPanelTest.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PowerDistributionPanel.h"  // NOLINT(build/include_order)
+#include "frc/PowerDistributionPanel.h"  // NOLINT(build/include_order)
 
-#include "Jaguar.h"
-#include "Talon.h"
 #include "TestBench.h"
-#include "Timer.h"
-#include "Victor.h"
+#include "frc/Jaguar.h"
+#include "frc/Talon.h"
+#include "frc/Timer.h"
+#include "frc/Victor.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
index b523371e8a..ffb4d9fe46 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Preferences.h"  // NOLINT(build/include_order)
+#include "frc/Preferences.h"  // NOLINT(build/include_order)
 
 #include <cstdio>
 #include <fstream>
 
 #include <networktables/NetworkTableInstance.h>
+#include <ntcore.h>
 
-#include "Timer.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
-#include "ntcore.h"
 
 using namespace frc;
 
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/RelayTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/RelayTest.cpp
index cedf50273e..eb45eebbe9 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/RelayTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/RelayTest.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Relay.h"  // NOLINT(build/include_order)
+#include "frc/Relay.h"  // NOLINT(build/include_order)
 
-#include "DigitalInput.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/DigitalInput.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/RobotDriveTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/RobotDriveTest.cpp
index 69fea17466..2fd97df3cf 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/RobotDriveTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/RobotDriveTest.cpp
@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Drive/DifferentialDrive.h"
-#include "Drive/MecanumDrive.h"
 #include "MockSpeedController.h"
-#include "RobotDrive.h"
 #include "TestBench.h"
+#include "frc/RobotDrive.h"
+#include "frc/drive/DifferentialDrive.h"
+#include "frc/drive/MecanumDrive.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/SpeedControllerGroupTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/SpeedControllerGroupTest.cpp
index 0572d8b64b..dee5bf6ea3 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/SpeedControllerGroupTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/SpeedControllerGroupTest.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SpeedControllerGroup.h"  // NOLINT(build/include_order)
+#include "frc/SpeedControllerGroup.h"  // NOLINT(build/include_order)
 
 #include <memory>
 #include <vector>
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/TestEnvironment.cpp b/wpilibcIntegrationTests/src/main/native/cpp/TestEnvironment.cpp
index e76a0a085b..2bfe1b3f93 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/TestEnvironment.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/TestEnvironment.cpp
@@ -7,12 +7,12 @@
 
 #include <cstdlib>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <wpi/raw_ostream.h>
 
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/livewindow/LiveWindow.h"
 #include "gtest/gtest.h"
 #include "mockds/MockDS.h"
 
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/TiltPanCameraTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/TiltPanCameraTest.cpp
index 3e4967a169..852429ba47 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/TiltPanCameraTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/TiltPanCameraTest.cpp
@@ -7,11 +7,11 @@
 
 #include <cmath>
 
-#include "ADXL345_SPI.h"
-#include "AnalogGyro.h"
-#include "Servo.h"
 #include "TestBench.h"
-#include "Timer.h"
+#include "frc/ADXL345_SPI.h"
+#include "frc/AnalogGyro.h"
+#include "frc/Servo.h"
+#include "frc/Timer.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/TimerTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/TimerTest.cpp
index 7c549572cc..b8f859c145 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/TimerTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/TimerTest.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Timer.h"  // NOLINT(build/include_order)
+#include "frc/Timer.h"  // NOLINT(build/include_order)
 
 #include "TestBench.h"
 #include "gtest/gtest.h"
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/command/CommandTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/command/CommandTest.cpp
index ab3cfb7c49..fec442ac5c 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/command/CommandTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/command/CommandTest.cpp
@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CommandGroup.h"
-#include "Commands/Scheduler.h"
-#include "Commands/Subsystem.h"
-#include "DriverStation.h"
-#include "RobotState.h"
-#include "Timer.h"
 #include "command/MockCommand.h"
+#include "frc/DriverStation.h"
+#include "frc/RobotState.h"
+#include "frc/Timer.h"
+#include "frc/commands/CommandGroup.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/commands/Subsystem.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/command/ConditionalCommandTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/command/ConditionalCommandTest.cpp
index 785d1a3518..ca14e55bda 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/command/ConditionalCommandTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/command/ConditionalCommandTest.cpp
@@ -5,14 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <DriverStation.h>
-#include <RobotState.h>
-
-#include "Commands/ConditionalCommand.h"
-#include "Commands/Scheduler.h"
-#include "Commands/Subsystem.h"
 #include "command/MockCommand.h"
 #include "command/MockConditionalCommand.h"
+#include "frc/DriverStation.h"
+#include "frc/RobotState.h"
+#include "frc/commands/ConditionalCommand.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/commands/Subsystem.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp b/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp
index 0c5432e620..173a23c6de 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/mockds/MockDS.cpp
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include <HAL/cpp/fpga_clock.h>
+#include <hal/cpp/fpga_clock.h>
 #include <wpi/Logger.h>
 #include <wpi/SmallString.h>
 #include <wpi/SmallVector.h>
diff --git a/wpilibcIntegrationTests/src/main/native/include/MockSpeedController.h b/wpilibcIntegrationTests/src/main/native/include/MockSpeedController.h
index e40a346302..e0c788fbd9 100644
--- a/wpilibcIntegrationTests/src/main/native/include/MockSpeedController.h
+++ b/wpilibcIntegrationTests/src/main/native/include/MockSpeedController.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "SpeedController.h"
+#include "frc/SpeedController.h"
 
 namespace frc {
 
diff --git a/wpilibcIntegrationTests/src/main/native/include/command/MockCommand.h b/wpilibcIntegrationTests/src/main/native/include/command/MockCommand.h
index 0353c81e69..bbcc419660 100644
--- a/wpilibcIntegrationTests/src/main/native/include/command/MockCommand.h
+++ b/wpilibcIntegrationTests/src/main/native/include/command/MockCommand.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 
diff --git a/wpilibcIntegrationTests/src/main/native/include/command/MockConditionalCommand.h b/wpilibcIntegrationTests/src/main/native/include/command/MockConditionalCommand.h
index 66fad033e3..fc9d4ec47e 100644
--- a/wpilibcIntegrationTests/src/main/native/include/command/MockConditionalCommand.h
+++ b/wpilibcIntegrationTests/src/main/native/include/command/MockConditionalCommand.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Commands/ConditionalCommand.h"
 #include "command/MockCommand.h"
+#include "frc/commands/ConditionalCommand.h"
 
 namespace frc {