diff --git a/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/framework/IterativeRobotBase.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp
rename to wpilibc/src/main/native/cpp/framework/IterativeRobotBase.cpp
diff --git a/wpilibc/src/main/native/cpp/opmode/RobotState.cpp b/wpilibc/src/main/native/cpp/framework/RobotState.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/opmode/RobotState.cpp
rename to wpilibc/src/main/native/cpp/framework/RobotState.cpp
diff --git a/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp b/wpilibc/src/main/native/cpp/framework/TimedRobot.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp
rename to wpilibc/src/main/native/cpp/framework/TimedRobot.cpp
diff --git a/wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp b/wpilibc/src/main/native/cpp/framework/TimesliceRobot.cpp
similarity index 100%
rename from wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp
rename to wpilibc/src/main/native/cpp/framework/TimesliceRobot.cpp