diff --git a/.travis-scripts/install.sh b/.travis-scripts/install.sh
deleted file mode 100755
index 7f4773b23b..0000000000
--- a/.travis-scripts/install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
-    # Install custom requirements on Linux
-    sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" > /etc/apt/sources.list.d/llvm.list'
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-    sudo add-apt-repository ppa:wpilib/toolchain -y
-    sudo apt-get update -q
-    sudo apt-get install clang-format-5.0 frc-toolchain -y
-
-    wget https://bootstrap.pypa.io/get-pip.py
-    sudo python3.5 get-pip.py
-    python3.5 -m pip install --user wpiformat
-else
-    echo PATH=$PATH
-    brew update
-    brew install python3 clang-format
-    clang-format --version
-    echo PATH=$PATH
-
-    pip3 install --user wpiformat
-fi
diff --git a/.travis-scripts/wpiformat.sh b/.travis-scripts/wpiformat.sh
deleted file mode 100755
index 84aee9cb5d..0000000000
--- a/.travis-scripts/wpiformat.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
-    python3.5 -m wpiformat -y 2018 -clang 5.0
-else
-    python3 -m wpiformat -y 2018
-fi
-
-git --no-pager diff --exit-code HEAD  # Ensure formatter made no changes
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index eb9a5b2faf..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-sudo: true
-language: java
-
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: required
-    - os: osx
-      osx_image: xcode8
-
-addons:
-  apt:
-    sources:
-      - deadsnakes
-    packages:
-      - g++-multilib
-      - lib32stdc++6
-      - python3.5-dev
-
-before_install:
-  - .travis-scripts/install.sh
-
-install:
-  - ./gradlew assemble -PbuildAll
-
-script:
-  - .travis-scripts/wpiformat.sh
-  - ./gradlew build -PbuildAll
-
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 713c47d4a1..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: "{branch} {build}"
-
-image:
-- Visual Studio 2015
-
-build:
-  verbosity: detailed
-
-build_script:
-  - gradlew.bat assemble --info -PbuildAll
-
-test_script:
-- cmd: >-
-    SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
-
-    gradlew.bat check --info -PbuildAll
-
-    SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.8.0
-
-    gradlew.bat check --info -PbuildAll
-
-cache:
-  - C:\Users\appveyor\.gradle
-
-matrix:
-  fast_finish: true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7a3265ee94..0000000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index fe51c023ce..0000000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/gradlew b/gradlew
deleted file mode 100755
index cccdd3d517..0000000000
--- a/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index e95643d6a2..0000000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-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.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-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.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/.clang-format b/wpiutil/.clang-format
similarity index 100%
rename from .clang-format
rename to wpiutil/.clang-format
diff --git a/.gitignore b/wpiutil/.gitignore
similarity index 100%
rename from .gitignore
rename to wpiutil/.gitignore
diff --git a/.styleguide b/wpiutil/.styleguide
similarity index 100%
rename from .styleguide
rename to wpiutil/.styleguide
diff --git a/.styleguide-license b/wpiutil/.styleguide-license
similarity index 100%
rename from .styleguide-license
rename to wpiutil/.styleguide-license
diff --git a/CONTRIBUTING.md b/wpiutil/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to wpiutil/CONTRIBUTING.md
diff --git a/build.gradle b/wpiutil/build.gradle
similarity index 100%
rename from build.gradle
rename to wpiutil/build.gradle
diff --git a/config.gradle b/wpiutil/config.gradle
similarity index 100%
rename from config.gradle
rename to wpiutil/config.gradle
diff --git a/gmock/LICENSE b/wpiutil/gmock/LICENSE
similarity index 100%
rename from gmock/LICENSE
rename to wpiutil/gmock/LICENSE
diff --git a/gmock/build.gradle b/wpiutil/gmock/build.gradle
similarity index 100%
rename from gmock/build.gradle
rename to wpiutil/gmock/build.gradle
diff --git a/gmock/gtest/CMakeLists.txt b/wpiutil/gmock/gtest/CMakeLists.txt
similarity index 100%
rename from gmock/gtest/CMakeLists.txt
rename to wpiutil/gmock/gtest/CMakeLists.txt
diff --git a/gmock/gtest/LICENSE b/wpiutil/gmock/gtest/LICENSE
similarity index 100%
rename from gmock/gtest/LICENSE
rename to wpiutil/gmock/gtest/LICENSE
diff --git a/gmock/gtest/cmake/internal_utils.cmake b/wpiutil/gmock/gtest/cmake/internal_utils.cmake
similarity index 100%
rename from gmock/gtest/cmake/internal_utils.cmake
rename to wpiutil/gmock/gtest/cmake/internal_utils.cmake
diff --git a/gmock/gtest/include/gtest/gtest-death-test.h b/wpiutil/gmock/gtest/include/gtest/gtest-death-test.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-death-test.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-death-test.h
diff --git a/gmock/gtest/include/gtest/gtest-message.h b/wpiutil/gmock/gtest/include/gtest/gtest-message.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-message.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-message.h
diff --git a/gmock/gtest/include/gtest/gtest-param-test.h b/wpiutil/gmock/gtest/include/gtest/gtest-param-test.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-param-test.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-param-test.h
diff --git a/gmock/gtest/include/gtest/gtest-param-test.h.pump b/wpiutil/gmock/gtest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-param-test.h.pump
rename to wpiutil/gmock/gtest/include/gtest/gtest-param-test.h.pump
diff --git a/gmock/gtest/include/gtest/gtest-printers.h b/wpiutil/gmock/gtest/include/gtest/gtest-printers.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-printers.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-printers.h
diff --git a/gmock/gtest/include/gtest/gtest-spi.h b/wpiutil/gmock/gtest/include/gtest/gtest-spi.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-spi.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-spi.h
diff --git a/gmock/gtest/include/gtest/gtest-test-part.h b/wpiutil/gmock/gtest/include/gtest/gtest-test-part.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-test-part.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-test-part.h
diff --git a/gmock/gtest/include/gtest/gtest-typed-test.h b/wpiutil/gmock/gtest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-typed-test.h
rename to wpiutil/gmock/gtest/include/gtest/gtest-typed-test.h
diff --git a/gmock/gtest/include/gtest/gtest.h b/wpiutil/gmock/gtest/include/gtest/gtest.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest.h
rename to wpiutil/gmock/gtest/include/gtest/gtest.h
diff --git a/gmock/gtest/include/gtest/gtest_pred_impl.h b/wpiutil/gmock/gtest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest_pred_impl.h
rename to wpiutil/gmock/gtest/include/gtest/gtest_pred_impl.h
diff --git a/gmock/gtest/include/gtest/gtest_prod.h b/wpiutil/gmock/gtest/include/gtest/gtest_prod.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest_prod.h
rename to wpiutil/gmock/gtest/include/gtest/gtest_prod.h
diff --git a/gmock/gtest/include/gtest/internal/custom/gtest-port.h b/wpiutil/gmock/gtest/include/gtest/internal/custom/gtest-port.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/custom/gtest-port.h
rename to wpiutil/gmock/gtest/include/gtest/internal/custom/gtest-port.h
diff --git a/gmock/gtest/include/gtest/internal/custom/gtest-printers.h b/wpiutil/gmock/gtest/include/gtest/internal/custom/gtest-printers.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/custom/gtest-printers.h
rename to wpiutil/gmock/gtest/include/gtest/internal/custom/gtest-printers.h
diff --git a/gmock/gtest/include/gtest/internal/custom/gtest.h b/wpiutil/gmock/gtest/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/custom/gtest.h
rename to wpiutil/gmock/gtest/include/gtest/internal/custom/gtest.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-death-test-internal.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-filepath.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-filepath.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-internal.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-internal.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-internal.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-linked_ptr.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-param-util-generated.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/wpiutil/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/gmock/gtest/include/gtest/internal/gtest-param-util.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-param-util.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-port-arch.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-port-arch.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-port-arch.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-port-arch.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-port.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-port.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-port.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-string.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-string.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-string.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-tuple.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-tuple.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump b/wpiutil/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-tuple.h.pump
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/gmock/gtest/include/gtest/internal/gtest-type-util.h b/wpiutil/gmock/gtest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-type-util.h
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump b/wpiutil/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-type-util.h.pump
rename to wpiutil/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/gmock/gtest/src/gtest-all.cc b/wpiutil/gmock/gtest/src/gtest-all.cc
similarity index 100%
rename from gmock/gtest/src/gtest-all.cc
rename to wpiutil/gmock/gtest/src/gtest-all.cc
diff --git a/gmock/gtest/src/gtest-death-test.cc b/wpiutil/gmock/gtest/src/gtest-death-test.cc
similarity index 100%
rename from gmock/gtest/src/gtest-death-test.cc
rename to wpiutil/gmock/gtest/src/gtest-death-test.cc
diff --git a/gmock/gtest/src/gtest-filepath.cc b/wpiutil/gmock/gtest/src/gtest-filepath.cc
similarity index 100%
rename from gmock/gtest/src/gtest-filepath.cc
rename to wpiutil/gmock/gtest/src/gtest-filepath.cc
diff --git a/gmock/gtest/src/gtest-internal-inl.h b/wpiutil/gmock/gtest/src/gtest-internal-inl.h
similarity index 100%
rename from gmock/gtest/src/gtest-internal-inl.h
rename to wpiutil/gmock/gtest/src/gtest-internal-inl.h
diff --git a/gmock/gtest/src/gtest-port.cc b/wpiutil/gmock/gtest/src/gtest-port.cc
similarity index 100%
rename from gmock/gtest/src/gtest-port.cc
rename to wpiutil/gmock/gtest/src/gtest-port.cc
diff --git a/gmock/gtest/src/gtest-printers.cc b/wpiutil/gmock/gtest/src/gtest-printers.cc
similarity index 100%
rename from gmock/gtest/src/gtest-printers.cc
rename to wpiutil/gmock/gtest/src/gtest-printers.cc
diff --git a/gmock/gtest/src/gtest-test-part.cc b/wpiutil/gmock/gtest/src/gtest-test-part.cc
similarity index 100%
rename from gmock/gtest/src/gtest-test-part.cc
rename to wpiutil/gmock/gtest/src/gtest-test-part.cc
diff --git a/gmock/gtest/src/gtest-typed-test.cc b/wpiutil/gmock/gtest/src/gtest-typed-test.cc
similarity index 100%
rename from gmock/gtest/src/gtest-typed-test.cc
rename to wpiutil/gmock/gtest/src/gtest-typed-test.cc
diff --git a/gmock/gtest/src/gtest.cc b/wpiutil/gmock/gtest/src/gtest.cc
similarity index 100%
rename from gmock/gtest/src/gtest.cc
rename to wpiutil/gmock/gtest/src/gtest.cc
diff --git a/gmock/gtest/src/gtest_main.cc b/wpiutil/gmock/gtest/src/gtest_main.cc
similarity index 100%
rename from gmock/gtest/src/gtest_main.cc
rename to wpiutil/gmock/gtest/src/gtest_main.cc
diff --git a/gmock/include/gmock/gmock-actions.h b/wpiutil/gmock/include/gmock/gmock-actions.h
similarity index 100%
rename from gmock/include/gmock/gmock-actions.h
rename to wpiutil/gmock/include/gmock/gmock-actions.h
diff --git a/gmock/include/gmock/gmock-cardinalities.h b/wpiutil/gmock/include/gmock/gmock-cardinalities.h
similarity index 100%
rename from gmock/include/gmock/gmock-cardinalities.h
rename to wpiutil/gmock/include/gmock/gmock-cardinalities.h
diff --git a/gmock/include/gmock/gmock-generated-actions.h b/wpiutil/gmock/include/gmock/gmock-generated-actions.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-actions.h
rename to wpiutil/gmock/include/gmock/gmock-generated-actions.h
diff --git a/gmock/include/gmock/gmock-generated-actions.h.pump b/wpiutil/gmock/include/gmock/gmock-generated-actions.h.pump
similarity index 100%
rename from gmock/include/gmock/gmock-generated-actions.h.pump
rename to wpiutil/gmock/include/gmock/gmock-generated-actions.h.pump
diff --git a/gmock/include/gmock/gmock-generated-function-mockers.h b/wpiutil/gmock/include/gmock/gmock-generated-function-mockers.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-function-mockers.h
rename to wpiutil/gmock/include/gmock/gmock-generated-function-mockers.h
diff --git a/gmock/include/gmock/gmock-generated-function-mockers.h.pump b/wpiutil/gmock/include/gmock/gmock-generated-function-mockers.h.pump
similarity index 100%
rename from gmock/include/gmock/gmock-generated-function-mockers.h.pump
rename to wpiutil/gmock/include/gmock/gmock-generated-function-mockers.h.pump
diff --git a/gmock/include/gmock/gmock-generated-matchers.h b/wpiutil/gmock/include/gmock/gmock-generated-matchers.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-matchers.h
rename to wpiutil/gmock/include/gmock/gmock-generated-matchers.h
diff --git a/gmock/include/gmock/gmock-generated-matchers.h.pump b/wpiutil/gmock/include/gmock/gmock-generated-matchers.h.pump
similarity index 100%
rename from gmock/include/gmock/gmock-generated-matchers.h.pump
rename to wpiutil/gmock/include/gmock/gmock-generated-matchers.h.pump
diff --git a/gmock/include/gmock/gmock-generated-nice-strict.h b/wpiutil/gmock/include/gmock/gmock-generated-nice-strict.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-nice-strict.h
rename to wpiutil/gmock/include/gmock/gmock-generated-nice-strict.h
diff --git a/gmock/include/gmock/gmock-generated-nice-strict.h.pump b/wpiutil/gmock/include/gmock/gmock-generated-nice-strict.h.pump
similarity index 100%
rename from gmock/include/gmock/gmock-generated-nice-strict.h.pump
rename to wpiutil/gmock/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/gmock/include/gmock/gmock-matchers.h b/wpiutil/gmock/include/gmock/gmock-matchers.h
similarity index 100%
rename from gmock/include/gmock/gmock-matchers.h
rename to wpiutil/gmock/include/gmock/gmock-matchers.h
diff --git a/gmock/include/gmock/gmock-more-actions.h b/wpiutil/gmock/include/gmock/gmock-more-actions.h
similarity index 100%
rename from gmock/include/gmock/gmock-more-actions.h
rename to wpiutil/gmock/include/gmock/gmock-more-actions.h
diff --git a/gmock/include/gmock/gmock-more-matchers.h b/wpiutil/gmock/include/gmock/gmock-more-matchers.h
similarity index 100%
rename from gmock/include/gmock/gmock-more-matchers.h
rename to wpiutil/gmock/include/gmock/gmock-more-matchers.h
diff --git a/gmock/include/gmock/gmock-spec-builders.h b/wpiutil/gmock/include/gmock/gmock-spec-builders.h
similarity index 100%
rename from gmock/include/gmock/gmock-spec-builders.h
rename to wpiutil/gmock/include/gmock/gmock-spec-builders.h
diff --git a/gmock/include/gmock/gmock.h b/wpiutil/gmock/include/gmock/gmock.h
similarity index 100%
rename from gmock/include/gmock/gmock.h
rename to wpiutil/gmock/include/gmock/gmock.h
diff --git a/gmock/include/gmock/internal/custom/gmock-generated-actions.h b/wpiutil/gmock/include/gmock/internal/custom/gmock-generated-actions.h
similarity index 100%
rename from gmock/include/gmock/internal/custom/gmock-generated-actions.h
rename to wpiutil/gmock/include/gmock/internal/custom/gmock-generated-actions.h
diff --git a/gmock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/wpiutil/gmock/include/gmock/internal/custom/gmock-generated-actions.h.pump
similarity index 100%
rename from gmock/include/gmock/internal/custom/gmock-generated-actions.h.pump
rename to wpiutil/gmock/include/gmock/internal/custom/gmock-generated-actions.h.pump
diff --git a/gmock/include/gmock/internal/custom/gmock-matchers.h b/wpiutil/gmock/include/gmock/internal/custom/gmock-matchers.h
similarity index 100%
rename from gmock/include/gmock/internal/custom/gmock-matchers.h
rename to wpiutil/gmock/include/gmock/internal/custom/gmock-matchers.h
diff --git a/gmock/include/gmock/internal/custom/gmock-port.h b/wpiutil/gmock/include/gmock/internal/custom/gmock-port.h
similarity index 100%
rename from gmock/include/gmock/internal/custom/gmock-port.h
rename to wpiutil/gmock/include/gmock/internal/custom/gmock-port.h
diff --git a/gmock/include/gmock/internal/gmock-generated-internal-utils.h b/wpiutil/gmock/include/gmock/internal/gmock-generated-internal-utils.h
similarity index 100%
rename from gmock/include/gmock/internal/gmock-generated-internal-utils.h
rename to wpiutil/gmock/include/gmock/internal/gmock-generated-internal-utils.h
diff --git a/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/wpiutil/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
similarity index 100%
rename from gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
rename to wpiutil/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
diff --git a/gmock/include/gmock/internal/gmock-internal-utils.h b/wpiutil/gmock/include/gmock/internal/gmock-internal-utils.h
similarity index 100%
rename from gmock/include/gmock/internal/gmock-internal-utils.h
rename to wpiutil/gmock/include/gmock/internal/gmock-internal-utils.h
diff --git a/gmock/include/gmock/internal/gmock-port.h b/wpiutil/gmock/include/gmock/internal/gmock-port.h
similarity index 100%
rename from gmock/include/gmock/internal/gmock-port.h
rename to wpiutil/gmock/include/gmock/internal/gmock-port.h
diff --git a/gmock/src/gmock-all.cc b/wpiutil/gmock/src/gmock-all.cc
similarity index 100%
rename from gmock/src/gmock-all.cc
rename to wpiutil/gmock/src/gmock-all.cc
diff --git a/gmock/src/gmock-cardinalities.cc b/wpiutil/gmock/src/gmock-cardinalities.cc
similarity index 100%
rename from gmock/src/gmock-cardinalities.cc
rename to wpiutil/gmock/src/gmock-cardinalities.cc
diff --git a/gmock/src/gmock-internal-utils.cc b/wpiutil/gmock/src/gmock-internal-utils.cc
similarity index 100%
rename from gmock/src/gmock-internal-utils.cc
rename to wpiutil/gmock/src/gmock-internal-utils.cc
diff --git a/gmock/src/gmock-matchers.cc b/wpiutil/gmock/src/gmock-matchers.cc
similarity index 100%
rename from gmock/src/gmock-matchers.cc
rename to wpiutil/gmock/src/gmock-matchers.cc
diff --git a/gmock/src/gmock-spec-builders.cc b/wpiutil/gmock/src/gmock-spec-builders.cc
similarity index 100%
rename from gmock/src/gmock-spec-builders.cc
rename to wpiutil/gmock/src/gmock-spec-builders.cc
diff --git a/gmock/src/gmock.cc b/wpiutil/gmock/src/gmock.cc
similarity index 100%
rename from gmock/src/gmock.cc
rename to wpiutil/gmock/src/gmock.cc
diff --git a/gmock/src/gmock_main.cc b/wpiutil/gmock/src/gmock_main.cc
similarity index 100%
rename from gmock/src/gmock_main.cc
rename to wpiutil/gmock/src/gmock_main.cc
diff --git a/license.txt b/wpiutil/license.txt
similarity index 100%
rename from license.txt
rename to wpiutil/license.txt
diff --git a/publish.gradle b/wpiutil/publish.gradle
similarity index 100%
rename from publish.gradle
rename to wpiutil/publish.gradle
diff --git a/readme.md b/wpiutil/readme.md
similarity index 100%
rename from readme.md
rename to wpiutil/readme.md
diff --git a/settings.gradle b/wpiutil/settings.gradle
similarity index 100%
rename from settings.gradle
rename to wpiutil/settings.gradle
diff --git a/src/dev/java/edu/wpi/first/wpiutil/DevMain.java b/wpiutil/src/dev/java/edu/wpi/first/wpiutil/DevMain.java
similarity index 100%
rename from src/dev/java/edu/wpi/first/wpiutil/DevMain.java
rename to wpiutil/src/dev/java/edu/wpi/first/wpiutil/DevMain.java
diff --git a/src/dev/native/cpp/main.cpp b/wpiutil/src/dev/native/cpp/main.cpp
similarity index 100%
rename from src/dev/native/cpp/main.cpp
rename to wpiutil/src/dev/native/cpp/main.cpp
diff --git a/src/main/java/edu/wpi/first/wpiutil/RuntimeDetector.java b/wpiutil/src/main/java/edu/wpi/first/wpiutil/RuntimeDetector.java
similarity index 100%
rename from src/main/java/edu/wpi/first/wpiutil/RuntimeDetector.java
rename to wpiutil/src/main/java/edu/wpi/first/wpiutil/RuntimeDetector.java
diff --git a/src/main/native/cpp/llvm/ConvertUTF.cpp b/wpiutil/src/main/native/cpp/llvm/ConvertUTF.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/ConvertUTF.cpp
rename to wpiutil/src/main/native/cpp/llvm/ConvertUTF.cpp
diff --git a/src/main/native/cpp/llvm/ConvertUTFWrapper.cpp b/wpiutil/src/main/native/cpp/llvm/ConvertUTFWrapper.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/ConvertUTFWrapper.cpp
rename to wpiutil/src/main/native/cpp/llvm/ConvertUTFWrapper.cpp
diff --git a/src/main/native/cpp/llvm/ErrorHandling.cpp b/wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/ErrorHandling.cpp
rename to wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp
diff --git a/src/main/native/cpp/llvm/Hashing.cpp b/wpiutil/src/main/native/cpp/llvm/Hashing.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/Hashing.cpp
rename to wpiutil/src/main/native/cpp/llvm/Hashing.cpp
diff --git a/src/main/native/cpp/llvm/Path.cpp b/wpiutil/src/main/native/cpp/llvm/Path.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/Path.cpp
rename to wpiutil/src/main/native/cpp/llvm/Path.cpp
diff --git a/src/main/native/cpp/llvm/SmallPtrSet.cpp b/wpiutil/src/main/native/cpp/llvm/SmallPtrSet.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/SmallPtrSet.cpp
rename to wpiutil/src/main/native/cpp/llvm/SmallPtrSet.cpp
diff --git a/src/main/native/cpp/llvm/SmallVector.cpp b/wpiutil/src/main/native/cpp/llvm/SmallVector.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/SmallVector.cpp
rename to wpiutil/src/main/native/cpp/llvm/SmallVector.cpp
diff --git a/src/main/native/cpp/llvm/StringExtras.cpp b/wpiutil/src/main/native/cpp/llvm/StringExtras.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/StringExtras.cpp
rename to wpiutil/src/main/native/cpp/llvm/StringExtras.cpp
diff --git a/src/main/native/cpp/llvm/StringMap.cpp b/wpiutil/src/main/native/cpp/llvm/StringMap.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/StringMap.cpp
rename to wpiutil/src/main/native/cpp/llvm/StringMap.cpp
diff --git a/src/main/native/cpp/llvm/StringRef.cpp b/wpiutil/src/main/native/cpp/llvm/StringRef.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/StringRef.cpp
rename to wpiutil/src/main/native/cpp/llvm/StringRef.cpp
diff --git a/src/main/native/cpp/llvm/Twine.cpp b/wpiutil/src/main/native/cpp/llvm/Twine.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/Twine.cpp
rename to wpiutil/src/main/native/cpp/llvm/Twine.cpp
diff --git a/src/main/native/cpp/llvm/Unix/Path.inc b/wpiutil/src/main/native/cpp/llvm/Unix/Path.inc
similarity index 100%
rename from src/main/native/cpp/llvm/Unix/Path.inc
rename to wpiutil/src/main/native/cpp/llvm/Unix/Path.inc
diff --git a/src/main/native/cpp/llvm/Windows/Path.inc b/wpiutil/src/main/native/cpp/llvm/Windows/Path.inc
similarity index 100%
rename from src/main/native/cpp/llvm/Windows/Path.inc
rename to wpiutil/src/main/native/cpp/llvm/Windows/Path.inc
diff --git a/src/main/native/cpp/llvm/Windows/WindowsSupport.h b/wpiutil/src/main/native/cpp/llvm/Windows/WindowsSupport.h
similarity index 100%
rename from src/main/native/cpp/llvm/Windows/WindowsSupport.h
rename to wpiutil/src/main/native/cpp/llvm/Windows/WindowsSupport.h
diff --git a/src/main/native/cpp/llvm/raw_os_ostream.cpp b/wpiutil/src/main/native/cpp/llvm/raw_os_ostream.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/raw_os_ostream.cpp
rename to wpiutil/src/main/native/cpp/llvm/raw_os_ostream.cpp
diff --git a/src/main/native/cpp/llvm/raw_ostream.cpp b/wpiutil/src/main/native/cpp/llvm/raw_ostream.cpp
similarity index 100%
rename from src/main/native/cpp/llvm/raw_ostream.cpp
rename to wpiutil/src/main/native/cpp/llvm/raw_ostream.cpp
diff --git a/src/main/native/cpp/support/Base64.cpp b/wpiutil/src/main/native/cpp/support/Base64.cpp
similarity index 100%
rename from src/main/native/cpp/support/Base64.cpp
rename to wpiutil/src/main/native/cpp/support/Base64.cpp
diff --git a/src/main/native/cpp/support/HttpUtil.cpp b/wpiutil/src/main/native/cpp/support/HttpUtil.cpp
similarity index 100%
rename from src/main/native/cpp/support/HttpUtil.cpp
rename to wpiutil/src/main/native/cpp/support/HttpUtil.cpp
diff --git a/src/main/native/cpp/support/hostname.cpp b/wpiutil/src/main/native/cpp/support/hostname.cpp
similarity index 100%
rename from src/main/native/cpp/support/hostname.cpp
rename to wpiutil/src/main/native/cpp/support/hostname.cpp
diff --git a/src/main/native/cpp/support/json.cpp b/wpiutil/src/main/native/cpp/support/json.cpp
similarity index 100%
rename from src/main/native/cpp/support/json.cpp
rename to wpiutil/src/main/native/cpp/support/json.cpp
diff --git a/src/main/native/cpp/support/json_binary_reader.cpp b/wpiutil/src/main/native/cpp/support/json_binary_reader.cpp
similarity index 100%
rename from src/main/native/cpp/support/json_binary_reader.cpp
rename to wpiutil/src/main/native/cpp/support/json_binary_reader.cpp
diff --git a/src/main/native/cpp/support/json_binary_writer.cpp b/wpiutil/src/main/native/cpp/support/json_binary_writer.cpp
similarity index 100%
rename from src/main/native/cpp/support/json_binary_writer.cpp
rename to wpiutil/src/main/native/cpp/support/json_binary_writer.cpp
diff --git a/src/main/native/cpp/support/json_parser.cpp b/wpiutil/src/main/native/cpp/support/json_parser.cpp
similarity index 100%
rename from src/main/native/cpp/support/json_parser.cpp
rename to wpiutil/src/main/native/cpp/support/json_parser.cpp
diff --git a/src/main/native/cpp/support/json_pointer.cpp b/wpiutil/src/main/native/cpp/support/json_pointer.cpp
similarity index 100%
rename from src/main/native/cpp/support/json_pointer.cpp
rename to wpiutil/src/main/native/cpp/support/json_pointer.cpp
diff --git a/src/main/native/cpp/support/json_serializer.cpp b/wpiutil/src/main/native/cpp/support/json_serializer.cpp
similarity index 100%
rename from src/main/native/cpp/support/json_serializer.cpp
rename to wpiutil/src/main/native/cpp/support/json_serializer.cpp
diff --git a/src/main/native/cpp/support/json_serializer.h b/wpiutil/src/main/native/cpp/support/json_serializer.h
similarity index 100%
rename from src/main/native/cpp/support/json_serializer.h
rename to wpiutil/src/main/native/cpp/support/json_serializer.h
diff --git a/src/main/native/cpp/support/leb128.cpp b/wpiutil/src/main/native/cpp/support/leb128.cpp
similarity index 100%
rename from src/main/native/cpp/support/leb128.cpp
rename to wpiutil/src/main/native/cpp/support/leb128.cpp
diff --git a/src/main/native/cpp/support/raw_istream.cpp b/wpiutil/src/main/native/cpp/support/raw_istream.cpp
similarity index 100%
rename from src/main/native/cpp/support/raw_istream.cpp
rename to wpiutil/src/main/native/cpp/support/raw_istream.cpp
diff --git a/src/main/native/cpp/support/raw_socket_istream.cpp b/wpiutil/src/main/native/cpp/support/raw_socket_istream.cpp
similarity index 100%
rename from src/main/native/cpp/support/raw_socket_istream.cpp
rename to wpiutil/src/main/native/cpp/support/raw_socket_istream.cpp
diff --git a/src/main/native/cpp/support/raw_socket_ostream.cpp b/wpiutil/src/main/native/cpp/support/raw_socket_ostream.cpp
similarity index 100%
rename from src/main/native/cpp/support/raw_socket_ostream.cpp
rename to wpiutil/src/main/native/cpp/support/raw_socket_ostream.cpp
diff --git a/src/main/native/cpp/support/sha1.cpp b/wpiutil/src/main/native/cpp/support/sha1.cpp
similarity index 100%
rename from src/main/native/cpp/support/sha1.cpp
rename to wpiutil/src/main/native/cpp/support/sha1.cpp
diff --git a/src/main/native/cpp/support/timestamp.cpp b/wpiutil/src/main/native/cpp/support/timestamp.cpp
similarity index 100%
rename from src/main/native/cpp/support/timestamp.cpp
rename to wpiutil/src/main/native/cpp/support/timestamp.cpp
diff --git a/src/main/native/cpp/tcpsockets/SocketError.cpp b/wpiutil/src/main/native/cpp/tcpsockets/SocketError.cpp
similarity index 100%
rename from src/main/native/cpp/tcpsockets/SocketError.cpp
rename to wpiutil/src/main/native/cpp/tcpsockets/SocketError.cpp
diff --git a/src/main/native/cpp/tcpsockets/TCPAcceptor.cpp b/wpiutil/src/main/native/cpp/tcpsockets/TCPAcceptor.cpp
similarity index 100%
rename from src/main/native/cpp/tcpsockets/TCPAcceptor.cpp
rename to wpiutil/src/main/native/cpp/tcpsockets/TCPAcceptor.cpp
diff --git a/src/main/native/cpp/tcpsockets/TCPConnector.cpp b/wpiutil/src/main/native/cpp/tcpsockets/TCPConnector.cpp
similarity index 100%
rename from src/main/native/cpp/tcpsockets/TCPConnector.cpp
rename to wpiutil/src/main/native/cpp/tcpsockets/TCPConnector.cpp
diff --git a/src/main/native/cpp/tcpsockets/TCPConnector_parallel.cpp b/wpiutil/src/main/native/cpp/tcpsockets/TCPConnector_parallel.cpp
similarity index 100%
rename from src/main/native/cpp/tcpsockets/TCPConnector_parallel.cpp
rename to wpiutil/src/main/native/cpp/tcpsockets/TCPConnector_parallel.cpp
diff --git a/src/main/native/cpp/tcpsockets/TCPStream.cpp b/wpiutil/src/main/native/cpp/tcpsockets/TCPStream.cpp
similarity index 100%
rename from src/main/native/cpp/tcpsockets/TCPStream.cpp
rename to wpiutil/src/main/native/cpp/tcpsockets/TCPStream.cpp
diff --git a/src/main/native/cpp/udpsockets/UDPClient.cpp b/wpiutil/src/main/native/cpp/udpsockets/UDPClient.cpp
similarity index 100%
rename from src/main/native/cpp/udpsockets/UDPClient.cpp
rename to wpiutil/src/main/native/cpp/udpsockets/UDPClient.cpp
diff --git a/src/main/native/include/llvm/AlignOf.h b/wpiutil/src/main/native/include/llvm/AlignOf.h
similarity index 100%
rename from src/main/native/include/llvm/AlignOf.h
rename to wpiutil/src/main/native/include/llvm/AlignOf.h
diff --git a/src/main/native/include/llvm/ArrayRef.h b/wpiutil/src/main/native/include/llvm/ArrayRef.h
similarity index 100%
rename from src/main/native/include/llvm/ArrayRef.h
rename to wpiutil/src/main/native/include/llvm/ArrayRef.h
diff --git a/src/main/native/include/llvm/Compiler.h b/wpiutil/src/main/native/include/llvm/Compiler.h
similarity index 100%
rename from src/main/native/include/llvm/Compiler.h
rename to wpiutil/src/main/native/include/llvm/Compiler.h
diff --git a/src/main/native/include/llvm/ConvertUTF.h b/wpiutil/src/main/native/include/llvm/ConvertUTF.h
similarity index 100%
rename from src/main/native/include/llvm/ConvertUTF.h
rename to wpiutil/src/main/native/include/llvm/ConvertUTF.h
diff --git a/src/main/native/include/llvm/DenseMap.h b/wpiutil/src/main/native/include/llvm/DenseMap.h
similarity index 100%
rename from src/main/native/include/llvm/DenseMap.h
rename to wpiutil/src/main/native/include/llvm/DenseMap.h
diff --git a/src/main/native/include/llvm/DenseMapInfo.h b/wpiutil/src/main/native/include/llvm/DenseMapInfo.h
similarity index 100%
rename from src/main/native/include/llvm/DenseMapInfo.h
rename to wpiutil/src/main/native/include/llvm/DenseMapInfo.h
diff --git a/src/main/native/include/llvm/EpochTracker.h b/wpiutil/src/main/native/include/llvm/EpochTracker.h
similarity index 100%
rename from src/main/native/include/llvm/EpochTracker.h
rename to wpiutil/src/main/native/include/llvm/EpochTracker.h
diff --git a/src/main/native/include/llvm/FileSystem.h b/wpiutil/src/main/native/include/llvm/FileSystem.h
similarity index 100%
rename from src/main/native/include/llvm/FileSystem.h
rename to wpiutil/src/main/native/include/llvm/FileSystem.h
diff --git a/src/main/native/include/llvm/Format.h b/wpiutil/src/main/native/include/llvm/Format.h
similarity index 100%
rename from src/main/native/include/llvm/Format.h
rename to wpiutil/src/main/native/include/llvm/Format.h
diff --git a/src/main/native/include/llvm/Hashing.h b/wpiutil/src/main/native/include/llvm/Hashing.h
similarity index 100%
rename from src/main/native/include/llvm/Hashing.h
rename to wpiutil/src/main/native/include/llvm/Hashing.h
diff --git a/src/main/native/include/llvm/IntrusiveRefCntPtr.h b/wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h
similarity index 100%
rename from src/main/native/include/llvm/IntrusiveRefCntPtr.h
rename to wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h
diff --git a/src/main/native/include/llvm/MathExtras.h b/wpiutil/src/main/native/include/llvm/MathExtras.h
similarity index 100%
rename from src/main/native/include/llvm/MathExtras.h
rename to wpiutil/src/main/native/include/llvm/MathExtras.h
diff --git a/src/main/native/include/llvm/None.h b/wpiutil/src/main/native/include/llvm/None.h
similarity index 100%
rename from src/main/native/include/llvm/None.h
rename to wpiutil/src/main/native/include/llvm/None.h
diff --git a/src/main/native/include/llvm/Optional.h b/wpiutil/src/main/native/include/llvm/Optional.h
similarity index 100%
rename from src/main/native/include/llvm/Optional.h
rename to wpiutil/src/main/native/include/llvm/Optional.h
diff --git a/src/main/native/include/llvm/Path.h b/wpiutil/src/main/native/include/llvm/Path.h
similarity index 100%
rename from src/main/native/include/llvm/Path.h
rename to wpiutil/src/main/native/include/llvm/Path.h
diff --git a/src/main/native/include/llvm/PointerLikeTypeTraits.h b/wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h
similarity index 100%
rename from src/main/native/include/llvm/PointerLikeTypeTraits.h
rename to wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h
diff --git a/src/main/native/include/llvm/STLExtras.h b/wpiutil/src/main/native/include/llvm/STLExtras.h
similarity index 100%
rename from src/main/native/include/llvm/STLExtras.h
rename to wpiutil/src/main/native/include/llvm/STLExtras.h
diff --git a/src/main/native/include/llvm/SmallPtrSet.h b/wpiutil/src/main/native/include/llvm/SmallPtrSet.h
similarity index 100%
rename from src/main/native/include/llvm/SmallPtrSet.h
rename to wpiutil/src/main/native/include/llvm/SmallPtrSet.h
diff --git a/src/main/native/include/llvm/SmallSet.h b/wpiutil/src/main/native/include/llvm/SmallSet.h
similarity index 100%
rename from src/main/native/include/llvm/SmallSet.h
rename to wpiutil/src/main/native/include/llvm/SmallSet.h
diff --git a/src/main/native/include/llvm/SmallString.h b/wpiutil/src/main/native/include/llvm/SmallString.h
similarity index 100%
rename from src/main/native/include/llvm/SmallString.h
rename to wpiutil/src/main/native/include/llvm/SmallString.h
diff --git a/src/main/native/include/llvm/SmallVector.h b/wpiutil/src/main/native/include/llvm/SmallVector.h
similarity index 100%
rename from src/main/native/include/llvm/SmallVector.h
rename to wpiutil/src/main/native/include/llvm/SmallVector.h
diff --git a/src/main/native/include/llvm/StringExtras.h b/wpiutil/src/main/native/include/llvm/StringExtras.h
similarity index 100%
rename from src/main/native/include/llvm/StringExtras.h
rename to wpiutil/src/main/native/include/llvm/StringExtras.h
diff --git a/src/main/native/include/llvm/StringMap.h b/wpiutil/src/main/native/include/llvm/StringMap.h
similarity index 100%
rename from src/main/native/include/llvm/StringMap.h
rename to wpiutil/src/main/native/include/llvm/StringMap.h
diff --git a/src/main/native/include/llvm/StringRef.h b/wpiutil/src/main/native/include/llvm/StringRef.h
similarity index 100%
rename from src/main/native/include/llvm/StringRef.h
rename to wpiutil/src/main/native/include/llvm/StringRef.h
diff --git a/src/main/native/include/llvm/Twine.h b/wpiutil/src/main/native/include/llvm/Twine.h
similarity index 100%
rename from src/main/native/include/llvm/Twine.h
rename to wpiutil/src/main/native/include/llvm/Twine.h
diff --git a/src/main/native/include/llvm/WindowsError.h b/wpiutil/src/main/native/include/llvm/WindowsError.h
similarity index 100%
rename from src/main/native/include/llvm/WindowsError.h
rename to wpiutil/src/main/native/include/llvm/WindowsError.h
diff --git a/src/main/native/include/llvm/iterator_range.h b/wpiutil/src/main/native/include/llvm/iterator_range.h
similarity index 100%
rename from src/main/native/include/llvm/iterator_range.h
rename to wpiutil/src/main/native/include/llvm/iterator_range.h
diff --git a/src/main/native/include/llvm/raw_os_ostream.h b/wpiutil/src/main/native/include/llvm/raw_os_ostream.h
similarity index 100%
rename from src/main/native/include/llvm/raw_os_ostream.h
rename to wpiutil/src/main/native/include/llvm/raw_os_ostream.h
diff --git a/src/main/native/include/llvm/raw_ostream.h b/wpiutil/src/main/native/include/llvm/raw_ostream.h
similarity index 100%
rename from src/main/native/include/llvm/raw_ostream.h
rename to wpiutil/src/main/native/include/llvm/raw_ostream.h
diff --git a/src/main/native/include/llvm/type_traits.h b/wpiutil/src/main/native/include/llvm/type_traits.h
similarity index 100%
rename from src/main/native/include/llvm/type_traits.h
rename to wpiutil/src/main/native/include/llvm/type_traits.h
diff --git a/src/main/native/include/support/Base64.h b/wpiutil/src/main/native/include/support/Base64.h
similarity index 100%
rename from src/main/native/include/support/Base64.h
rename to wpiutil/src/main/native/include/support/Base64.h
diff --git a/src/main/native/include/support/ConcurrentQueue.h b/wpiutil/src/main/native/include/support/ConcurrentQueue.h
similarity index 100%
rename from src/main/native/include/support/ConcurrentQueue.h
rename to wpiutil/src/main/native/include/support/ConcurrentQueue.h
diff --git a/src/main/native/include/support/HttpUtil.h b/wpiutil/src/main/native/include/support/HttpUtil.h
similarity index 100%
rename from src/main/native/include/support/HttpUtil.h
rename to wpiutil/src/main/native/include/support/HttpUtil.h
diff --git a/src/main/native/include/support/HttpUtil.inl b/wpiutil/src/main/native/include/support/HttpUtil.inl
similarity index 100%
rename from src/main/native/include/support/HttpUtil.inl
rename to wpiutil/src/main/native/include/support/HttpUtil.inl
diff --git a/src/main/native/include/support/Logger.h b/wpiutil/src/main/native/include/support/Logger.h
similarity index 100%
rename from src/main/native/include/support/Logger.h
rename to wpiutil/src/main/native/include/support/Logger.h
diff --git a/src/main/native/include/support/SafeThread.h b/wpiutil/src/main/native/include/support/SafeThread.h
similarity index 100%
rename from src/main/native/include/support/SafeThread.h
rename to wpiutil/src/main/native/include/support/SafeThread.h
diff --git a/src/main/native/include/support/UidVector.h b/wpiutil/src/main/native/include/support/UidVector.h
similarity index 100%
rename from src/main/native/include/support/UidVector.h
rename to wpiutil/src/main/native/include/support/UidVector.h
diff --git a/src/main/native/include/support/atomic_static.h b/wpiutil/src/main/native/include/support/atomic_static.h
similarity index 100%
rename from src/main/native/include/support/atomic_static.h
rename to wpiutil/src/main/native/include/support/atomic_static.h
diff --git a/src/main/native/include/support/condition_variable.h b/wpiutil/src/main/native/include/support/condition_variable.h
similarity index 100%
rename from src/main/native/include/support/condition_variable.h
rename to wpiutil/src/main/native/include/support/condition_variable.h
diff --git a/src/main/native/include/support/deprecated.h b/wpiutil/src/main/native/include/support/deprecated.h
similarity index 100%
rename from src/main/native/include/support/deprecated.h
rename to wpiutil/src/main/native/include/support/deprecated.h
diff --git a/src/main/native/include/support/hostname.h b/wpiutil/src/main/native/include/support/hostname.h
similarity index 100%
rename from src/main/native/include/support/hostname.h
rename to wpiutil/src/main/native/include/support/hostname.h
diff --git a/src/main/native/include/support/jni_util.h b/wpiutil/src/main/native/include/support/jni_util.h
similarity index 100%
rename from src/main/native/include/support/jni_util.h
rename to wpiutil/src/main/native/include/support/jni_util.h
diff --git a/src/main/native/include/support/json.h b/wpiutil/src/main/native/include/support/json.h
similarity index 100%
rename from src/main/native/include/support/json.h
rename to wpiutil/src/main/native/include/support/json.h
diff --git a/src/main/native/include/support/leb128.h b/wpiutil/src/main/native/include/support/leb128.h
similarity index 100%
rename from src/main/native/include/support/leb128.h
rename to wpiutil/src/main/native/include/support/leb128.h
diff --git a/src/main/native/include/support/mutex.h b/wpiutil/src/main/native/include/support/mutex.h
similarity index 100%
rename from src/main/native/include/support/mutex.h
rename to wpiutil/src/main/native/include/support/mutex.h
diff --git a/src/main/native/include/support/priority_condition_variable.h b/wpiutil/src/main/native/include/support/priority_condition_variable.h
similarity index 100%
rename from src/main/native/include/support/priority_condition_variable.h
rename to wpiutil/src/main/native/include/support/priority_condition_variable.h
diff --git a/src/main/native/include/support/priority_mutex.h b/wpiutil/src/main/native/include/support/priority_mutex.h
similarity index 100%
rename from src/main/native/include/support/priority_mutex.h
rename to wpiutil/src/main/native/include/support/priority_mutex.h
diff --git a/src/main/native/include/support/raw_istream.h b/wpiutil/src/main/native/include/support/raw_istream.h
similarity index 100%
rename from src/main/native/include/support/raw_istream.h
rename to wpiutil/src/main/native/include/support/raw_istream.h
diff --git a/src/main/native/include/support/raw_socket_istream.h b/wpiutil/src/main/native/include/support/raw_socket_istream.h
similarity index 100%
rename from src/main/native/include/support/raw_socket_istream.h
rename to wpiutil/src/main/native/include/support/raw_socket_istream.h
diff --git a/src/main/native/include/support/raw_socket_ostream.h b/wpiutil/src/main/native/include/support/raw_socket_ostream.h
similarity index 100%
rename from src/main/native/include/support/raw_socket_ostream.h
rename to wpiutil/src/main/native/include/support/raw_socket_ostream.h
diff --git a/src/main/native/include/support/sha1.h b/wpiutil/src/main/native/include/support/sha1.h
similarity index 100%
rename from src/main/native/include/support/sha1.h
rename to wpiutil/src/main/native/include/support/sha1.h
diff --git a/src/main/native/include/support/timestamp.h b/wpiutil/src/main/native/include/support/timestamp.h
similarity index 100%
rename from src/main/native/include/support/timestamp.h
rename to wpiutil/src/main/native/include/support/timestamp.h
diff --git a/src/main/native/include/tcpsockets/NetworkAcceptor.h b/wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h
similarity index 100%
rename from src/main/native/include/tcpsockets/NetworkAcceptor.h
rename to wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h
diff --git a/src/main/native/include/tcpsockets/NetworkStream.h b/wpiutil/src/main/native/include/tcpsockets/NetworkStream.h
similarity index 100%
rename from src/main/native/include/tcpsockets/NetworkStream.h
rename to wpiutil/src/main/native/include/tcpsockets/NetworkStream.h
diff --git a/src/main/native/include/tcpsockets/SocketError.h b/wpiutil/src/main/native/include/tcpsockets/SocketError.h
similarity index 100%
rename from src/main/native/include/tcpsockets/SocketError.h
rename to wpiutil/src/main/native/include/tcpsockets/SocketError.h
diff --git a/src/main/native/include/tcpsockets/TCPAcceptor.h b/wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h
similarity index 100%
rename from src/main/native/include/tcpsockets/TCPAcceptor.h
rename to wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h
diff --git a/src/main/native/include/tcpsockets/TCPConnector.h b/wpiutil/src/main/native/include/tcpsockets/TCPConnector.h
similarity index 100%
rename from src/main/native/include/tcpsockets/TCPConnector.h
rename to wpiutil/src/main/native/include/tcpsockets/TCPConnector.h
diff --git a/src/main/native/include/tcpsockets/TCPStream.h b/wpiutil/src/main/native/include/tcpsockets/TCPStream.h
similarity index 100%
rename from src/main/native/include/tcpsockets/TCPStream.h
rename to wpiutil/src/main/native/include/tcpsockets/TCPStream.h
diff --git a/src/main/native/include/udpsockets/UDPClient.h b/wpiutil/src/main/native/include/udpsockets/UDPClient.h
similarity index 100%
rename from src/main/native/include/udpsockets/UDPClient.h
rename to wpiutil/src/main/native/include/udpsockets/UDPClient.h
diff --git a/src/test/native/cpp/Base64Test.cpp b/wpiutil/src/test/native/cpp/Base64Test.cpp
similarity index 100%
rename from src/test/native/cpp/Base64Test.cpp
rename to wpiutil/src/test/native/cpp/Base64Test.cpp
diff --git a/src/test/native/cpp/hostname.cpp b/wpiutil/src/test/native/cpp/hostname.cpp
similarity index 100%
rename from src/test/native/cpp/hostname.cpp
rename to wpiutil/src/test/native/cpp/hostname.cpp
diff --git a/src/test/native/cpp/json/unit-algorithms.cpp b/wpiutil/src/test/native/cpp/json/unit-algorithms.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-algorithms.cpp
rename to wpiutil/src/test/native/cpp/json/unit-algorithms.cpp
diff --git a/src/test/native/cpp/json/unit-capacity.cpp b/wpiutil/src/test/native/cpp/json/unit-capacity.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-capacity.cpp
rename to wpiutil/src/test/native/cpp/json/unit-capacity.cpp
diff --git a/src/test/native/cpp/json/unit-cbor.cpp b/wpiutil/src/test/native/cpp/json/unit-cbor.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-cbor.cpp
rename to wpiutil/src/test/native/cpp/json/unit-cbor.cpp
diff --git a/src/test/native/cpp/json/unit-comparison.cpp b/wpiutil/src/test/native/cpp/json/unit-comparison.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-comparison.cpp
rename to wpiutil/src/test/native/cpp/json/unit-comparison.cpp
diff --git a/src/test/native/cpp/json/unit-concepts.cpp b/wpiutil/src/test/native/cpp/json/unit-concepts.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-concepts.cpp
rename to wpiutil/src/test/native/cpp/json/unit-concepts.cpp
diff --git a/src/test/native/cpp/json/unit-constructor1.cpp b/wpiutil/src/test/native/cpp/json/unit-constructor1.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-constructor1.cpp
rename to wpiutil/src/test/native/cpp/json/unit-constructor1.cpp
diff --git a/src/test/native/cpp/json/unit-constructor2.cpp b/wpiutil/src/test/native/cpp/json/unit-constructor2.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-constructor2.cpp
rename to wpiutil/src/test/native/cpp/json/unit-constructor2.cpp
diff --git a/src/test/native/cpp/json/unit-convenience.cpp b/wpiutil/src/test/native/cpp/json/unit-convenience.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-convenience.cpp
rename to wpiutil/src/test/native/cpp/json/unit-convenience.cpp
diff --git a/src/test/native/cpp/json/unit-conversions.cpp b/wpiutil/src/test/native/cpp/json/unit-conversions.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-conversions.cpp
rename to wpiutil/src/test/native/cpp/json/unit-conversions.cpp
diff --git a/src/test/native/cpp/json/unit-deserialization.cpp b/wpiutil/src/test/native/cpp/json/unit-deserialization.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-deserialization.cpp
rename to wpiutil/src/test/native/cpp/json/unit-deserialization.cpp
diff --git a/src/test/native/cpp/json/unit-element_access1.cpp b/wpiutil/src/test/native/cpp/json/unit-element_access1.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-element_access1.cpp
rename to wpiutil/src/test/native/cpp/json/unit-element_access1.cpp
diff --git a/src/test/native/cpp/json/unit-element_access2.cpp b/wpiutil/src/test/native/cpp/json/unit-element_access2.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-element_access2.cpp
rename to wpiutil/src/test/native/cpp/json/unit-element_access2.cpp
diff --git a/src/test/native/cpp/json/unit-inspection.cpp b/wpiutil/src/test/native/cpp/json/unit-inspection.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-inspection.cpp
rename to wpiutil/src/test/native/cpp/json/unit-inspection.cpp
diff --git a/src/test/native/cpp/json/unit-iterator_wrapper.cpp b/wpiutil/src/test/native/cpp/json/unit-iterator_wrapper.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-iterator_wrapper.cpp
rename to wpiutil/src/test/native/cpp/json/unit-iterator_wrapper.cpp
diff --git a/src/test/native/cpp/json/unit-iterators1.cpp b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-iterators1.cpp
rename to wpiutil/src/test/native/cpp/json/unit-iterators1.cpp
diff --git a/src/test/native/cpp/json/unit-iterators2.cpp b/wpiutil/src/test/native/cpp/json/unit-iterators2.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-iterators2.cpp
rename to wpiutil/src/test/native/cpp/json/unit-iterators2.cpp
diff --git a/src/test/native/cpp/json/unit-json.h b/wpiutil/src/test/native/cpp/json/unit-json.h
similarity index 100%
rename from src/test/native/cpp/json/unit-json.h
rename to wpiutil/src/test/native/cpp/json/unit-json.h
diff --git a/src/test/native/cpp/json/unit-json_pointer.cpp b/wpiutil/src/test/native/cpp/json/unit-json_pointer.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-json_pointer.cpp
rename to wpiutil/src/test/native/cpp/json/unit-json_pointer.cpp
diff --git a/src/test/native/cpp/json/unit-meta.cpp b/wpiutil/src/test/native/cpp/json/unit-meta.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-meta.cpp
rename to wpiutil/src/test/native/cpp/json/unit-meta.cpp
diff --git a/src/test/native/cpp/json/unit-modifiers.cpp b/wpiutil/src/test/native/cpp/json/unit-modifiers.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-modifiers.cpp
rename to wpiutil/src/test/native/cpp/json/unit-modifiers.cpp
diff --git a/src/test/native/cpp/json/unit-msgpack.cpp b/wpiutil/src/test/native/cpp/json/unit-msgpack.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-msgpack.cpp
rename to wpiutil/src/test/native/cpp/json/unit-msgpack.cpp
diff --git a/src/test/native/cpp/json/unit-pointer_access.cpp b/wpiutil/src/test/native/cpp/json/unit-pointer_access.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-pointer_access.cpp
rename to wpiutil/src/test/native/cpp/json/unit-pointer_access.cpp
diff --git a/src/test/native/cpp/json/unit-readme.cpp b/wpiutil/src/test/native/cpp/json/unit-readme.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-readme.cpp
rename to wpiutil/src/test/native/cpp/json/unit-readme.cpp
diff --git a/src/test/native/cpp/json/unit-reference_access.cpp b/wpiutil/src/test/native/cpp/json/unit-reference_access.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-reference_access.cpp
rename to wpiutil/src/test/native/cpp/json/unit-reference_access.cpp
diff --git a/src/test/native/cpp/json/unit-unicode.cpp b/wpiutil/src/test/native/cpp/json/unit-unicode.cpp
similarity index 100%
rename from src/test/native/cpp/json/unit-unicode.cpp
rename to wpiutil/src/test/native/cpp/json/unit-unicode.cpp
diff --git a/src/test/native/cpp/leb128Test.cpp b/wpiutil/src/test/native/cpp/leb128Test.cpp
similarity index 100%
rename from src/test/native/cpp/leb128Test.cpp
rename to wpiutil/src/test/native/cpp/leb128Test.cpp
diff --git a/src/test/native/cpp/main.cpp b/wpiutil/src/test/native/cpp/main.cpp
similarity index 100%
rename from src/test/native/cpp/main.cpp
rename to wpiutil/src/test/native/cpp/main.cpp
diff --git a/src/test/native/cpp/priority_condition_variable_test.cpp b/wpiutil/src/test/native/cpp/priority_condition_variable_test.cpp
similarity index 100%
rename from src/test/native/cpp/priority_condition_variable_test.cpp
rename to wpiutil/src/test/native/cpp/priority_condition_variable_test.cpp
diff --git a/src/test/native/cpp/priority_mutex_test.cpp b/wpiutil/src/test/native/cpp/priority_mutex_test.cpp
similarity index 100%
rename from src/test/native/cpp/priority_mutex_test.cpp
rename to wpiutil/src/test/native/cpp/priority_mutex_test.cpp
diff --git a/src/test/native/cpp/sha1Test.cpp b/wpiutil/src/test/native/cpp/sha1Test.cpp
similarity index 100%
rename from src/test/native/cpp/sha1Test.cpp
rename to wpiutil/src/test/native/cpp/sha1Test.cpp