diff --git a/BUILD.bazel b/BUILD.bazel
index 58d9728113..11b2d3942a 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -70,7 +70,7 @@ publish_all(
         "//cscore:cscore-java_publish.publish",
         "//datalog:datalog-cpp_publish.publish",
         "//datalog:datalog-java_publish.publish",
-        "//datalogtool:datalogtool_publish.publish",
+        "//tools/datalogtool:datalogtool_publish.publish",
         "//docs:wpilibj_publish.publish",
         "//epilogue-processor:processor-java_publish.publish",
         "//epilogue-runtime:epilogue-java_publish.publish",
@@ -84,8 +84,8 @@ publish_all(
         "//ntcore:ntcore-cpp_publish.publish",
         "//ntcore:ntcore-java_publish.publish",
         "//ntcoreffi:ntcoreffi-cpp_publish.publish",
-        "//outlineviewer:outlineviewer_publish.publish",
-        "//processstarter:processstarter_publish.publish",
+        "//tools/outlineviewer:outlineviewer_publish.publish",
+        "//tools/processstarter:processstarter_publish.publish",
         "//romiVendordep:romiVendordep-cpp_publish.publish",
         "//romiVendordep:romiVendordep-java_publish.publish",
         "//simulation/halsim_ds_socket:halsim_ds_socket-cpp_publish.publish",
@@ -94,10 +94,10 @@ publish_all(
         "//simulation/halsim_ws_core:halsim_ws_core-cpp_publish.publish",
         "//simulation/halsim_ws_server:halsim_ws_server-cpp_publish.publish",
         "//simulation/halsim_xrp:halsim_xrp-cpp_publish.publish",
-        "//sysid:sysid_publish.publish",
+        "//tools/sysid:sysid_publish.publish",
         "//thirdparty/googletest:googletest-cpp_publish.publish",
         "//thirdparty/imgui_suite:imguiSuite-cpp_publish.publish",
-        "//wpical:wpical_publish.publish",
+        "//tools/wpical:wpical_publish.publish",
         "//wpigui:wpigui-cpp_publish.publish",
         "//commandsv2:commandsv2-cpp_publish.publish",
         "//commandsv2:commandsv2-java_publish.publish",
diff --git a/apriltag/BUILD.bazel b/apriltag/BUILD.bazel
index c8bc17c615..5390f266b1 100644
--- a/apriltag/BUILD.bazel
+++ b/apriltag/BUILD.bazel
@@ -191,8 +191,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/apriltag/DevMain.java"],
-    main_class = "edu.wpi.first.apriltag.DevMain",
+    srcs = ["src/dev/java/org/wpilib/vision/apriltag/DevMain.java"],
+    main_class = "org.wpilib.vision.apriltag.DevMain",
     deps = [
         ":apriltag-java",
     ],
diff --git a/cameraserver/BUILD.bazel b/cameraserver/BUILD.bazel
index 1e3fe5ffbb..7bc46e247c 100644
--- a/cameraserver/BUILD.bazel
+++ b/cameraserver/BUILD.bazel
@@ -87,8 +87,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/cameraserver/DevMain.java"],
-    main_class = "edu.wpi.first.cameraserver.DevMain",
+    srcs = ["src/dev/java/org/wpilib/vision/stream/DevMain.java"],
+    main_class = "org.wpilib.vision.stream.DevMain",
     deps = [
     ],
 )
diff --git a/commandsv2/BUILD.bazel b/commandsv2/BUILD.bazel
index 6da2bbeaaa..402c2305db 100644
--- a/commandsv2/BUILD.bazel
+++ b/commandsv2/BUILD.bazel
@@ -3,10 +3,10 @@ load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("@rules_java//java:defs.bzl", "java_binary")
 load("@rules_python//python:defs.bzl", "py_binary")
+load("//commandsv2:generate.bzl", "generate_wpilib_new_commands")
 load("//shared/bazel/rules:cc_rules.bzl", "third_party_cc_lib_helper", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test", "wpilib_java_library")
 load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
-load("//commandsv2:generate.bzl", "generate_wpilib_new_commands")
 
 filegroup(
     name = "doxygen-files",
@@ -127,7 +127,7 @@ cc_test(
     size = "small",
     srcs = glob([
         "src/test/native/**/*.cpp",
-        "src/test/native/**/*.h",
+        "src/test/native/**/*.hpp",
     ]),
     tags = [
         "no-tsan",
@@ -141,7 +141,7 @@ cc_test(
 
 wpilib_java_junit5_test(
     name = "commandsv2-java-test",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(["src/main/java/**/*.java"]),
     resource_strip_prefix = "commandsv2/src/test/resources",
     resources = glob(["src/test/resources/**"]),
     deps = [
@@ -166,8 +166,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java"],
-    main_class = "edu.wpi.first.wpilibj2.commands.DevMain",
+    srcs = ["src/dev/java/org/wpilib/commands2/DevMain.java"],
+    main_class = "org.wpilib.commands2.DevMain",
     deps = [
         ":commandsv2-java",
         "//hal:hal-java",
diff --git a/commandsv3/BUILD.bazel b/commandsv3/BUILD.bazel
index 2916630565..c7c41c1750 100644
--- a/commandsv3/BUILD.bazel
+++ b/commandsv3/BUILD.bazel
@@ -65,7 +65,7 @@ wpilib_java_library(
 
 wpilib_java_junit5_test(
     name = "commandsv3-java-test",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(["src/test/java/**/*.java"]),
     deps = [
         ":commandsv3-java",
         "//hal:hal-java",
@@ -81,8 +81,8 @@ wpilib_java_junit5_test(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/org/wpilib/commands3/DevMain.java"],
-    main_class = "org.wpilib.commands3.DevMain",
+    srcs = ["src/dev/java/org/wpilib/command3/DevMain.java"],
+    main_class = "org.wpilib.command3.DevMain",
     deps = [
         "//hal:hal-java",
         "//ntcore:ntcore-java",
diff --git a/cscore/BUILD.bazel b/cscore/BUILD.bazel
index c94e844b09..6da0c35c7e 100644
--- a/cscore/BUILD.bazel
+++ b/cscore/BUILD.bazel
@@ -17,12 +17,12 @@ filegroup(
 
 WIN_SRCS = glob([
     "src/main/native/windows/**/*.cpp",
-    "src/main/native/windows/**/*.h",
+    "src/main/native/windows/**/*.hpp",
 ])
 
 LINUX_SRCS = glob([
     "src/main/native/linux/**/*.cpp",
-    "src/main/native/linux/**/*.h",
+    "src/main/native/linux/**/*.hpp",
 ])
 
 MAC_SRCS = glob(["src/main/native/osx/**/*.cpp"])
@@ -40,11 +40,11 @@ wpilib_objc_library(
     name = "cscore-mac",
     srcs = glob([
         "src/main/native/objcpp/**/*.mm",
-        "src/main/native/cpp/*.h",
+        "src/main/native/cpp/*.hpp",
     ]),
     hdrs = glob([
         "src/main/native/include/**/*",
-        "src/main/native/objcpp/**/*.h",
+        "src/main/native/objcpp/**/*.hpp",
     ]),
     include_arc = False,
     includes = [
@@ -248,8 +248,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/cscore/DevMain.java"],
-    main_class = "edu.wpi.first.cscore.DevMain",
+    srcs = ["src/dev/java/org/wpilib/vision/camera/DevMain.java"],
+    main_class = "org.wpilib.vision.camera.DevMain",
     deps = [
         ":cscore-java",
         "//wpiutil:wpiutil-java",
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
index 618fd79338..0ecbdedf70 100644
--- a/docs/BUILD.bazel
+++ b/docs/BUILD.bazel
@@ -60,11 +60,11 @@ doxygen(
         ":third_party_notices",
         "//apriltag:doxygen-files",
         "//cameraserver:doxygen-files",
+        "//commandsv2:doxygen-files",
         "//cscore:doxygen-files",
         "//hal:doxygen-files",
         "//ntcore:doxygen-files",
         "//romiVendordep:doxygen-files",
-        "//commandsv2:doxygen-files",
         "//wpilibc:doxygen-files",
         "//wpimath:doxygen-files",
         "//wpinet:doxygen-files",
@@ -106,13 +106,13 @@ javadoc(
     deps = [
         "//apriltag:apriltag-java",
         "//cameraserver:cameraserver-java",
+        "//commandsv2:commandsv2-java",
         "//commandsv3:commandsv3-java",
         "//cscore:cscore-java",
         "//epilogue-runtime:epilogue-java",
         "//hal:hal-java",
         "//ntcore:ntcore-java",
         "//romiVendordep:romiVendordep-java",
-        "//commandsv2:commandsv2-java",
         "//wpilibj:wpilibj-java",
         "//wpimath:wpimath-java",
         "//wpinet:wpinet-java",
diff --git a/epilogue-processor/BUILD.bazel b/epilogue-processor/BUILD.bazel
index 0a92334a4c..8db0962590 100644
--- a/epilogue-processor/BUILD.bazel
+++ b/epilogue-processor/BUILD.bazel
@@ -27,7 +27,7 @@ pkg_files(
 
 java_plugin(
     name = "plugin",
-    processor_class = "edu.wpi.first.epilogue.processor.AnnotationProcessor",
+    processor_class = "org.wpilib.epilogue.processor.AnnotationProcessor",
     visibility = ["//visibility:public"],
     deps = [
         ":processor-java",
diff --git a/glass/BUILD.bazel b/glass/BUILD.bazel
index c2e9fa616a..817c549517 100644
--- a/glass/BUILD.bazel
+++ b/glass/BUILD.bazel
@@ -41,7 +41,7 @@ wpilib_cc_static_library(
 wpilib_cc_library(
     name = "glassnt",
     srcs = glob(["src/libnt/native/cpp/*.cpp"]),
-    hdrs = glob(["src/libnt/native/include/**/*.h"]),
+    hdrs = glob(["src/libnt/native/include/**/*.hpp"]),
     hdrs_pkg_root = "src/libnt/native/include",
     include_license_files = True,
     srcs_pkg_root = "src/libnt/native/cpp",
diff --git a/hal/BUILD.bazel b/hal/BUILD.bazel
index c498706bf1..175c99c2ea 100644
--- a/hal/BUILD.bazel
+++ b/hal/BUILD.bazel
@@ -221,8 +221,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/hal/DevMain.java"],
-    main_class = "edu.wpi.first.hal.DevMain",
+    srcs = ["src/dev/java/org/wpilib/hardware/hal/DevMain.java"],
+    main_class = "org.wpilib.hardware.hal.DevMain",
     deps = [
     ],
 )
diff --git a/ntcore/BUILD.bazel b/ntcore/BUILD.bazel
index f251827ee8..d279e644f5 100644
--- a/ntcore/BUILD.bazel
+++ b/ntcore/BUILD.bazel
@@ -74,8 +74,8 @@ filegroup(
 cc_library(
     name = "ntcore_c_headers",
     hdrs = [
-        "src/generated/main/native/include/ntcore_c_types.h",
-        "src/main/native/include/ntcore_c.h",
+        "src/generated/main/native/include/wpi/nt/ntcore_c_types.h",
+        "src/main/native/include/wpi/nt/ntcore_c.h",
     ],
     includes = [
         "src/generated/main/native/include",
@@ -177,7 +177,7 @@ cc_test(
     size = "small",
     srcs = glob([
         "src/test/native/**/*.cpp",
-        "src/test/native/**/*.h",
+        "src/test/native/**/*.hpp",
     ]),
     tags = [
         "exclusive",
diff --git a/requirements.txt b/requirements.txt
index ca73df8d60..0890313470 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 jinja2==3.1.6
 protobuf==5.28.3
 grpcio-tools==1.68.0
-semiwrap==0.1.8
+semiwrap==0.2.1
 pytest
 numpy
 opencv-python~=4.6
diff --git a/requirements_lock.txt b/requirements_lock.txt
index f8f9e918a9..495192c6d2 100644
--- a/requirements_lock.txt
+++ b/requirements_lock.txt
@@ -311,6 +311,10 @@ protobuf==5.28.3 \
     # via
     #   -r requirements.txt
     #   grpcio-tools
+pybind11==3.0.1 \
+    --hash=sha256:9c0f40056a016da59bab516efb523089139fcc6f2ba7e4930854c61efb932051 \
+    --hash=sha256:aa8f0aa6e0a94d3b64adfc38f560f33f15e589be2175e103c0a33c6bce55ee89
+    # via semiwrap
 pybind11-stubgen==2.5.4 \
     --hash=sha256:8625f25da48cf96eea24ba7cae673b5f49b45847b6ef01eead60c4eb762fe5c5 \
     --hash=sha256:b6bd44a6d4ba55cef80bd8af92f1f8195b1c6bb0f7bd2f6d785c9530ce6bcae9
@@ -430,9 +434,9 @@ ruamel-yaml-clib==0.2.12 \
     --hash=sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987 \
     --hash=sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df
     # via ruamel-yaml
-semiwrap==0.1.8 \
-    --hash=sha256:af5fe5aa3fb9c39b9924ab2f763f41a7a8128ffbaf743a3cb0c3bef6a30c8233 \
-    --hash=sha256:e176f9f4cca2409a104fab7d14956e1e371ee36264c8478b78a2d142e104537d
+semiwrap==0.2.1 \
+    --hash=sha256:aa49db870a77c417797240d06ca1b247580f2b0b40b9ed215cada654d87e4c8f \
+    --hash=sha256:bcf0e7eb2c77241f86c59bc09dc94bd899e88f2a0570d77e01821f9135370f75
     # via -r requirements.txt
 sphinxify==0.12 \
     --hash=sha256:3ec299e78babac7d3457f47bf263411b48e10b9c8add18d7159fa0327cc4a061 \
diff --git a/requirements_windows_lock.txt b/requirements_windows_lock.txt
index 92bd9fef15..06788964e7 100644
--- a/requirements_windows_lock.txt
+++ b/requirements_windows_lock.txt
@@ -317,6 +317,10 @@ protobuf==5.28.3 \
     # via
     #   -r requirements.txt
     #   grpcio-tools
+pybind11==3.0.1 \
+    --hash=sha256:9c0f40056a016da59bab516efb523089139fcc6f2ba7e4930854c61efb932051 \
+    --hash=sha256:aa8f0aa6e0a94d3b64adfc38f560f33f15e589be2175e103c0a33c6bce55ee89
+    # via semiwrap
 pybind11-stubgen==2.5.4 \
     --hash=sha256:8625f25da48cf96eea24ba7cae673b5f49b45847b6ef01eead60c4eb762fe5c5 \
     --hash=sha256:b6bd44a6d4ba55cef80bd8af92f1f8195b1c6bb0f7bd2f6d785c9530ce6bcae9
@@ -436,9 +440,9 @@ ruamel-yaml-clib==0.2.12 \
     --hash=sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987 \
     --hash=sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df
     # via ruamel-yaml
-semiwrap==0.1.8 \
-    --hash=sha256:af5fe5aa3fb9c39b9924ab2f763f41a7a8128ffbaf743a3cb0c3bef6a30c8233 \
-    --hash=sha256:e176f9f4cca2409a104fab7d14956e1e371ee36264c8478b78a2d142e104537d
+semiwrap==0.2.1 \
+    --hash=sha256:aa49db870a77c417797240d06ca1b247580f2b0b40b9ed215cada654d87e4c8f \
+    --hash=sha256:bcf0e7eb2c77241f86c59bc09dc94bd899e88f2a0570d77e01821f9135370f75
     # via -r requirements.txt
 sphinxify==0.12 \
     --hash=sha256:3ec299e78babac7d3457f47bf263411b48e10b9c8add18d7159fa0327cc4a061 \
diff --git a/romiVendordep/BUILD.bazel b/romiVendordep/BUILD.bazel
index 31ae22769f..7f65bb689d 100644
--- a/romiVendordep/BUILD.bazel
+++ b/romiVendordep/BUILD.bazel
@@ -87,8 +87,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/wpilibj/romi/DevMain.java"],
-    main_class = "edu.wpi.first.wpilibj.romi.DevMain",
+    srcs = ["src/dev/java/org/wpilib/romi/DevMain.java"],
+    main_class = "org.wpilib.romi.DevMain",
     deps = [
         "//hal:hal-java",
         "//ntcore:ntcore-java",
diff --git a/simulation/halsim_gui/BUILD.bazel b/simulation/halsim_gui/BUILD.bazel
index f14ad8a1c6..c72bd44a3b 100644
--- a/simulation/halsim_gui/BUILD.bazel
+++ b/simulation/halsim_gui/BUILD.bazel
@@ -6,7 +6,7 @@ wpilib_cc_library(
     name = "halsim_gui",
     srcs = glob([
         "src/main/native/cpp/*",
-        "src/main/native/include/*.h",
+        "src/main/native/include/**/*.hpp",
     ]),
     include_license_files = True,
     includes = ["src/main/native/include"],
@@ -32,7 +32,7 @@ wpilib_cc_library(
     name = "halsim_gui_static",
     srcs = glob([
         "src/main/native/cpp/*",
-        "src/main/native/include/*.h",
+        "src/main/native/include/**/*.hpp",
     ]),
     copts = [
         "-DHALSIM_InitExtension=HALSIM_InitExtension_GUI",
diff --git a/simulation/halsim_ws_client/BUILD.bazel b/simulation/halsim_ws_client/BUILD.bazel
index b582d07d00..3c485afa71 100644
--- a/simulation/halsim_ws_client/BUILD.bazel
+++ b/simulation/halsim_ws_client/BUILD.bazel
@@ -7,7 +7,7 @@ wpilib_halsim_extension(
     name = "halsim_ws_client",
     srcs = glob([
         "src/main/native/cpp/*.cpp",
-        "src/main/native/include/*.h",
+        "src/main/native/include/**/*.hpp",
     ]),
     deps = [
         "//simulation/halsim_ws_core",
@@ -18,7 +18,7 @@ wpilib_halsim_extension(
     name = "halsim_ws_client_static",
     srcs = glob([
         "src/main/native/cpp/*.cpp",
-        "src/main/native/include/*.h",
+        "src/main/native/include/**/*.hpp",
     ]),
     copts = [
         "-DHALSIM_InitExtension=HALSIM_InitExtension_WS_CLIENT",
diff --git a/simulation/halsim_ws_core/BUILD.bazel b/simulation/halsim_ws_core/BUILD.bazel
index 7092ce11b1..a148e915b5 100644
--- a/simulation/halsim_ws_core/BUILD.bazel
+++ b/simulation/halsim_ws_core/BUILD.bazel
@@ -4,7 +4,7 @@ load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
 wpilib_cc_library(
     name = "halsim_ws_core",
     srcs = glob(["src/main/native/cpp/*.cpp"]),
-    hdrs = glob(["src/main/native/include/*.h"]),
+    hdrs = glob(["src/main/native/include/**/*.hpp"]),
     include_license_files = True,
     strip_include_prefix = "src/main/native/include",
     target_compatible_with = select({
diff --git a/simulation/halsim_ws_server/BUILD.bazel b/simulation/halsim_ws_server/BUILD.bazel
index a0ca0249e7..18d3631773 100644
--- a/simulation/halsim_ws_server/BUILD.bazel
+++ b/simulation/halsim_ws_server/BUILD.bazel
@@ -73,7 +73,7 @@ wpilib_cc_static_library(
 
 cc_library(
     name = "test_headers",
-    srcs = glob(["src/test/native/include/*.h"]),
+    srcs = glob(["src/test/native/include/*.hpp"]),
     includes = ["src/test/native/include"],
     strip_include_prefix = "src/test/native/include",
 )
diff --git a/simulation/halsim_xrp/BUILD.bazel b/simulation/halsim_xrp/BUILD.bazel
index 94edec0158..1d3f8cc251 100644
--- a/simulation/halsim_xrp/BUILD.bazel
+++ b/simulation/halsim_xrp/BUILD.bazel
@@ -6,7 +6,7 @@ wpilib_cc_library(
     name = "halsim_xrp",
     srcs = glob([
         "src/main/native/cpp/*",
-        "src/main/native/include/*.h",
+        "src/main/native/include/**/*.hpp",
     ]),
     include_license_files = True,
     includes = ["src/main/native/include"],
@@ -26,7 +26,7 @@ wpilib_cc_library(
     name = "halsim_xrp_static",
     srcs = glob([
         "src/main/native/cpp/*",
-        "src/main/native/include/*.h",
+        "src/main/native/include/**/*.hpp",
     ]),
     copts = [
         "-DHALSIM_InitExtension=HALSIM_InitExtension_XRP",
diff --git a/tools/processstarter/BUILD.bazel b/tools/processstarter/BUILD.bazel
index 656a0bf5c2..bf8abb1a3d 100644
--- a/tools/processstarter/BUILD.bazel
+++ b/tools/processstarter/BUILD.bazel
@@ -3,18 +3,15 @@ load("//shared/bazel/rules:objectivec_rules.bzl", "wpilib_objc_library")
 load("//shared/bazel/rules:packaging.bzl", "package_binary_cc_project")
 
 WIN_SRCS = glob([
-    "src/main/native/windows/**/*.cpp",
-    "src/main/native/windows/**/*.h",
+    "src/main/native/windows/**",
 ])
 
 LINUX_SRCS = glob([
-    "src/main/native/linux/**/*.cpp",
-    "src/main/native/linux/**/*.h",
+    "src/main/native/linux/**",
 ])
 
 MAC_SRCS = glob([
-    "src/main/native/osx/**/*.mm",
-    "src/main/native/osx/**/*.h",
+    "src/main/native/osx/**",
 ])
 
 filegroup(
diff --git a/tools/wpical/BUILD.bazel b/tools/wpical/BUILD.bazel
index 753cb4b14e..35c8a64705 100644
--- a/tools/wpical/BUILD.bazel
+++ b/tools/wpical/BUILD.bazel
@@ -228,7 +228,7 @@ cc_test(
         "src/main/native/assets/fieldvideo",
     ],
     defines = [
-        'PROJECT_ROOT_PATH=\\"wpical/src/main/native/assets\\"',
+        'PROJECT_ROOT_PATH=\\"tools/wpical/src/main/native/assets\\"',
         "__BAZEL__=1",
     ],
     deps = [
diff --git a/wpilibcExamples/build_cpp_examples.bzl b/wpilibcExamples/build_cpp_examples.bzl
index b1a183d20e..538c7119f6 100644
--- a/wpilibcExamples/build_cpp_examples.bzl
+++ b/wpilibcExamples/build_cpp_examples.bzl
@@ -32,7 +32,7 @@ def build_examples(halsim_deps = []):
     for folder in EXAMPLE_FOLDERS:
         cc_library(
             name = folder + "-examples-headers",
-            hdrs = native.glob(["src/main/cpp/examples/" + folder + "/include/**/*.h"], allow_empty = True),
+            hdrs = native.glob(["src/main/cpp/examples/" + folder + "/include/**/*.hpp"], allow_empty = True),
             strip_include_prefix = "src/main/cpp/examples/" + folder + "/include",
             tags = ["wpi-example"],
         )
@@ -57,7 +57,7 @@ def build_commands():
         cc_library(
             name = folder + "-command",
             srcs = native.glob(["src/main/cpp/commands/" + folder + "/**/*.cpp"]),
-            hdrs = native.glob(["src/main/cpp/commands/" + folder + "/**/*.h"]),
+            hdrs = native.glob(["src/main/cpp/commands/" + folder + "/**/*.hpp"]),
             deps = [
                 "//commandsv2",
             ],
@@ -72,7 +72,7 @@ def build_snippets():
         cc_library(
             name = folder + "-template",
             srcs = native.glob(["src/main/cpp/snippets/" + folder + "/**/*.cpp"]),
-            hdrs = native.glob(["src/main/cpp/snippets/" + folder + "/**/*.h"], allow_empty = True),
+            hdrs = native.glob(["src/main/cpp/snippets/" + folder + "/**/*.hpp"], allow_empty = True),
             deps = [
                 "//commandsv2",
             ],
@@ -87,7 +87,7 @@ def build_templates():
         cc_library(
             name = folder + "-template",
             srcs = native.glob(["src/main/cpp/templates/" + folder + "/**/*.cpp"]),
-            hdrs = native.glob(["src/main/cpp/templates/" + folder + "/**/*.h"]),
+            hdrs = native.glob(["src/main/cpp/templates/" + folder + "/**/*.hpp"]),
             deps = [
                 "//commandsv2",
             ],
diff --git a/wpilibj/BUILD.bazel b/wpilibj/BUILD.bazel
index 035d7a8e7e..30d28579d2 100644
--- a/wpilibj/BUILD.bazel
+++ b/wpilibj/BUILD.bazel
@@ -127,8 +127,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/wpilibj/DevMain.java"],
-    main_class = "edu.wpi.first.wpilibj.DevMain",
+    srcs = ["src/dev/java/org/wpilib/DevMain.java"],
+    main_class = "org.wpilib.DevMain",
     deps = [
         "//hal:hal-java",
         "//ntcore:ntcore-java",
diff --git a/wpilibjExamples/BUILD.bazel b/wpilibjExamples/BUILD.bazel
index f98f969213..bd65719aaf 100644
--- a/wpilibjExamples/BUILD.bazel
+++ b/wpilibjExamples/BUILD.bazel
@@ -16,10 +16,10 @@ py_binary(
 genrule(
     name = "generate_bazel_files_rule",
     srcs = [
-        "src/main/java/edu/wpi/first/wpilibj/commands/commands.json",
-        "src/main/java/edu/wpi/first/wpilibj/examples/examples.json",
-        "src/main/java/edu/wpi/first/wpilibj/snippets/snippets.json",
-        "src/main/java/edu/wpi/first/wpilibj/templates/templates.json",
+        "src/main/java/org/wpilib/commands/commands.json",
+        "src/main/java/org/wpilib/examples/examples.json",
+        "src/main/java/org/wpilib/snippets/snippets.json",
+        "src/main/java/org/wpilib/templates/templates.json",
     ],
     outs = ["gen/example_projects.bzl"],
     cmd = "$(locations :generate_bazel_files) $(OUTS)",
diff --git a/wpilibjExamples/build_java_examples.bzl b/wpilibjExamples/build_java_examples.bzl
index 7861038ac6..74bc12ee89 100644
--- a/wpilibjExamples/build_java_examples.bzl
+++ b/wpilibjExamples/build_java_examples.bzl
@@ -7,16 +7,16 @@ load("//wpilibjExamples:example_projects.bzl", "COMMANDS_V2_FOLDERS", "EXAMPLES_
 def _package_type(package_type):
     pkg_files(
         name = package_type + "-pkg",
-        srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/" + package_type + "/**"]),
-        strip_prefix = "src/main/java/edu/wpi/first/wpilibj",
+        srcs = native.glob(["src/main/java/org/wpilib/" + package_type + "/**"]),
+        strip_prefix = "src/main/java/org/wpilib",
     )
 
     pkgs = ["//:license_pkg_files", ":" + package_type + "-pkg"]
     if package_type == "examples":
         pkg_files(
             name = package_type + "-tests-pkg",
-            srcs = native.glob(["src/test/java/edu/wpi/first/wpilibj/" + package_type + "/**"]),
-            strip_prefix = "src/test/java/edu/wpi/first/wpilibj/" + package_type,
+            srcs = native.glob(["src/test/java/org/wpilib/" + package_type + "/**"]),
+            strip_prefix = "src/test/java/org/wpilib/" + package_type,
             prefix = "examples_test",
         )
         pkgs.append(package_type + "-tests-pkg")
@@ -33,8 +33,8 @@ def build_examples(halsim_deps):
     for folder in EXAMPLES_FOLDERS:
         java_binary(
             name = folder + "-example",
-            srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/examples/" + folder + "/**/*.java"]),
-            main_class = "edu/wpi/first/wpilibj/examples/" + folder + "/Main",
+            srcs = native.glob(["src/main/java/org/wpilib/examples/" + folder + "/**/*.java"]),
+            main_class = "org/wpilib/examples/" + folder + "/Main",
             plugins = [
                 "//epilogue-processor:plugin",
             ],
@@ -63,7 +63,7 @@ def build_commands():
     for folder in COMMANDS_V2_FOLDERS:
         java_library(
             name = folder + "-command",
-            srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/commands/" + folder + "/**/*.java"]),
+            srcs = native.glob(["src/main/java/org/wpilib/commands/" + folder + "/**/*.java"]),
             deps = [
                 "//hal:hal-java",
                 "//wpilibj:wpilibj-java",
@@ -79,7 +79,7 @@ def build_snippets():
     for folder in SNIPPETS_FOLDERS:
         java_library(
             name = folder + "-snippet",
-            srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/snippets/" + folder + "/**/*.java"]),
+            srcs = native.glob(["src/main/java/org/wpilib/snippets/" + folder + "/**/*.java"]),
             deps = [
                 "//hal:hal-java",
                 "//wpilibj:wpilibj-java",
@@ -94,7 +94,7 @@ def build_templates():
     for folder in TEMPLATES_FOLDERS:
         java_library(
             name = folder + "-template",
-            srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/templates/" + folder + "/**/*.java"]),
+            srcs = native.glob(["src/main/java/org/wpilib/templates/" + folder + "/**/*.java"]),
             deps = [
                 "//hal:hal-java",
                 "//wpilibj:wpilibj-java",
@@ -110,7 +110,7 @@ def build_tests():
     for folder in TEST_FOLDERS:
         wpilib_java_junit5_test(
             name = folder + "-test",
-            srcs = native.glob(["src/test/java/edu/wpi/first/wpilibj/examples/" + folder + "/**/*.java"]),
+            srcs = native.glob(["src/test/java/org/wpilib/examples/" + folder + "/**/*.java"]),
             deps = [
                 ":" + folder + "-example",
                 "//hal:hal-java",
diff --git a/wpimath/BUILD.bazel b/wpimath/BUILD.bazel
index 37007f3c98..1a8a02c0ef 100644
--- a/wpimath/BUILD.bazel
+++ b/wpimath/BUILD.bazel
@@ -263,7 +263,7 @@ cc_test(
     size = "small",
     srcs = glob([
         "src/test/native/cpp/**/*.cpp",
-        "src/test/native/cpp/**/*.h",
+        "src/test/native/cpp/**/*.hpp",
     ]),
     tags = [
         "no-raspi",
@@ -298,8 +298,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/math/DevMain.java"],
-    main_class = "edu.wpi.first.math.DevMain",
+    srcs = ["src/dev/java/org/wpilib/math/DevMain.java"],
+    main_class = "org.wpilib.math.DevMain",
     deps = [
         ":wpimath-java",
     ],
diff --git a/wpinet/BUILD.bazel b/wpinet/BUILD.bazel
index 4a45a333b3..6d3c7ede3b 100644
--- a/wpinet/BUILD.bazel
+++ b/wpinet/BUILD.bazel
@@ -118,7 +118,7 @@ filegroup(
 cc_library(
     name = "private_includes",
     hdrs = glob([
-        "src/main/native/cpp/*.h",
+        "src/main/native/cpp/*.hpp",
     ]),
     strip_include_prefix = "src/main/native/cpp",
 )
@@ -183,7 +183,7 @@ wpilib_jni_cc_library(
     name = "wpinetjni",
     srcs = glob([
         "src/main/native/cpp/jni/**",
-        "src/main/native/cpp/**/*.h",
+        "src/main/native/cpp/**/*.hpp",
     ]),
     java_dep = ":wpinet-java",
     visibility = ["//visibility:public"],
@@ -221,7 +221,7 @@ cc_test(
     size = "small",
     srcs = glob([
         "src/test/native/**/*.cpp",
-        "src/test/native/**/*.h",
+        "src/test/native/**/*.hpp",
     ]),
     tags = ["no-asan"],
     deps = [
@@ -249,8 +249,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-java",
-    srcs = ["src/dev/java/edu/wpi/first/net/DevMain.java"],
-    main_class = "edu.wpi.first.net.DevMain",
+    srcs = ["src/dev/java/org/wpilib/net/DevMain.java"],
+    main_class = "org.wpilib.net.DevMain",
     deps = [
         ":wpinet-java",
         "//wpiutil:wpiutil-java",
diff --git a/wpiunits/BUILD.bazel b/wpiunits/BUILD.bazel
index d23543e0f2..db0d7deba7 100644
--- a/wpiunits/BUILD.bazel
+++ b/wpiunits/BUILD.bazel
@@ -49,8 +49,8 @@ wpilib_java_junit5_test(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/units/DevMain.java"],
-    main_class = "edu.wpi.first.units.DevMain",
+    srcs = ["src/dev/java/org/wpilib/units/DevMain.java"],
+    main_class = "org.wpilib.units.DevMain",
     deps = [
         ":wpiunits-java",
     ],
diff --git a/wpiutil/BUILD.bazel b/wpiutil/BUILD.bazel
index 7cf14c2b86..d4eadd0794 100644
--- a/wpiutil/BUILD.bazel
+++ b/wpiutil/BUILD.bazel
@@ -343,8 +343,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/util/DevMain.java"],
-    main_class = "edu.wpi.first.util.DevMain",
+    srcs = ["src/dev/java/org/wpilib/util/DevMain.java"],
+    main_class = "org.wpilib.util.DevMain",
     deps = [
         ":wpiutil-java",
     ],
diff --git a/xrpVendordep/BUILD.bazel b/xrpVendordep/BUILD.bazel
index 857161e962..0e84c6cabb 100644
--- a/xrpVendordep/BUILD.bazel
+++ b/xrpVendordep/BUILD.bazel
@@ -85,8 +85,8 @@ cc_binary(
 
 java_binary(
     name = "DevMain-Java",
-    srcs = ["src/dev/java/edu/wpi/first/wpilibj/xrp/DevMain.java"],
-    main_class = "edu.wpi.first.wpilibj.xrp.DevMain",
+    srcs = ["src/dev/java/org/wpilib/xrp/DevMain.java"],
+    main_class = "org.wpilib.xrp.DevMain",
     deps = [
         "//hal:hal-java",
         "//ntcore:ntcore-java",