diff --git a/wpilibc/src/main/native/cpp/motorcontrol/MotorController.cpp b/wpilibc/src/main/native/cpp/hardware/motor/MotorController.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/motorcontrol/MotorController.cpp
rename to wpilibc/src/main/native/cpp/hardware/motor/MotorController.cpp
diff --git a/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp b/wpilibc/src/main/native/cpp/hardware/motor/PWMMotorController.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
rename to wpilibc/src/main/native/cpp/hardware/motor/PWMMotorController.cpp