diff --git a/README.md b/README.md
index 294c86a..3440730 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ For VS Code instructions, see [the VS Code Readme.](extension/README.md)
 ## Gradle Instructions
 To add this to gradle, add the extension to your plugin block. See _insertUrlHere_ for the latest version and instructions how to do this. That is all that needs to be done in Gradle.
 
-Once added, the task `generateVsCodeConfig` is added to the root project, which when ran will generate a `vscodeconfig.json` 
+Once added, the task `generateVsCodeConfig` is added to the root project, which when ran will generate a `vscodeconfig.json`
 
 # Using custom builds
 
@@ -18,9 +18,9 @@ To use a custom build of gradle-cpp-vscode in a robot project, the build must be
 
 1. Update the version in `build.gradle` so that native-utils won't overwrite an existing version.
 ```
-group 'edu.wpi.first'
-version '1.3.0'
+group 'org.wpilib'
+version '2027.0.0'
 ```
 2. Execute `.\gradlew publishToMavenLocal`
-3. Update gradle-cpp-vscode version in native-utils ``build.gradle``: ``api 'edu.wpi.first:gradle-cpp-vscode:1.3.0'``
-4. Follow the directions in the ![native-utils readme](https://github.com/wpilibsuite/native-utils/blob/main/README.md#using-custom-builds) for publishing a local build and using in a robot program
\ No newline at end of file
+3. Update gradle-cpp-vscode version in native-utils ``build.gradle``: ``api 'org.wpilib:gradle-cpp-vscode:2027.0.0'``
+4. Follow the directions in the ![native-utils readme](https://github.com/wpilibsuite/native-utils/blob/main/README.md#using-custom-builds) for publishing a local build and using in a robot program
diff --git a/build.gradle b/build.gradle
index a19f17b..045f025 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
     id "com.gradle.plugin-publish" version "1.2.1"
 }
 
-group 'edu.wpi.first'
-version '2.1.0'
+group = 'org.wpilib'
+version = '2027.0.0'
 
 if (project.hasProperty('publishVersion')) {
     version = project.publishVersion
@@ -14,7 +14,7 @@ if (project.hasProperty('publishVersion')) {
 
 repositories {
     maven {
-        url "https://plugins.gradle.org/m2/"
+        url = "https://plugins.gradle.org/m2/"
     }
     mavenLocal()
 }
@@ -27,11 +27,12 @@ java {
 dependencies {
     api 'com.google.code.gson:gson:2.8.6'
 
-    testImplementation('org.spockframework:spock-core:2.0-M4-groovy-3.0') {
+    testImplementation('org.spockframework:spock-core:2.4-M6-groovy-4.0') {
         exclude group: 'org.codehaus.groovy'
     }
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation gradleTestKit()
 }
 
@@ -45,9 +46,9 @@ gradlePlugin {
 
     plugins {
         GradleVsCode {
-            id = 'edu.wpi.first.GradleVsCode'
+            id = 'org.wpilib.GradleVsCode'
             displayName = 'GradleVsCode'
-            implementationClass = 'edu.wpi.first.vscode.GradleVsCode'
+            implementationClass = 'org.wpilib.vscode.GradleVsCode'
             description = 'This plugin provides VS Code support for old style gradle projects.'
             tags = ['groovy', 'vscode', 'cpp', 'maven', 'frc', 'wpilib']
         }
@@ -55,5 +56,5 @@ gradlePlugin {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '9.2.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135..f8e1ee3 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f86..bad7c24 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..adff685 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85..e509b2d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/main/java/edu/wpi/first/vscode/GradleVsCode.java b/src/main/java/org/wpilib/vscode/GradleVsCode.java
similarity index 98%
rename from src/main/java/edu/wpi/first/vscode/GradleVsCode.java
rename to src/main/java/org/wpilib/vscode/GradleVsCode.java
index 65bc087..626a2b8 100644
--- a/src/main/java/edu/wpi/first/vscode/GradleVsCode.java
+++ b/src/main/java/org/wpilib/vscode/GradleVsCode.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode;
+package org.wpilib.vscode;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
diff --git a/src/main/java/edu/wpi/first/vscode/GradleVsCodeRules.java b/src/main/java/org/wpilib/vscode/GradleVsCodeRules.java
similarity index 95%
rename from src/main/java/edu/wpi/first/vscode/GradleVsCodeRules.java
rename to src/main/java/org/wpilib/vscode/GradleVsCodeRules.java
index e56a9fe..53a2502 100644
--- a/src/main/java/edu/wpi/first/vscode/GradleVsCodeRules.java
+++ b/src/main/java/org/wpilib/vscode/GradleVsCodeRules.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode;
+package org.wpilib.vscode;
 
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -21,10 +21,9 @@
 import org.gradle.platform.base.BinaryContainer;
 import org.gradle.platform.base.BinarySpec;
 import org.gradle.process.internal.ExecActionFactory;
-
-import edu.wpi.first.vscode.compilecommands.BinaryCompileCommandsTask;
-import edu.wpi.first.vscode.compilecommands.CompileCommand;
-import edu.wpi.first.vscode.compilecommands.TargetedCompileCommandsTask;
+import org.wpilib.vscode.compilecommands.BinaryCompileCommandsTask;
+import org.wpilib.vscode.compilecommands.CompileCommand;
+import org.wpilib.vscode.compilecommands.TargetedCompileCommandsTask;
 
 public class GradleVsCodeRules extends RuleSource {
   @Finalize
diff --git a/src/main/java/edu/wpi/first/vscode/ToolChainConfiguration.java b/src/main/java/org/wpilib/vscode/ToolChainConfiguration.java
similarity index 98%
rename from src/main/java/edu/wpi/first/vscode/ToolChainConfiguration.java
rename to src/main/java/org/wpilib/vscode/ToolChainConfiguration.java
index d411317..1bedcef 100644
--- a/src/main/java/edu/wpi/first/vscode/ToolChainConfiguration.java
+++ b/src/main/java/org/wpilib/vscode/ToolChainConfiguration.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode;
+package org.wpilib.vscode;
 
 public class ToolChainConfiguration {
   public String name;
diff --git a/src/main/java/edu/wpi/first/vscode/VsCodeConfigurationExtension.java b/src/main/java/org/wpilib/vscode/VsCodeConfigurationExtension.java
similarity index 93%
rename from src/main/java/edu/wpi/first/vscode/VsCodeConfigurationExtension.java
rename to src/main/java/org/wpilib/vscode/VsCodeConfigurationExtension.java
index e79220e..2e30bea 100644
--- a/src/main/java/edu/wpi/first/vscode/VsCodeConfigurationExtension.java
+++ b/src/main/java/org/wpilib/vscode/VsCodeConfigurationExtension.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode;
+package org.wpilib.vscode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,8 +11,7 @@
 import org.gradle.nativeplatform.toolchain.internal.msvcpp.VisualStudioLocator;
 import org.gradle.nativeplatform.toolchain.internal.msvcpp.WindowsSdkLocator;
 import org.gradle.process.internal.ExecActionFactory;
-
-import edu.wpi.first.vscode.tooling.models.ToolChains;
+import org.wpilib.vscode.tooling.models.ToolChains;
 
 public class VsCodeConfigurationExtension {
   public List<NativeBinarySpec> _binaries = new ArrayList<>();
diff --git a/src/main/java/edu/wpi/first/vscode/VsCodeConfigurationTask.java b/src/main/java/org/wpilib/vscode/VsCodeConfigurationTask.java
similarity index 91%
rename from src/main/java/edu/wpi/first/vscode/VsCodeConfigurationTask.java
rename to src/main/java/org/wpilib/vscode/VsCodeConfigurationTask.java
index e37dc87..967bd97 100644
--- a/src/main/java/edu/wpi/first/vscode/VsCodeConfigurationTask.java
+++ b/src/main/java/org/wpilib/vscode/VsCodeConfigurationTask.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode;
+package org.wpilib.vscode;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -16,9 +16,8 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
-
-import edu.wpi.first.vscode.tooling.ToolChainGenerator;
-import edu.wpi.first.vscode.tooling.models.ToolChains;
+import org.wpilib.vscode.tooling.ToolChainGenerator;
+import org.wpilib.vscode.tooling.models.ToolChains;
 
 public class VsCodeConfigurationTask extends DefaultTask {
   private RegularFileProperty configFile;
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/ArgsTransformer.java b/src/main/java/org/wpilib/vscode/compilecommands/ArgsTransformer.java
similarity index 68%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/ArgsTransformer.java
rename to src/main/java/org/wpilib/vscode/compilecommands/ArgsTransformer.java
index 739afb2..18b10fc 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/ArgsTransformer.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/ArgsTransformer.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.util.List;
 
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/BinaryCompileCommandsTask.java b/src/main/java/org/wpilib/vscode/compilecommands/BinaryCompileCommandsTask.java
similarity index 95%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/BinaryCompileCommandsTask.java
rename to src/main/java/org/wpilib/vscode/compilecommands/BinaryCompileCommandsTask.java
index 5bec911..15aa7cd 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/BinaryCompileCommandsTask.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/BinaryCompileCommandsTask.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/CompileCommand.java b/src/main/java/org/wpilib/vscode/compilecommands/CompileCommand.java
similarity index 89%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/CompileCommand.java
rename to src/main/java/org/wpilib/vscode/compilecommands/CompileCommand.java
index 119cd27..7d0fb22 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/CompileCommand.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/CompileCommand.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.util.List;
 
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/EscapeUserArgs.java b/src/main/java/org/wpilib/vscode/compilecommands/EscapeUserArgs.java
similarity index 90%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/EscapeUserArgs.java
rename to src/main/java/org/wpilib/vscode/compilecommands/EscapeUserArgs.java
index d2f84cb..3eaaf07 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/EscapeUserArgs.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/EscapeUserArgs.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/GccCompilerArgsTransformer.java b/src/main/java/org/wpilib/vscode/compilecommands/GccCompilerArgsTransformer.java
similarity index 94%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/GccCompilerArgsTransformer.java
rename to src/main/java/org/wpilib/vscode/compilecommands/GccCompilerArgsTransformer.java
index 2855ac0..ff078a5 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/GccCompilerArgsTransformer.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/GccCompilerArgsTransformer.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/MacroArgsConverter.java b/src/main/java/org/wpilib/vscode/compilecommands/MacroArgsConverter.java
similarity index 90%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/MacroArgsConverter.java
rename to src/main/java/org/wpilib/vscode/compilecommands/MacroArgsConverter.java
index 1d0fea5..fbd8853 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/MacroArgsConverter.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/MacroArgsConverter.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/NativeCompileSpec.java b/src/main/java/org/wpilib/vscode/compilecommands/NativeCompileSpec.java
similarity index 96%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/NativeCompileSpec.java
rename to src/main/java/org/wpilib/vscode/compilecommands/NativeCompileSpec.java
index 633a7be..f3dc2cc 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/NativeCompileSpec.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/NativeCompileSpec.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/TargetedCompileCommandsTask.java b/src/main/java/org/wpilib/vscode/compilecommands/TargetedCompileCommandsTask.java
similarity index 95%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/TargetedCompileCommandsTask.java
rename to src/main/java/org/wpilib/vscode/compilecommands/TargetedCompileCommandsTask.java
index 65d4e7c..f69a081 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/TargetedCompileCommandsTask.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/TargetedCompileCommandsTask.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -32,7 +32,7 @@ public abstract class TargetedCompileCommandsTask extends DefaultTask {
   public abstract DirectoryProperty getTargetedCompileCommands();
 
   @Internal
-  public abstract ListProperty<Directory> getBinaryCompileDirectories(); 
+  public abstract ListProperty<Directory> getBinaryCompileDirectories();
 
   @TaskAction
   public void generate() throws IOException {
diff --git a/src/main/java/edu/wpi/first/vscode/compilecommands/VisualCppCompilerArgsTransformer.java b/src/main/java/org/wpilib/vscode/compilecommands/VisualCppCompilerArgsTransformer.java
similarity index 85%
rename from src/main/java/edu/wpi/first/vscode/compilecommands/VisualCppCompilerArgsTransformer.java
rename to src/main/java/org/wpilib/vscode/compilecommands/VisualCppCompilerArgsTransformer.java
index 3adaf93..15e5151 100644
--- a/src/main/java/edu/wpi/first/vscode/compilecommands/VisualCppCompilerArgsTransformer.java
+++ b/src/main/java/org/wpilib/vscode/compilecommands/VisualCppCompilerArgsTransformer.java
@@ -1,7 +1,7 @@
-package edu.wpi.first.vscode.compilecommands;
+package org.wpilib.vscode.compilecommands;
 
-import static edu.wpi.first.vscode.compilecommands.EscapeUserArgs.escapeUserArg;
-import static edu.wpi.first.vscode.compilecommands.EscapeUserArgs.escapeUserArgs;
+import static org.wpilib.vscode.compilecommands.EscapeUserArgs.escapeUserArg;
+import static org.wpilib.vscode.compilecommands.EscapeUserArgs.escapeUserArgs;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/wpi/first/vscode/dependencies/SourceContainingNativeDependencySet.java b/src/main/java/org/wpilib/vscode/dependencies/SourceContainingNativeDependencySet.java
similarity index 73%
rename from src/main/java/edu/wpi/first/vscode/dependencies/SourceContainingNativeDependencySet.java
rename to src/main/java/org/wpilib/vscode/dependencies/SourceContainingNativeDependencySet.java
index a900735..d198cca 100644
--- a/src/main/java/edu/wpi/first/vscode/dependencies/SourceContainingNativeDependencySet.java
+++ b/src/main/java/org/wpilib/vscode/dependencies/SourceContainingNativeDependencySet.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.dependencies;
+package org.wpilib.vscode.dependencies;
 
 import org.gradle.api.file.FileCollection;
 
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/ToolChainGenerator.java b/src/main/java/org/wpilib/vscode/tooling/ToolChainGenerator.java
similarity index 92%
rename from src/main/java/edu/wpi/first/vscode/tooling/ToolChainGenerator.java
rename to src/main/java/org/wpilib/vscode/tooling/ToolChainGenerator.java
index f3d315d..cf8b8b7 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/ToolChainGenerator.java
+++ b/src/main/java/org/wpilib/vscode/tooling/ToolChainGenerator.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling;
+package org.wpilib.vscode.tooling;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,16 +31,15 @@
 import org.gradle.nativeplatform.toolchain.internal.tools.CommandLineToolSearchResult;
 import org.gradle.nativeplatform.toolchain.internal.tools.ToolSearchPath;
 import org.gradle.platform.base.internal.toolchain.SearchResult;
-
-import edu.wpi.first.vscode.VsCodeConfigurationExtension;
-import edu.wpi.first.vscode.dependencies.SourceContainingNativeDependencySet;
-import edu.wpi.first.vscode.tooling.models.BinaryObject;
-import edu.wpi.first.vscode.tooling.models.BinaryObjectImpl;
-import edu.wpi.first.vscode.tooling.models.SourceBinaryPairImpl;
-import edu.wpi.first.vscode.tooling.models.SourceSet;
-import edu.wpi.first.vscode.tooling.models.SourceSetImpl;
-import edu.wpi.first.vscode.tooling.models.ToolChains;
-import edu.wpi.first.vscode.tooling.models.ToolChainsImpl;
+import org.wpilib.vscode.VsCodeConfigurationExtension;
+import org.wpilib.vscode.dependencies.SourceContainingNativeDependencySet;
+import org.wpilib.vscode.tooling.models.BinaryObject;
+import org.wpilib.vscode.tooling.models.BinaryObjectImpl;
+import org.wpilib.vscode.tooling.models.SourceBinaryPairImpl;
+import org.wpilib.vscode.tooling.models.SourceSet;
+import org.wpilib.vscode.tooling.models.SourceSetImpl;
+import org.wpilib.vscode.tooling.models.ToolChains;
+import org.wpilib.vscode.tooling.models.ToolChainsImpl;
 
 public class ToolChainGenerator {
   private static String normalizeDriveLetter(String path) {
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/BinaryObject.java b/src/main/java/org/wpilib/vscode/tooling/models/BinaryObject.java
similarity index 80%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/BinaryObject.java
rename to src/main/java/org/wpilib/vscode/tooling/models/BinaryObject.java
index 27d24bc..a2414a7 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/BinaryObject.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/BinaryObject.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/BinaryObjectImpl.java b/src/main/java/org/wpilib/vscode/tooling/models/BinaryObjectImpl.java
similarity index 91%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/BinaryObjectImpl.java
rename to src/main/java/org/wpilib/vscode/tooling/models/BinaryObjectImpl.java
index d2c117e..3918d66 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/BinaryObjectImpl.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/BinaryObjectImpl.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/CompileCommand.java b/src/main/java/org/wpilib/vscode/tooling/models/CompileCommand.java
similarity index 70%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/CompileCommand.java
rename to src/main/java/org/wpilib/vscode/tooling/models/CompileCommand.java
index 0d5a49f..d0a3009 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/CompileCommand.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/CompileCommand.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 public interface CompileCommand {
   public String getDirectory();
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/CompileCommandImpl.java b/src/main/java/org/wpilib/vscode/tooling/models/CompileCommandImpl.java
similarity index 94%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/CompileCommandImpl.java
rename to src/main/java/org/wpilib/vscode/tooling/models/CompileCommandImpl.java
index 8576d43..76d31b7 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/CompileCommandImpl.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/CompileCommandImpl.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import org.gradle.internal.os.OperatingSystem;
 
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/Source.java b/src/main/java/org/wpilib/vscode/tooling/models/Source.java
similarity index 76%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/Source.java
rename to src/main/java/org/wpilib/vscode/tooling/models/Source.java
index 39ddd7b..5ded3e8 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/Source.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/Source.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.util.Set;
 
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceBinaryPair.java b/src/main/java/org/wpilib/vscode/tooling/models/SourceBinaryPair.java
similarity index 80%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/SourceBinaryPair.java
rename to src/main/java/org/wpilib/vscode/tooling/models/SourceBinaryPair.java
index 37340c7..7219389 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceBinaryPair.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/SourceBinaryPair.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.util.Set;
 
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceBinaryPairImpl.java b/src/main/java/org/wpilib/vscode/tooling/models/SourceBinaryPairImpl.java
similarity index 92%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/SourceBinaryPairImpl.java
rename to src/main/java/org/wpilib/vscode/tooling/models/SourceBinaryPairImpl.java
index 9f72579..71ed62c 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceBinaryPairImpl.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/SourceBinaryPairImpl.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceImpl.java b/src/main/java/org/wpilib/vscode/tooling/models/SourceImpl.java
similarity index 92%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/SourceImpl.java
rename to src/main/java/org/wpilib/vscode/tooling/models/SourceImpl.java
index bf10fd2..44993f4 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceImpl.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/SourceImpl.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.io.Serializable;
 import java.util.LinkedHashSet;
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceSet.java b/src/main/java/org/wpilib/vscode/tooling/models/SourceSet.java
similarity index 76%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/SourceSet.java
rename to src/main/java/org/wpilib/vscode/tooling/models/SourceSet.java
index 108b2b8..a5d758b 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceSet.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/SourceSet.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.util.Set;
 
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceSetImpl.java b/src/main/java/org/wpilib/vscode/tooling/models/SourceSetImpl.java
similarity index 90%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/SourceSetImpl.java
rename to src/main/java/org/wpilib/vscode/tooling/models/SourceSetImpl.java
index 1306782..f86abf0 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/SourceSetImpl.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/SourceSetImpl.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.io.Serializable;
 import java.util.LinkedHashSet;
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/ToolChains.java b/src/main/java/org/wpilib/vscode/tooling/models/ToolChains.java
similarity index 89%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/ToolChains.java
rename to src/main/java/org/wpilib/vscode/tooling/models/ToolChains.java
index 7490189..96d515d 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/ToolChains.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/ToolChains.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/edu/wpi/first/vscode/tooling/models/ToolChainsImpl.java b/src/main/java/org/wpilib/vscode/tooling/models/ToolChainsImpl.java
similarity index 94%
rename from src/main/java/edu/wpi/first/vscode/tooling/models/ToolChainsImpl.java
rename to src/main/java/org/wpilib/vscode/tooling/models/ToolChainsImpl.java
index 0bbd4cb..432e3c9 100644
--- a/src/main/java/edu/wpi/first/vscode/tooling/models/ToolChainsImpl.java
+++ b/src/main/java/org/wpilib/vscode/tooling/models/ToolChainsImpl.java
@@ -1,4 +1,4 @@
-package edu.wpi.first.vscode.tooling.models;
+package org.wpilib.vscode.tooling.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/test/groovy/edu/wpi/first/vscode/VsCodeInitializationTest.groovy b/src/test/groovy/org/wpilib/vscode/VsCodeInitializationTest.groovy
similarity index 89%
rename from src/test/groovy/edu/wpi/first/vscode/VsCodeInitializationTest.groovy
rename to src/test/groovy/org/wpilib/vscode/VsCodeInitializationTest.groovy
index e1aac81..4441ac4 100644
--- a/src/test/groovy/edu/wpi/first/vscode/VsCodeInitializationTest.groovy
+++ b/src/test/groovy/org/wpilib/vscode/VsCodeInitializationTest.groovy
@@ -1,4 +1,4 @@
-package edu.wpi.first.gradlerio
+package org.wpilib.gradlerio
 
 import org.gradle.testkit.runner.GradleRunner
 import static org.gradle.testkit.runner.TaskOutcome.*
@@ -23,7 +23,7 @@ class VsCodeInitializationTest extends Specification {
     buildFile1 << """
 plugins {
   id 'cpp'
-  id 'edu.wpi.first.GradleVsCode'
+  id 'org.wpilib.GradleVsCode'
 }
 """
     settingsFile << ""
@@ -42,7 +42,7 @@ plugins {
     buildFile2 << """
 plugins {
   id 'cpp'
-  id 'edu.wpi.first.GradleVsCode'
+  id 'org.wpilib.GradleVsCode'
 }
 """
     settingsFile << "include 'sub'"
@@ -62,7 +62,7 @@ plugins {
     buildFile2 << """
 plugins {
   id 'cpp'
-  id 'edu.wpi.first.GradleVsCode'
+  id 'org.wpilib.GradleVsCode'
 }
 
 model {
@@ -92,7 +92,7 @@ model {
     buildFile1 << """
 plugins {
   id 'cpp'
-  id 'edu.wpi.first.GradleVsCode'
+  id 'org.wpilib.GradleVsCode'
 }
 
 model {
@@ -121,7 +121,7 @@ model {
     buildFile1 << """
 plugins {
   id 'cpp'
-  id 'edu.wpi.first.GradleVsCode'
+  id 'org.wpilib.GradleVsCode'
 }
 
 model {
@@ -135,7 +135,7 @@ model {
     buildFile2 << """
 plugins {
   id 'cpp'
-  id 'edu.wpi.first.GradleVsCode'
+  id 'org.wpilib.GradleVsCode'
 }
 
 model {