diff --git a/.travis-scripts/install.sh b/.travis-scripts/install.sh
deleted file mode 100755
index ff02ce43b8..0000000000
--- a/.travis-scripts/install.sh
+++ /dev/null
@@ -1,19 +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 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
-    brew update
-    brew install python3 clang-format
-
-    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 c8fa7dbe6b..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 build -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 3992be1225..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: "{branch} {build}"
-
-image:
-- Visual Studio 2015
-
-build:
-  verbosity: detailed
-
-build_script:
-  - gradlew.bat tasks
-
-test_script:
-- cmd: >-
-    SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
-
-    gradlew.bat clean
-
-    gradlew.bat check --info
-
-    SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.8.0
-
-    gradlew.bat clean
-
-    gradlew.bat check --info
-
-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 f16d26666b..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 f9553162f1..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/ntcore/.clang-format
similarity index 100%
rename from .clang-format
rename to ntcore/.clang-format
diff --git a/.gitattributes b/ntcore/.gitattributes
similarity index 100%
rename from .gitattributes
rename to ntcore/.gitattributes
diff --git a/.gitignore b/ntcore/.gitignore
similarity index 100%
rename from .gitignore
rename to ntcore/.gitignore
diff --git a/.styleguide b/ntcore/.styleguide
similarity index 100%
rename from .styleguide
rename to ntcore/.styleguide
diff --git a/.styleguide-license b/ntcore/.styleguide-license
similarity index 100%
rename from .styleguide-license
rename to ntcore/.styleguide-license
diff --git a/CONTRIBUTING.md b/ntcore/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to ntcore/CONTRIBUTING.md
diff --git a/README.md b/ntcore/README.md
similarity index 100%
rename from README.md
rename to ntcore/README.md
diff --git a/TODO.md b/ntcore/TODO.md
similarity index 100%
rename from TODO.md
rename to ntcore/TODO.md
diff --git a/build.gradle b/ntcore/build.gradle
similarity index 100%
rename from build.gradle
rename to ntcore/build.gradle
diff --git a/config.gradle b/ntcore/config.gradle
similarity index 100%
rename from config.gradle
rename to ntcore/config.gradle
diff --git a/doc/alloy-model.adoc b/ntcore/doc/alloy-model.adoc
similarity index 100%
rename from doc/alloy-model.adoc
rename to ntcore/doc/alloy-model.adoc
diff --git a/doc/networktables2.adoc b/ntcore/doc/networktables2.adoc
similarity index 100%
rename from doc/networktables2.adoc
rename to ntcore/doc/networktables2.adoc
diff --git a/doc/networktables3.adoc b/ntcore/doc/networktables3.adoc
similarity index 100%
rename from doc/networktables3.adoc
rename to ntcore/doc/networktables3.adoc
diff --git a/gmock/CMakeLists.txt b/ntcore/gmock/CMakeLists.txt
similarity index 100%
rename from gmock/CMakeLists.txt
rename to ntcore/gmock/CMakeLists.txt
diff --git a/gmock/LICENSE b/ntcore/gmock/LICENSE
similarity index 100%
rename from gmock/LICENSE
rename to ntcore/gmock/LICENSE
diff --git a/gmock/build.gradle b/ntcore/gmock/build.gradle
similarity index 100%
rename from gmock/build.gradle
rename to ntcore/gmock/build.gradle
diff --git a/gmock/gtest/CMakeLists.txt b/ntcore/gmock/gtest/CMakeLists.txt
similarity index 100%
rename from gmock/gtest/CMakeLists.txt
rename to ntcore/gmock/gtest/CMakeLists.txt
diff --git a/gmock/gtest/LICENSE b/ntcore/gmock/gtest/LICENSE
similarity index 100%
rename from gmock/gtest/LICENSE
rename to ntcore/gmock/gtest/LICENSE
diff --git a/gmock/gtest/cmake/internal_utils.cmake b/ntcore/gmock/gtest/cmake/internal_utils.cmake
similarity index 100%
rename from gmock/gtest/cmake/internal_utils.cmake
rename to ntcore/gmock/gtest/cmake/internal_utils.cmake
diff --git a/gmock/gtest/include/gtest/gtest-death-test.h b/ntcore/gmock/gtest/include/gtest/gtest-death-test.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-death-test.h
rename to ntcore/gmock/gtest/include/gtest/gtest-death-test.h
diff --git a/gmock/gtest/include/gtest/gtest-message.h b/ntcore/gmock/gtest/include/gtest/gtest-message.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-message.h
rename to ntcore/gmock/gtest/include/gtest/gtest-message.h
diff --git a/gmock/gtest/include/gtest/gtest-param-test.h b/ntcore/gmock/gtest/include/gtest/gtest-param-test.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-param-test.h
rename to ntcore/gmock/gtest/include/gtest/gtest-param-test.h
diff --git a/gmock/gtest/include/gtest/gtest-param-test.h.pump b/ntcore/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 ntcore/gmock/gtest/include/gtest/gtest-param-test.h.pump
diff --git a/gmock/gtest/include/gtest/gtest-printers.h b/ntcore/gmock/gtest/include/gtest/gtest-printers.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-printers.h
rename to ntcore/gmock/gtest/include/gtest/gtest-printers.h
diff --git a/gmock/gtest/include/gtest/gtest-spi.h b/ntcore/gmock/gtest/include/gtest/gtest-spi.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-spi.h
rename to ntcore/gmock/gtest/include/gtest/gtest-spi.h
diff --git a/gmock/gtest/include/gtest/gtest-test-part.h b/ntcore/gmock/gtest/include/gtest/gtest-test-part.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-test-part.h
rename to ntcore/gmock/gtest/include/gtest/gtest-test-part.h
diff --git a/gmock/gtest/include/gtest/gtest-typed-test.h b/ntcore/gmock/gtest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest-typed-test.h
rename to ntcore/gmock/gtest/include/gtest/gtest-typed-test.h
diff --git a/gmock/gtest/include/gtest/gtest.h b/ntcore/gmock/gtest/include/gtest/gtest.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest.h
rename to ntcore/gmock/gtest/include/gtest/gtest.h
diff --git a/gmock/gtest/include/gtest/gtest_pred_impl.h b/ntcore/gmock/gtest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest_pred_impl.h
rename to ntcore/gmock/gtest/include/gtest/gtest_pred_impl.h
diff --git a/gmock/gtest/include/gtest/gtest_prod.h b/ntcore/gmock/gtest/include/gtest/gtest_prod.h
similarity index 100%
rename from gmock/gtest/include/gtest/gtest_prod.h
rename to ntcore/gmock/gtest/include/gtest/gtest_prod.h
diff --git a/gmock/gtest/include/gtest/internal/custom/gtest-port.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/custom/gtest-port.h
diff --git a/gmock/gtest/include/gtest/internal/custom/gtest-printers.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/custom/gtest-printers.h
diff --git a/gmock/gtest/include/gtest/internal/custom/gtest.h b/ntcore/gmock/gtest/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/custom/gtest.h
rename to ntcore/gmock/gtest/include/gtest/internal/custom/gtest.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-filepath.h b/ntcore/gmock/gtest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-filepath.h
rename to ntcore/gmock/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-internal.h b/ntcore/gmock/gtest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-internal.h
rename to ntcore/gmock/gtest/include/gtest/internal/gtest-internal.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h b/ntcore/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 ntcore/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/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/gmock/gtest/include/gtest/internal/gtest-param-util.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-port-arch.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-port-arch.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-port.h b/ntcore/gmock/gtest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-port.h
rename to ntcore/gmock/gtest/include/gtest/internal/gtest-port.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-string.h b/ntcore/gmock/gtest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-string.h
rename to ntcore/gmock/gtest/include/gtest/internal/gtest-string.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-tuple.h b/ntcore/gmock/gtest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from gmock/gtest/include/gtest/internal/gtest-tuple.h
rename to ntcore/gmock/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/gmock/gtest/include/gtest/internal/gtest-type-util.h b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump b/ntcore/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 ntcore/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/gmock/gtest/src/gtest-all.cc b/ntcore/gmock/gtest/src/gtest-all.cc
similarity index 100%
rename from gmock/gtest/src/gtest-all.cc
rename to ntcore/gmock/gtest/src/gtest-all.cc
diff --git a/gmock/gtest/src/gtest-death-test.cc b/ntcore/gmock/gtest/src/gtest-death-test.cc
similarity index 100%
rename from gmock/gtest/src/gtest-death-test.cc
rename to ntcore/gmock/gtest/src/gtest-death-test.cc
diff --git a/gmock/gtest/src/gtest-filepath.cc b/ntcore/gmock/gtest/src/gtest-filepath.cc
similarity index 100%
rename from gmock/gtest/src/gtest-filepath.cc
rename to ntcore/gmock/gtest/src/gtest-filepath.cc
diff --git a/gmock/gtest/src/gtest-internal-inl.h b/ntcore/gmock/gtest/src/gtest-internal-inl.h
similarity index 100%
rename from gmock/gtest/src/gtest-internal-inl.h
rename to ntcore/gmock/gtest/src/gtest-internal-inl.h
diff --git a/gmock/gtest/src/gtest-port.cc b/ntcore/gmock/gtest/src/gtest-port.cc
similarity index 100%
rename from gmock/gtest/src/gtest-port.cc
rename to ntcore/gmock/gtest/src/gtest-port.cc
diff --git a/gmock/gtest/src/gtest-printers.cc b/ntcore/gmock/gtest/src/gtest-printers.cc
similarity index 100%
rename from gmock/gtest/src/gtest-printers.cc
rename to ntcore/gmock/gtest/src/gtest-printers.cc
diff --git a/gmock/gtest/src/gtest-test-part.cc b/ntcore/gmock/gtest/src/gtest-test-part.cc
similarity index 100%
rename from gmock/gtest/src/gtest-test-part.cc
rename to ntcore/gmock/gtest/src/gtest-test-part.cc
diff --git a/gmock/gtest/src/gtest-typed-test.cc b/ntcore/gmock/gtest/src/gtest-typed-test.cc
similarity index 100%
rename from gmock/gtest/src/gtest-typed-test.cc
rename to ntcore/gmock/gtest/src/gtest-typed-test.cc
diff --git a/gmock/gtest/src/gtest.cc b/ntcore/gmock/gtest/src/gtest.cc
similarity index 100%
rename from gmock/gtest/src/gtest.cc
rename to ntcore/gmock/gtest/src/gtest.cc
diff --git a/gmock/gtest/src/gtest_main.cc b/ntcore/gmock/gtest/src/gtest_main.cc
similarity index 100%
rename from gmock/gtest/src/gtest_main.cc
rename to ntcore/gmock/gtest/src/gtest_main.cc
diff --git a/gmock/include/gmock/gmock-actions.h b/ntcore/gmock/include/gmock/gmock-actions.h
similarity index 100%
rename from gmock/include/gmock/gmock-actions.h
rename to ntcore/gmock/include/gmock/gmock-actions.h
diff --git a/gmock/include/gmock/gmock-cardinalities.h b/ntcore/gmock/include/gmock/gmock-cardinalities.h
similarity index 100%
rename from gmock/include/gmock/gmock-cardinalities.h
rename to ntcore/gmock/include/gmock/gmock-cardinalities.h
diff --git a/gmock/include/gmock/gmock-generated-actions.h b/ntcore/gmock/include/gmock/gmock-generated-actions.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-actions.h
rename to ntcore/gmock/include/gmock/gmock-generated-actions.h
diff --git a/gmock/include/gmock/gmock-generated-actions.h.pump b/ntcore/gmock/include/gmock/gmock-generated-actions.h.pump
similarity index 100%
rename from gmock/include/gmock/gmock-generated-actions.h.pump
rename to ntcore/gmock/include/gmock/gmock-generated-actions.h.pump
diff --git a/gmock/include/gmock/gmock-generated-function-mockers.h b/ntcore/gmock/include/gmock/gmock-generated-function-mockers.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-function-mockers.h
rename to ntcore/gmock/include/gmock/gmock-generated-function-mockers.h
diff --git a/gmock/include/gmock/gmock-generated-function-mockers.h.pump b/ntcore/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 ntcore/gmock/include/gmock/gmock-generated-function-mockers.h.pump
diff --git a/gmock/include/gmock/gmock-generated-matchers.h b/ntcore/gmock/include/gmock/gmock-generated-matchers.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-matchers.h
rename to ntcore/gmock/include/gmock/gmock-generated-matchers.h
diff --git a/gmock/include/gmock/gmock-generated-matchers.h.pump b/ntcore/gmock/include/gmock/gmock-generated-matchers.h.pump
similarity index 100%
rename from gmock/include/gmock/gmock-generated-matchers.h.pump
rename to ntcore/gmock/include/gmock/gmock-generated-matchers.h.pump
diff --git a/gmock/include/gmock/gmock-generated-nice-strict.h b/ntcore/gmock/include/gmock/gmock-generated-nice-strict.h
similarity index 100%
rename from gmock/include/gmock/gmock-generated-nice-strict.h
rename to ntcore/gmock/include/gmock/gmock-generated-nice-strict.h
diff --git a/gmock/include/gmock/gmock-generated-nice-strict.h.pump b/ntcore/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 ntcore/gmock/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/gmock/include/gmock/gmock-matchers.h b/ntcore/gmock/include/gmock/gmock-matchers.h
similarity index 100%
rename from gmock/include/gmock/gmock-matchers.h
rename to ntcore/gmock/include/gmock/gmock-matchers.h
diff --git a/gmock/include/gmock/gmock-more-actions.h b/ntcore/gmock/include/gmock/gmock-more-actions.h
similarity index 100%
rename from gmock/include/gmock/gmock-more-actions.h
rename to ntcore/gmock/include/gmock/gmock-more-actions.h
diff --git a/gmock/include/gmock/gmock-more-matchers.h b/ntcore/gmock/include/gmock/gmock-more-matchers.h
similarity index 100%
rename from gmock/include/gmock/gmock-more-matchers.h
rename to ntcore/gmock/include/gmock/gmock-more-matchers.h
diff --git a/gmock/include/gmock/gmock-spec-builders.h b/ntcore/gmock/include/gmock/gmock-spec-builders.h
similarity index 100%
rename from gmock/include/gmock/gmock-spec-builders.h
rename to ntcore/gmock/include/gmock/gmock-spec-builders.h
diff --git a/gmock/include/gmock/gmock.h b/ntcore/gmock/include/gmock/gmock.h
similarity index 100%
rename from gmock/include/gmock/gmock.h
rename to ntcore/gmock/include/gmock/gmock.h
diff --git a/gmock/include/gmock/internal/custom/gmock-generated-actions.h b/ntcore/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 ntcore/gmock/include/gmock/internal/custom/gmock-generated-actions.h
diff --git a/gmock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/ntcore/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 ntcore/gmock/include/gmock/internal/custom/gmock-generated-actions.h.pump
diff --git a/gmock/include/gmock/internal/custom/gmock-matchers.h b/ntcore/gmock/include/gmock/internal/custom/gmock-matchers.h
similarity index 100%
rename from gmock/include/gmock/internal/custom/gmock-matchers.h
rename to ntcore/gmock/include/gmock/internal/custom/gmock-matchers.h
diff --git a/gmock/include/gmock/internal/custom/gmock-port.h b/ntcore/gmock/include/gmock/internal/custom/gmock-port.h
similarity index 100%
rename from gmock/include/gmock/internal/custom/gmock-port.h
rename to ntcore/gmock/include/gmock/internal/custom/gmock-port.h
diff --git a/gmock/include/gmock/internal/gmock-generated-internal-utils.h b/ntcore/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 ntcore/gmock/include/gmock/internal/gmock-generated-internal-utils.h
diff --git a/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/ntcore/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 ntcore/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
diff --git a/gmock/include/gmock/internal/gmock-internal-utils.h b/ntcore/gmock/include/gmock/internal/gmock-internal-utils.h
similarity index 100%
rename from gmock/include/gmock/internal/gmock-internal-utils.h
rename to ntcore/gmock/include/gmock/internal/gmock-internal-utils.h
diff --git a/gmock/include/gmock/internal/gmock-port.h b/ntcore/gmock/include/gmock/internal/gmock-port.h
similarity index 100%
rename from gmock/include/gmock/internal/gmock-port.h
rename to ntcore/gmock/include/gmock/internal/gmock-port.h
diff --git a/gmock/src/gmock-all.cc b/ntcore/gmock/src/gmock-all.cc
similarity index 100%
rename from gmock/src/gmock-all.cc
rename to ntcore/gmock/src/gmock-all.cc
diff --git a/gmock/src/gmock-cardinalities.cc b/ntcore/gmock/src/gmock-cardinalities.cc
similarity index 100%
rename from gmock/src/gmock-cardinalities.cc
rename to ntcore/gmock/src/gmock-cardinalities.cc
diff --git a/gmock/src/gmock-internal-utils.cc b/ntcore/gmock/src/gmock-internal-utils.cc
similarity index 100%
rename from gmock/src/gmock-internal-utils.cc
rename to ntcore/gmock/src/gmock-internal-utils.cc
diff --git a/gmock/src/gmock-matchers.cc b/ntcore/gmock/src/gmock-matchers.cc
similarity index 100%
rename from gmock/src/gmock-matchers.cc
rename to ntcore/gmock/src/gmock-matchers.cc
diff --git a/gmock/src/gmock-spec-builders.cc b/ntcore/gmock/src/gmock-spec-builders.cc
similarity index 100%
rename from gmock/src/gmock-spec-builders.cc
rename to ntcore/gmock/src/gmock-spec-builders.cc
diff --git a/gmock/src/gmock.cc b/ntcore/gmock/src/gmock.cc
similarity index 100%
rename from gmock/src/gmock.cc
rename to ntcore/gmock/src/gmock.cc
diff --git a/gmock/src/gmock_main.cc b/ntcore/gmock/src/gmock_main.cc
similarity index 100%
rename from gmock/src/gmock_main.cc
rename to ntcore/gmock/src/gmock_main.cc
diff --git a/license.txt b/ntcore/license.txt
similarity index 100%
rename from license.txt
rename to ntcore/license.txt
diff --git a/manualTests/java/Client.java b/ntcore/manualTests/java/Client.java
similarity index 100%
rename from manualTests/java/Client.java
rename to ntcore/manualTests/java/Client.java
diff --git a/manualTests/java/Server.java b/ntcore/manualTests/java/Server.java
similarity index 100%
rename from manualTests/java/Server.java
rename to ntcore/manualTests/java/Server.java
diff --git a/manualTests/native/client.cpp b/ntcore/manualTests/native/client.cpp
similarity index 100%
rename from manualTests/native/client.cpp
rename to ntcore/manualTests/native/client.cpp
diff --git a/manualTests/native/rpc_local.cpp b/ntcore/manualTests/native/rpc_local.cpp
similarity index 100%
rename from manualTests/native/rpc_local.cpp
rename to ntcore/manualTests/native/rpc_local.cpp
diff --git a/manualTests/native/rpc_speed.cpp b/ntcore/manualTests/native/rpc_speed.cpp
similarity index 100%
rename from manualTests/native/rpc_speed.cpp
rename to ntcore/manualTests/native/rpc_speed.cpp
diff --git a/manualTests/native/server.cpp b/ntcore/manualTests/native/server.cpp
similarity index 100%
rename from manualTests/native/server.cpp
rename to ntcore/manualTests/native/server.cpp
diff --git a/publish.gradle b/ntcore/publish.gradle
similarity index 100%
rename from publish.gradle
rename to ntcore/publish.gradle
diff --git a/settings.gradle b/ntcore/settings.gradle
similarity index 100%
rename from settings.gradle
rename to ntcore/settings.gradle
diff --git a/src/arm-linux-jni/LICENSE b/ntcore/src/arm-linux-jni/LICENSE
similarity index 100%
rename from src/arm-linux-jni/LICENSE
rename to ntcore/src/arm-linux-jni/LICENSE
diff --git a/src/arm-linux-jni/jni.h b/ntcore/src/arm-linux-jni/jni.h
similarity index 100%
rename from src/arm-linux-jni/jni.h
rename to ntcore/src/arm-linux-jni/jni.h
diff --git a/src/arm-linux-jni/linux/jni_md.h b/ntcore/src/arm-linux-jni/linux/jni_md.h
similarity index 100%
rename from src/arm-linux-jni/linux/jni_md.h
rename to ntcore/src/arm-linux-jni/linux/jni_md.h
diff --git a/src/dev/java/edu/wpi/first/ntcore/DevMain.java b/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java
similarity index 100%
rename from src/dev/java/edu/wpi/first/ntcore/DevMain.java
rename to ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java
diff --git a/src/dev/native/cpp/main.cpp b/ntcore/src/dev/native/cpp/main.cpp
similarity index 100%
rename from src/dev/native/cpp/main.cpp
rename to ntcore/src/dev/native/cpp/main.cpp
diff --git a/src/main/java/edu/wpi/first/networktables/ConnectionInfo.java b/ntcore/src/main/java/edu/wpi/first/networktables/ConnectionInfo.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/ConnectionInfo.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/ConnectionInfo.java
diff --git a/src/main/java/edu/wpi/first/networktables/ConnectionNotification.java b/ntcore/src/main/java/edu/wpi/first/networktables/ConnectionNotification.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/ConnectionNotification.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/ConnectionNotification.java
diff --git a/src/main/java/edu/wpi/first/networktables/EntryInfo.java b/ntcore/src/main/java/edu/wpi/first/networktables/EntryInfo.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/EntryInfo.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/EntryInfo.java
diff --git a/src/main/java/edu/wpi/first/networktables/EntryListenerFlags.java b/ntcore/src/main/java/edu/wpi/first/networktables/EntryListenerFlags.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/EntryListenerFlags.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/EntryListenerFlags.java
diff --git a/src/main/java/edu/wpi/first/networktables/EntryNotification.java b/ntcore/src/main/java/edu/wpi/first/networktables/EntryNotification.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/EntryNotification.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/EntryNotification.java
diff --git a/src/main/java/edu/wpi/first/networktables/LogMessage.java b/ntcore/src/main/java/edu/wpi/first/networktables/LogMessage.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/LogMessage.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/LogMessage.java
diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTable.java b/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTable.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/NetworkTable.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/NetworkTable.java
diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTableEntry.java b/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableEntry.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/NetworkTableEntry.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableEntry.java
diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTableInstance.java b/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableInstance.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/NetworkTableInstance.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableInstance.java
diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTableType.java b/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableType.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/NetworkTableType.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableType.java
diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTableValue.java b/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableValue.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/NetworkTableValue.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/NetworkTableValue.java
diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java b/ntcore/src/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java
diff --git a/src/main/java/edu/wpi/first/networktables/PersistentException.java b/ntcore/src/main/java/edu/wpi/first/networktables/PersistentException.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/PersistentException.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/PersistentException.java
diff --git a/src/main/java/edu/wpi/first/networktables/RpcAnswer.java b/ntcore/src/main/java/edu/wpi/first/networktables/RpcAnswer.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/RpcAnswer.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/RpcAnswer.java
diff --git a/src/main/java/edu/wpi/first/networktables/RpcCall.java b/ntcore/src/main/java/edu/wpi/first/networktables/RpcCall.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/RpcCall.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/RpcCall.java
diff --git a/src/main/java/edu/wpi/first/networktables/TableEntryListener.java b/ntcore/src/main/java/edu/wpi/first/networktables/TableEntryListener.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/TableEntryListener.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/TableEntryListener.java
diff --git a/src/main/java/edu/wpi/first/networktables/TableListener.java b/ntcore/src/main/java/edu/wpi/first/networktables/TableListener.java
similarity index 100%
rename from src/main/java/edu/wpi/first/networktables/TableListener.java
rename to ntcore/src/main/java/edu/wpi/first/networktables/TableListener.java
diff --git a/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java
similarity index 100%
rename from src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java
rename to ntcore/src/main/java/edu/wpi/first/wpilibj/networktables/NetworkTable.java
diff --git a/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java
similarity index 100%
rename from src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java
rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemote.java
diff --git a/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java
similarity index 100%
rename from src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java
rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/IRemoteConnectionListener.java
diff --git a/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java
similarity index 100%
rename from src/main/java/edu/wpi/first/wpilibj/tables/ITable.java
rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITable.java
diff --git a/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java b/ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java
similarity index 100%
rename from src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java
rename to ntcore/src/main/java/edu/wpi/first/wpilibj/tables/ITableListener.java
diff --git a/src/main/native/cpp/CallbackManager.h b/ntcore/src/main/native/cpp/CallbackManager.h
similarity index 100%
rename from src/main/native/cpp/CallbackManager.h
rename to ntcore/src/main/native/cpp/CallbackManager.h
diff --git a/src/main/native/cpp/ConnectionNotifier.cpp b/ntcore/src/main/native/cpp/ConnectionNotifier.cpp
similarity index 100%
rename from src/main/native/cpp/ConnectionNotifier.cpp
rename to ntcore/src/main/native/cpp/ConnectionNotifier.cpp
diff --git a/src/main/native/cpp/ConnectionNotifier.h b/ntcore/src/main/native/cpp/ConnectionNotifier.h
similarity index 100%
rename from src/main/native/cpp/ConnectionNotifier.h
rename to ntcore/src/main/native/cpp/ConnectionNotifier.h
diff --git a/src/main/native/cpp/Dispatcher.cpp b/ntcore/src/main/native/cpp/Dispatcher.cpp
similarity index 100%
rename from src/main/native/cpp/Dispatcher.cpp
rename to ntcore/src/main/native/cpp/Dispatcher.cpp
diff --git a/src/main/native/cpp/Dispatcher.h b/ntcore/src/main/native/cpp/Dispatcher.h
similarity index 100%
rename from src/main/native/cpp/Dispatcher.h
rename to ntcore/src/main/native/cpp/Dispatcher.h
diff --git a/src/main/native/cpp/DsClient.cpp b/ntcore/src/main/native/cpp/DsClient.cpp
similarity index 100%
rename from src/main/native/cpp/DsClient.cpp
rename to ntcore/src/main/native/cpp/DsClient.cpp
diff --git a/src/main/native/cpp/DsClient.h b/ntcore/src/main/native/cpp/DsClient.h
similarity index 100%
rename from src/main/native/cpp/DsClient.h
rename to ntcore/src/main/native/cpp/DsClient.h
diff --git a/src/main/native/cpp/EntryNotifier.cpp b/ntcore/src/main/native/cpp/EntryNotifier.cpp
similarity index 100%
rename from src/main/native/cpp/EntryNotifier.cpp
rename to ntcore/src/main/native/cpp/EntryNotifier.cpp
diff --git a/src/main/native/cpp/EntryNotifier.h b/ntcore/src/main/native/cpp/EntryNotifier.h
similarity index 100%
rename from src/main/native/cpp/EntryNotifier.h
rename to ntcore/src/main/native/cpp/EntryNotifier.h
diff --git a/src/main/native/cpp/Handle.h b/ntcore/src/main/native/cpp/Handle.h
similarity index 100%
rename from src/main/native/cpp/Handle.h
rename to ntcore/src/main/native/cpp/Handle.h
diff --git a/src/main/native/cpp/IConnectionNotifier.h b/ntcore/src/main/native/cpp/IConnectionNotifier.h
similarity index 100%
rename from src/main/native/cpp/IConnectionNotifier.h
rename to ntcore/src/main/native/cpp/IConnectionNotifier.h
diff --git a/src/main/native/cpp/IDispatcher.h b/ntcore/src/main/native/cpp/IDispatcher.h
similarity index 100%
rename from src/main/native/cpp/IDispatcher.h
rename to ntcore/src/main/native/cpp/IDispatcher.h
diff --git a/src/main/native/cpp/IEntryNotifier.h b/ntcore/src/main/native/cpp/IEntryNotifier.h
similarity index 100%
rename from src/main/native/cpp/IEntryNotifier.h
rename to ntcore/src/main/native/cpp/IEntryNotifier.h
diff --git a/src/main/native/cpp/INetworkConnection.h b/ntcore/src/main/native/cpp/INetworkConnection.h
similarity index 100%
rename from src/main/native/cpp/INetworkConnection.h
rename to ntcore/src/main/native/cpp/INetworkConnection.h
diff --git a/src/main/native/cpp/IRpcServer.h b/ntcore/src/main/native/cpp/IRpcServer.h
similarity index 100%
rename from src/main/native/cpp/IRpcServer.h
rename to ntcore/src/main/native/cpp/IRpcServer.h
diff --git a/src/main/native/cpp/IStorage.h b/ntcore/src/main/native/cpp/IStorage.h
similarity index 100%
rename from src/main/native/cpp/IStorage.h
rename to ntcore/src/main/native/cpp/IStorage.h
diff --git a/src/main/native/cpp/InstanceImpl.cpp b/ntcore/src/main/native/cpp/InstanceImpl.cpp
similarity index 100%
rename from src/main/native/cpp/InstanceImpl.cpp
rename to ntcore/src/main/native/cpp/InstanceImpl.cpp
diff --git a/src/main/native/cpp/InstanceImpl.h b/ntcore/src/main/native/cpp/InstanceImpl.h
similarity index 100%
rename from src/main/native/cpp/InstanceImpl.h
rename to ntcore/src/main/native/cpp/InstanceImpl.h
diff --git a/src/main/native/cpp/Log.h b/ntcore/src/main/native/cpp/Log.h
similarity index 100%
rename from src/main/native/cpp/Log.h
rename to ntcore/src/main/native/cpp/Log.h
diff --git a/src/main/native/cpp/LoggerImpl.cpp b/ntcore/src/main/native/cpp/LoggerImpl.cpp
similarity index 100%
rename from src/main/native/cpp/LoggerImpl.cpp
rename to ntcore/src/main/native/cpp/LoggerImpl.cpp
diff --git a/src/main/native/cpp/LoggerImpl.h b/ntcore/src/main/native/cpp/LoggerImpl.h
similarity index 100%
rename from src/main/native/cpp/LoggerImpl.h
rename to ntcore/src/main/native/cpp/LoggerImpl.h
diff --git a/src/main/native/cpp/Message.cpp b/ntcore/src/main/native/cpp/Message.cpp
similarity index 100%
rename from src/main/native/cpp/Message.cpp
rename to ntcore/src/main/native/cpp/Message.cpp
diff --git a/src/main/native/cpp/Message.h b/ntcore/src/main/native/cpp/Message.h
similarity index 100%
rename from src/main/native/cpp/Message.h
rename to ntcore/src/main/native/cpp/Message.h
diff --git a/src/main/native/cpp/NetworkConnection.cpp b/ntcore/src/main/native/cpp/NetworkConnection.cpp
similarity index 100%
rename from src/main/native/cpp/NetworkConnection.cpp
rename to ntcore/src/main/native/cpp/NetworkConnection.cpp
diff --git a/src/main/native/cpp/NetworkConnection.h b/ntcore/src/main/native/cpp/NetworkConnection.h
similarity index 100%
rename from src/main/native/cpp/NetworkConnection.h
rename to ntcore/src/main/native/cpp/NetworkConnection.h
diff --git a/src/main/native/cpp/RpcServer.cpp b/ntcore/src/main/native/cpp/RpcServer.cpp
similarity index 100%
rename from src/main/native/cpp/RpcServer.cpp
rename to ntcore/src/main/native/cpp/RpcServer.cpp
diff --git a/src/main/native/cpp/RpcServer.h b/ntcore/src/main/native/cpp/RpcServer.h
similarity index 100%
rename from src/main/native/cpp/RpcServer.h
rename to ntcore/src/main/native/cpp/RpcServer.h
diff --git a/src/main/native/cpp/SequenceNumber.cpp b/ntcore/src/main/native/cpp/SequenceNumber.cpp
similarity index 100%
rename from src/main/native/cpp/SequenceNumber.cpp
rename to ntcore/src/main/native/cpp/SequenceNumber.cpp
diff --git a/src/main/native/cpp/SequenceNumber.h b/ntcore/src/main/native/cpp/SequenceNumber.h
similarity index 100%
rename from src/main/native/cpp/SequenceNumber.h
rename to ntcore/src/main/native/cpp/SequenceNumber.h
diff --git a/src/main/native/cpp/Storage.cpp b/ntcore/src/main/native/cpp/Storage.cpp
similarity index 100%
rename from src/main/native/cpp/Storage.cpp
rename to ntcore/src/main/native/cpp/Storage.cpp
diff --git a/src/main/native/cpp/Storage.h b/ntcore/src/main/native/cpp/Storage.h
similarity index 100%
rename from src/main/native/cpp/Storage.h
rename to ntcore/src/main/native/cpp/Storage.h
diff --git a/src/main/native/cpp/Storage_load.cpp b/ntcore/src/main/native/cpp/Storage_load.cpp
similarity index 100%
rename from src/main/native/cpp/Storage_load.cpp
rename to ntcore/src/main/native/cpp/Storage_load.cpp
diff --git a/src/main/native/cpp/Storage_save.cpp b/ntcore/src/main/native/cpp/Storage_save.cpp
similarity index 100%
rename from src/main/native/cpp/Storage_save.cpp
rename to ntcore/src/main/native/cpp/Storage_save.cpp
diff --git a/src/main/native/cpp/Value.cpp b/ntcore/src/main/native/cpp/Value.cpp
similarity index 100%
rename from src/main/native/cpp/Value.cpp
rename to ntcore/src/main/native/cpp/Value.cpp
diff --git a/src/main/native/cpp/Value_internal.h b/ntcore/src/main/native/cpp/Value_internal.h
similarity index 100%
rename from src/main/native/cpp/Value_internal.h
rename to ntcore/src/main/native/cpp/Value_internal.h
diff --git a/src/main/native/cpp/WireDecoder.cpp b/ntcore/src/main/native/cpp/WireDecoder.cpp
similarity index 100%
rename from src/main/native/cpp/WireDecoder.cpp
rename to ntcore/src/main/native/cpp/WireDecoder.cpp
diff --git a/src/main/native/cpp/WireDecoder.h b/ntcore/src/main/native/cpp/WireDecoder.h
similarity index 100%
rename from src/main/native/cpp/WireDecoder.h
rename to ntcore/src/main/native/cpp/WireDecoder.h
diff --git a/src/main/native/cpp/WireEncoder.cpp b/ntcore/src/main/native/cpp/WireEncoder.cpp
similarity index 100%
rename from src/main/native/cpp/WireEncoder.cpp
rename to ntcore/src/main/native/cpp/WireEncoder.cpp
diff --git a/src/main/native/cpp/WireEncoder.h b/ntcore/src/main/native/cpp/WireEncoder.h
similarity index 100%
rename from src/main/native/cpp/WireEncoder.h
rename to ntcore/src/main/native/cpp/WireEncoder.h
diff --git a/src/main/native/cpp/jni/NetworkTablesJNI.cpp b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
similarity index 100%
rename from src/main/native/cpp/jni/NetworkTablesJNI.cpp
rename to ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
diff --git a/src/main/native/cpp/networktables/NetworkTable.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
similarity index 100%
rename from src/main/native/cpp/networktables/NetworkTable.cpp
rename to ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
diff --git a/src/main/native/cpp/networktables/NetworkTableEntry.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTableEntry.cpp
similarity index 100%
rename from src/main/native/cpp/networktables/NetworkTableEntry.cpp
rename to ntcore/src/main/native/cpp/networktables/NetworkTableEntry.cpp
diff --git a/src/main/native/cpp/networktables/NetworkTableInstance.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
similarity index 100%
rename from src/main/native/cpp/networktables/NetworkTableInstance.cpp
rename to ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
diff --git a/src/main/native/cpp/networktables/RpcCall.cpp b/ntcore/src/main/native/cpp/networktables/RpcCall.cpp
similarity index 100%
rename from src/main/native/cpp/networktables/RpcCall.cpp
rename to ntcore/src/main/native/cpp/networktables/RpcCall.cpp
diff --git a/src/main/native/cpp/ntcore_c.cpp b/ntcore/src/main/native/cpp/ntcore_c.cpp
similarity index 100%
rename from src/main/native/cpp/ntcore_c.cpp
rename to ntcore/src/main/native/cpp/ntcore_c.cpp
diff --git a/src/main/native/cpp/ntcore_cpp.cpp b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
similarity index 100%
rename from src/main/native/cpp/ntcore_cpp.cpp
rename to ntcore/src/main/native/cpp/ntcore_cpp.cpp
diff --git a/src/main/native/cpp/ntcore_test.cpp b/ntcore/src/main/native/cpp/ntcore_test.cpp
similarity index 100%
rename from src/main/native/cpp/ntcore_test.cpp
rename to ntcore/src/main/native/cpp/ntcore_test.cpp
diff --git a/src/main/native/cpp/tables/ITableListener.cpp b/ntcore/src/main/native/cpp/tables/ITableListener.cpp
similarity index 100%
rename from src/main/native/cpp/tables/ITableListener.cpp
rename to ntcore/src/main/native/cpp/tables/ITableListener.cpp
diff --git a/src/main/native/include/networktables/EntryListenerFlags.h b/ntcore/src/main/native/include/networktables/EntryListenerFlags.h
similarity index 100%
rename from src/main/native/include/networktables/EntryListenerFlags.h
rename to ntcore/src/main/native/include/networktables/EntryListenerFlags.h
diff --git a/src/main/native/include/networktables/NetworkTable.h b/ntcore/src/main/native/include/networktables/NetworkTable.h
similarity index 100%
rename from src/main/native/include/networktables/NetworkTable.h
rename to ntcore/src/main/native/include/networktables/NetworkTable.h
diff --git a/src/main/native/include/networktables/NetworkTableEntry.h b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h
similarity index 100%
rename from src/main/native/include/networktables/NetworkTableEntry.h
rename to ntcore/src/main/native/include/networktables/NetworkTableEntry.h
diff --git a/src/main/native/include/networktables/NetworkTableEntry.inl b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inl
similarity index 100%
rename from src/main/native/include/networktables/NetworkTableEntry.inl
rename to ntcore/src/main/native/include/networktables/NetworkTableEntry.inl
diff --git a/src/main/native/include/networktables/NetworkTableInstance.h b/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
similarity index 100%
rename from src/main/native/include/networktables/NetworkTableInstance.h
rename to ntcore/src/main/native/include/networktables/NetworkTableInstance.h
diff --git a/src/main/native/include/networktables/NetworkTableInstance.inl b/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
similarity index 100%
rename from src/main/native/include/networktables/NetworkTableInstance.inl
rename to ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
diff --git a/src/main/native/include/networktables/NetworkTableType.h b/ntcore/src/main/native/include/networktables/NetworkTableType.h
similarity index 100%
rename from src/main/native/include/networktables/NetworkTableType.h
rename to ntcore/src/main/native/include/networktables/NetworkTableType.h
diff --git a/src/main/native/include/networktables/NetworkTableValue.h b/ntcore/src/main/native/include/networktables/NetworkTableValue.h
similarity index 100%
rename from src/main/native/include/networktables/NetworkTableValue.h
rename to ntcore/src/main/native/include/networktables/NetworkTableValue.h
diff --git a/src/main/native/include/networktables/RpcCall.h b/ntcore/src/main/native/include/networktables/RpcCall.h
similarity index 100%
rename from src/main/native/include/networktables/RpcCall.h
rename to ntcore/src/main/native/include/networktables/RpcCall.h
diff --git a/src/main/native/include/networktables/RpcCall.inl b/ntcore/src/main/native/include/networktables/RpcCall.inl
similarity index 100%
rename from src/main/native/include/networktables/RpcCall.inl
rename to ntcore/src/main/native/include/networktables/RpcCall.inl
diff --git a/src/main/native/include/networktables/TableEntryListener.h b/ntcore/src/main/native/include/networktables/TableEntryListener.h
similarity index 100%
rename from src/main/native/include/networktables/TableEntryListener.h
rename to ntcore/src/main/native/include/networktables/TableEntryListener.h
diff --git a/src/main/native/include/networktables/TableListener.h b/ntcore/src/main/native/include/networktables/TableListener.h
similarity index 100%
rename from src/main/native/include/networktables/TableListener.h
rename to ntcore/src/main/native/include/networktables/TableListener.h
diff --git a/src/main/native/include/ntcore.h b/ntcore/src/main/native/include/ntcore.h
similarity index 100%
rename from src/main/native/include/ntcore.h
rename to ntcore/src/main/native/include/ntcore.h
diff --git a/src/main/native/include/ntcore_c.h b/ntcore/src/main/native/include/ntcore_c.h
similarity index 100%
rename from src/main/native/include/ntcore_c.h
rename to ntcore/src/main/native/include/ntcore_c.h
diff --git a/src/main/native/include/ntcore_cpp.h b/ntcore/src/main/native/include/ntcore_cpp.h
similarity index 100%
rename from src/main/native/include/ntcore_cpp.h
rename to ntcore/src/main/native/include/ntcore_cpp.h
diff --git a/src/main/native/include/ntcore_test.h b/ntcore/src/main/native/include/ntcore_test.h
similarity index 100%
rename from src/main/native/include/ntcore_test.h
rename to ntcore/src/main/native/include/ntcore_test.h
diff --git a/src/main/native/include/tables/ITable.h b/ntcore/src/main/native/include/tables/ITable.h
similarity index 100%
rename from src/main/native/include/tables/ITable.h
rename to ntcore/src/main/native/include/tables/ITable.h
diff --git a/src/main/native/include/tables/ITableListener.h b/ntcore/src/main/native/include/tables/ITableListener.h
similarity index 100%
rename from src/main/native/include/tables/ITableListener.h
rename to ntcore/src/main/native/include/tables/ITableListener.h
diff --git a/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java b/ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
similarity index 100%
rename from src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
rename to ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
diff --git a/src/test/java/edu/wpi/first/networktables/EntryListenerTest.java b/ntcore/src/test/java/edu/wpi/first/networktables/EntryListenerTest.java
similarity index 100%
rename from src/test/java/edu/wpi/first/networktables/EntryListenerTest.java
rename to ntcore/src/test/java/edu/wpi/first/networktables/EntryListenerTest.java
diff --git a/src/test/java/edu/wpi/first/networktables/JNITest.java b/ntcore/src/test/java/edu/wpi/first/networktables/JNITest.java
similarity index 100%
rename from src/test/java/edu/wpi/first/networktables/JNITest.java
rename to ntcore/src/test/java/edu/wpi/first/networktables/JNITest.java
diff --git a/src/test/java/edu/wpi/first/networktables/LoggerTest.java b/ntcore/src/test/java/edu/wpi/first/networktables/LoggerTest.java
similarity index 100%
rename from src/test/java/edu/wpi/first/networktables/LoggerTest.java
rename to ntcore/src/test/java/edu/wpi/first/networktables/LoggerTest.java
diff --git a/src/test/java/edu/wpi/first/networktables/NetworkTableTest.java b/ntcore/src/test/java/edu/wpi/first/networktables/NetworkTableTest.java
similarity index 100%
rename from src/test/java/edu/wpi/first/networktables/NetworkTableTest.java
rename to ntcore/src/test/java/edu/wpi/first/networktables/NetworkTableTest.java
diff --git a/src/test/native/cpp/ConnectionListenerTest.cpp b/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
similarity index 100%
rename from src/test/native/cpp/ConnectionListenerTest.cpp
rename to ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
diff --git a/src/test/native/cpp/EntryListenerTest.cpp b/ntcore/src/test/native/cpp/EntryListenerTest.cpp
similarity index 100%
rename from src/test/native/cpp/EntryListenerTest.cpp
rename to ntcore/src/test/native/cpp/EntryListenerTest.cpp
diff --git a/src/test/native/cpp/EntryNotifierTest.cpp b/ntcore/src/test/native/cpp/EntryNotifierTest.cpp
similarity index 100%
rename from src/test/native/cpp/EntryNotifierTest.cpp
rename to ntcore/src/test/native/cpp/EntryNotifierTest.cpp
diff --git a/src/test/native/cpp/MessageMatcher.cpp b/ntcore/src/test/native/cpp/MessageMatcher.cpp
similarity index 100%
rename from src/test/native/cpp/MessageMatcher.cpp
rename to ntcore/src/test/native/cpp/MessageMatcher.cpp
diff --git a/src/test/native/cpp/MessageMatcher.h b/ntcore/src/test/native/cpp/MessageMatcher.h
similarity index 100%
rename from src/test/native/cpp/MessageMatcher.h
rename to ntcore/src/test/native/cpp/MessageMatcher.h
diff --git a/src/test/native/cpp/MockConnectionNotifier.h b/ntcore/src/test/native/cpp/MockConnectionNotifier.h
similarity index 100%
rename from src/test/native/cpp/MockConnectionNotifier.h
rename to ntcore/src/test/native/cpp/MockConnectionNotifier.h
diff --git a/src/test/native/cpp/MockDispatcher.h b/ntcore/src/test/native/cpp/MockDispatcher.h
similarity index 100%
rename from src/test/native/cpp/MockDispatcher.h
rename to ntcore/src/test/native/cpp/MockDispatcher.h
diff --git a/src/test/native/cpp/MockEntryNotifier.h b/ntcore/src/test/native/cpp/MockEntryNotifier.h
similarity index 100%
rename from src/test/native/cpp/MockEntryNotifier.h
rename to ntcore/src/test/native/cpp/MockEntryNotifier.h
diff --git a/src/test/native/cpp/MockNetworkConnection.h b/ntcore/src/test/native/cpp/MockNetworkConnection.h
similarity index 100%
rename from src/test/native/cpp/MockNetworkConnection.h
rename to ntcore/src/test/native/cpp/MockNetworkConnection.h
diff --git a/src/test/native/cpp/MockRpcServer.h b/ntcore/src/test/native/cpp/MockRpcServer.h
similarity index 100%
rename from src/test/native/cpp/MockRpcServer.h
rename to ntcore/src/test/native/cpp/MockRpcServer.h
diff --git a/src/test/native/cpp/NetworkTableTest.cpp b/ntcore/src/test/native/cpp/NetworkTableTest.cpp
similarity index 100%
rename from src/test/native/cpp/NetworkTableTest.cpp
rename to ntcore/src/test/native/cpp/NetworkTableTest.cpp
diff --git a/src/test/native/cpp/StorageTest.cpp b/ntcore/src/test/native/cpp/StorageTest.cpp
similarity index 100%
rename from src/test/native/cpp/StorageTest.cpp
rename to ntcore/src/test/native/cpp/StorageTest.cpp
diff --git a/src/test/native/cpp/StorageTest.h b/ntcore/src/test/native/cpp/StorageTest.h
similarity index 100%
rename from src/test/native/cpp/StorageTest.h
rename to ntcore/src/test/native/cpp/StorageTest.h
diff --git a/src/test/native/cpp/TestPrinters.cpp b/ntcore/src/test/native/cpp/TestPrinters.cpp
similarity index 100%
rename from src/test/native/cpp/TestPrinters.cpp
rename to ntcore/src/test/native/cpp/TestPrinters.cpp
diff --git a/src/test/native/cpp/TestPrinters.h b/ntcore/src/test/native/cpp/TestPrinters.h
similarity index 100%
rename from src/test/native/cpp/TestPrinters.h
rename to ntcore/src/test/native/cpp/TestPrinters.h
diff --git a/src/test/native/cpp/ValueMatcher.cpp b/ntcore/src/test/native/cpp/ValueMatcher.cpp
similarity index 100%
rename from src/test/native/cpp/ValueMatcher.cpp
rename to ntcore/src/test/native/cpp/ValueMatcher.cpp
diff --git a/src/test/native/cpp/ValueMatcher.h b/ntcore/src/test/native/cpp/ValueMatcher.h
similarity index 100%
rename from src/test/native/cpp/ValueMatcher.h
rename to ntcore/src/test/native/cpp/ValueMatcher.h
diff --git a/src/test/native/cpp/ValueTest.cpp b/ntcore/src/test/native/cpp/ValueTest.cpp
similarity index 100%
rename from src/test/native/cpp/ValueTest.cpp
rename to ntcore/src/test/native/cpp/ValueTest.cpp
diff --git a/src/test/native/cpp/WireDecoderTest.cpp b/ntcore/src/test/native/cpp/WireDecoderTest.cpp
similarity index 100%
rename from src/test/native/cpp/WireDecoderTest.cpp
rename to ntcore/src/test/native/cpp/WireDecoderTest.cpp
diff --git a/src/test/native/cpp/WireEncoderTest.cpp b/ntcore/src/test/native/cpp/WireEncoderTest.cpp
similarity index 100%
rename from src/test/native/cpp/WireEncoderTest.cpp
rename to ntcore/src/test/native/cpp/WireEncoderTest.cpp
diff --git a/src/test/native/cpp/main.cpp b/ntcore/src/test/native/cpp/main.cpp
similarity index 100%
rename from src/test/native/cpp/main.cpp
rename to ntcore/src/test/native/cpp/main.cpp