diff --git a/cppSettings.gradle b/cppSettings.gradle
index d4e9ac1ee5..cc68433bdf 100644
--- a/cppSettings.gradle
+++ b/cppSettings.gradle
@@ -1,5 +1,5 @@
 // These add the nilibraries shared library to the linker args
-def niLibraryPath = file('ni-libraries').path
+def niLibraryPath = file('ni-libraries/lib').path
 def niLibrary = niLibraryPath + "/libnilibraries.so"
 
 task downloadArmNetworkTables() {
@@ -268,6 +268,9 @@ subprojects {
             }
         }
 
+        ext.niLibraryHeadersRoot = "${rootDir}/ni-libraries/include"
+        ext.niLibraryHeadersChipObject = "${rootDir}/ni-libraries/include/FRC_FPGA_ChipObject"
+
         // This task adds the appropriate linker flags for the NI libraries
         ext.addNiLibraryLinks = { linker, targetPlatform ->
             String architecture = targetPlatform.architecture
diff --git a/hal/build.gradle b/hal/build.gradle
index d00e8fc09a..dfbe956341 100644
--- a/hal/build.gradle
+++ b/hal/build.gradle
@@ -24,11 +24,11 @@ model {
             sources {
                 cpp {
                     source {
-                        srcDirs = ["lib/athena", "lib/athena/FRC_FPGA_ChipObject", "lib/shared"]
+                        srcDirs = ["lib/athena", niLibraryHeadersChipObject, niLibraryHeadersRoot, "lib/shared"]
                         includes = ["**/*.cpp"]
                     }
                     exportedHeaders {
-                        srcDirs = ["include", "lib/athena/FRC_FPGA_ChipObject", wpiUtilInclude]
+                        srcDirs = ["include", niLibraryHeadersChipObject, niLibraryHeadersRoot, wpiUtilInclude]
                     }
                 }
             }
@@ -70,7 +70,8 @@ task halZip(type: Zip) {
                 spec.headerDirs.each {
                     def normalizedIt = it.toString().replace('/', '\\')
                     def normalizedWPIUtil = wpiUtilInclude.toString().replace('/', '\\')
-                    if (normalizedIt != normalizedWPIUtil) {
+                    // exclude the wpiUtil library, and any NI libraries (NI libraries grabbed later)
+                    if (normalizedIt != normalizedWPIUtil && !it.toString().contains('ni-libraries') ) {
                         from(it) {
                             into 'include'
                             // We don't want to include any of the .cpp files that are in some of the header directories
@@ -88,8 +89,19 @@ task halZip(type: Zip) {
         }
     }
 
+    // Grab the NI headers excluding the ChipObject folder
+    from(project.file('../ni-libraries/include')) {
+        exclude 'FRC_FPGA_ChipObject/'
+        into 'include'
+    }
+
+    // Grab the ChipObject headers manually and put them in the right spot
+    from(project.file('../ni-libraries/include/FRC_FPGA_ChipObject')) {
+        into 'include'
+    }
+
     // Finally, include all of the shared library objects from the ni directory
-    from(project.file('../ni-libraries')) {
+    from(project.file('../ni-libraries/lib')) {
         into 'lib'
         exclude 'genlinks'
         exclude 'libwpi.so'
diff --git a/hal/include/FRC_NetworkCommunication/CANSessionMux.h b/hal/include/FRC_NetworkCommunication/CANSessionMux.h
deleted file mode 100644
index d6fa822466..0000000000
--- a/hal/include/FRC_NetworkCommunication/CANSessionMux.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// CANSessionMux.h
-//
-//  Defines the API for building a CAN Interface Plugin to support
-//    PWM-cable-free CAN motor control on FRC robots.  This allows you
-//    to connect any CAN interface to the secure Jaguar CAN driver.
-//
-
-#ifndef __CANSessionMux_h__
-#define __CANSessionMux_h__
-
-#if defined(__vxworks)
-#include <vxWorks.h>
-#else
-#include <stdint.h>
-#endif
-
-#define CAN_SEND_PERIOD_NO_REPEAT 0
-#define CAN_SEND_PERIOD_STOP_REPEATING -1
-
-/* Flags in the upper bits of the messageID */
-#define CAN_IS_FRAME_REMOTE 0x80000000
-#define CAN_IS_FRAME_11BIT  0x40000000
-
-#define ERR_CANSessionMux_InvalidBuffer   -44086
-#define ERR_CANSessionMux_MessageNotFound -44087
-#define WARN_CANSessionMux_NoToken         44087
-#define ERR_CANSessionMux_NotAllowed      -44088
-#define ERR_CANSessionMux_NotInitialized  -44089
-#define ERR_CANSessionMux_SessionOverrun   44050
-
-struct tCANStreamMessage{
-	uint32_t messageID;
-	uint32_t timeStamp;
-	uint8_t data[8];
-	uint8_t dataSize;
-};
-
-#ifdef __cplusplus
-namespace nCANSessionMux
-{
-	void sendMessage_wrapper(uint32_t messageID, const uint8_t *data, uint8_t dataSize, int32_t periodMs, int32_t *status);
-	void receiveMessage_wrapper(uint32_t *messageID, uint32_t messageIDMask, uint8_t *data, uint8_t *dataSize, uint32_t *timeStamp, int32_t *status);
-	void openStreamSession(uint32_t *sessionHandle, uint32_t messageID, uint32_t messageIDMask, uint32_t maxMessages, int32_t *status);
-	void closeStreamSession(uint32_t sessionHandle);
-	void readStreamSession(uint32_t sessionHandle, struct tCANStreamMessage *messages, uint32_t messagesToRead, uint32_t *messagesRead, int32_t *status);
-	void getCANStatus(float *percentBusUtilization, uint32_t *busOffCount, uint32_t *txFullCount, uint32_t *receiveErrorCount, uint32_t *transmitErrorCount, int32_t *status);
-}
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-	void FRC_NetworkCommunication_CANSessionMux_sendMessage(uint32_t messageID, const uint8_t *data, uint8_t dataSize, int32_t periodMs, int32_t *status);
-	void FRC_NetworkCommunication_CANSessionMux_receiveMessage(uint32_t *messageID, uint32_t messageIDMask, uint8_t *data, uint8_t *dataSize, uint32_t *timeStamp, int32_t *status);
-	void FRC_NetworkCommunication_CANSessionMux_openStreamSession(uint32_t *sessionHandle, uint32_t messageID, uint32_t messageIDMask, uint32_t maxMessages, int32_t *status);
-	void FRC_NetworkCommunication_CANSessionMux_closeStreamSession(uint32_t sessionHandle);
-	void FRC_NetworkCommunication_CANSessionMux_readStreamSession(uint32_t sessionHandle, struct tCANStreamMessage *messages, uint32_t messagesToRead, uint32_t *messagesRead, int32_t *status);
-	void FRC_NetworkCommunication_CANSessionMux_getCANStatus(float *percentBusUtilization, uint32_t *busOffCount, uint32_t *txFullCount, uint32_t *receiveErrorCount, uint32_t *transmitErrorCount, int32_t *status);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __CANSessionMux_h__
diff --git a/hal/include/FRC_NetworkCommunication/FRCComm.h b/hal/include/FRC_NetworkCommunication/FRCComm.h
deleted file mode 100644
index b0bd83f08b..0000000000
--- a/hal/include/FRC_NetworkCommunication/FRCComm.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*************************************************************
- * 					NOTICE
- * 
- * 	These are the only externally exposed functions to the
- *   NetworkCommunication library
- * 
- * This is an implementation of FRC Spec for Comm Protocol
- * Revision 4.5, June 30, 2008
- *
- * Copyright (c) National Instruments 2008.  All Rights Reserved.
- * 
- *************************************************************/
-
-#ifndef __FRC_COMM_H__
-#define __FRC_COMM_H__
-
-#ifdef WIN32
-# include <vxWorks_compat.h>
-#ifdef USE_THRIFT
-#  define EXPORT_FUNC
-# else
-#  define EXPORT_FUNC __declspec(dllexport) __cdecl
-# endif
-#elif defined(__vxworks)
-# include <vxWorks.h>
-# define EXPORT_FUNC
-#elif defined(__linux)
-# include <stdint.h>
-# include <pthread.h>
-# define EXPORT_FUNC
-#endif
-
-#define ERR_FRCSystem_NetCommNotResponding -44049
-#define ERR_FRCSystem_NoDSConnection -44018
-
-#ifdef WIN32
-# define __DEPRECATED__ __declspec(deprecated)
-#else
-# define __DEPRECATED__ __attribute__((__deprecated__))
-#endif
-
-enum AllianceStationID_t {
-	kAllianceStationID_red1,
-	kAllianceStationID_red2,
-	kAllianceStationID_red3,
-	kAllianceStationID_blue1,
-	kAllianceStationID_blue2,
-	kAllianceStationID_blue3,
-};
-
-enum MatchType_t {
-	kMatchType_none,
-	kMatchType_practice,
-	kMatchType_qualification,
-	kMatchType_elimination,
-};
-
-struct ControlWord_t {
-#ifndef __vxworks
-	uint32_t enabled : 1;
-	uint32_t autonomous : 1;
-	uint32_t test :1;
-	uint32_t eStop : 1;
-	uint32_t fmsAttached:1;
-	uint32_t dsAttached:1;
-	uint32_t control_reserved : 26;
-#else
-	uint32_t control_reserved : 26;
-	uint32_t dsAttached:1;
-	uint32_t fmsAttached:1;
-	uint32_t eStop : 1;
-	uint32_t test :1;
-	uint32_t autonomous : 1;
-	uint32_t enabled : 1;
-#endif
-};
-
-struct JoystickAxes_t {
-	uint16_t count;
-	int16_t axes[1];
-};
-
-struct JoystickPOV_t {
-	uint16_t count;
-	int16_t povs[1];
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	int EXPORT_FUNC FRC_NetworkCommunication_Reserve(void *instance);
-#ifndef SIMULATION
-	void EXPORT_FUNC getFPGAHardwareVersion(uint16_t *fpgaVersion, uint32_t *fpgaRevision);
-#endif
-	/**
-	 * Safely copy data into the status packet to be sent back to the driver station.
-	 * @deprecated battery is the only parameter to this function that is still used, and only on cRIO / simulation.
-	 */
-	__DEPRECATED__ int EXPORT_FUNC setStatusData(float battery, uint8_t dsDigitalOut, uint8_t updateNumber,
-			const char *userDataHigh, int userDataHighLength,
-			const char *userDataLow, int userDataLowLength, int wait_ms);
-	/**
-	 * Send error data to the DS
-	 * @deprecated This old method is hard to parse on the DS side. It will be removed soon. Use FRC_NetworkCommunication_sendError instead.
-	 * @param errorData is a cstr of the error message
-	 * @param errorDataLength is the length of the errorData
-	 * @param wait_ms is ignored (included for binary compatibility)
-	 * @return 0 on success, 1 on no DS connection
-	 */
-	__DEPRECATED__ int EXPORT_FUNC setErrorData(const char *errors, int errorsLength, int wait_ms);
-
-	/**
-	 * Send a console output line to the Driver Station
-	 * @param line a null-terminated string
-	 * @return 0 on success, other on failure
-	 */
-	int EXPORT_FUNC FRC_NetworkCommunication_sendConsoleLine(const char *line);
-
-	/**
-	 * Send an error to the Driver Station
-	 * @param isError true if error, false if warning
-	 * @param errorCode value of error condition
-	 * @param isLVCode true if error code is defined in errors.txt, false if not (i.e. made up for C++)
-	 * @param details error description that contains details such as which resource number caused the failure
-	 * @param location Source file, function, and line number that the error was generated - optional
-	 * @param callStack The details about what functions were called through before the error was reported - optional
-	 * @return 0 on success, other on failure
-	 */
-	int EXPORT_FUNC FRC_NetworkCommunication_sendError(int isError, int32_t errorCode, int isLVCode,
-		const char *details, const char *location, const char *callStack);
-
-#ifdef WIN32
-	void EXPORT_FUNC setNewDataSem(HANDLE);
-#elif defined (__vxworks)
-	void EXPORT_FUNC setNewDataSem(SEM_ID);
-#else
-	void EXPORT_FUNC setNewDataSem(pthread_cond_t *);
-#endif
-
-	// this uint32_t is really a LVRefNum
-	int EXPORT_FUNC setNewDataOccurRef(uint32_t refnum);
-
-	int EXPORT_FUNC FRC_NetworkCommunication_getControlWord(struct ControlWord_t *controlWord);
-	int EXPORT_FUNC FRC_NetworkCommunication_getAllianceStation(enum AllianceStationID_t *allianceStation);
-	int EXPORT_FUNC FRC_NetworkCommunication_getMatchTime(float *matchTime);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickAxes(uint8_t joystickNum, struct JoystickAxes_t *axes, uint8_t maxAxes);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickButtons(uint8_t joystickNum, uint32_t *buttons, uint8_t *count);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickPOVs(uint8_t joystickNum, struct JoystickPOV_t *povs, uint8_t maxPOVs);
-	int EXPORT_FUNC FRC_NetworkCommunication_setJoystickOutputs(uint8_t joystickNum, uint32_t hidOutputs, uint16_t leftRumble, uint16_t rightRumble);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickDesc(uint8_t joystickNum, uint8_t *isXBox, uint8_t *type, char *name,
-		uint8_t *axisCount, uint8_t *axisTypes, uint8_t *buttonCount, uint8_t *povCount);
-
-	void EXPORT_FUNC FRC_NetworkCommunication_getVersionString(char *version);
-	int EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramStarting(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramDisabled(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramAutonomous(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramTeleop(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramTest(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/hal/include/FRC_NetworkCommunication/LoadOut.h b/hal/include/FRC_NetworkCommunication/LoadOut.h
deleted file mode 100644
index cd02537d91..0000000000
--- a/hal/include/FRC_NetworkCommunication/LoadOut.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#ifndef __LoadOut_h__
-#define __LoadOut_h__
-
-#ifdef WIN32
-#include <vxWorks_compat.h>
-#define EXPORT_FUNC __declspec(dllexport) __cdecl
-#elif defined (__vxworks)
-#include <vxWorks.h>
-#define EXPORT_FUNC
-#else
-#include <stdint.h>
-#define EXPORT_FUNC
-#endif
-
-#define kMaxModuleNumber 2
-namespace nLoadOut
-{
-#if defined(__vxworks) || defined(SIMULATION)
-    typedef enum {
-        kModuleType_Unknown = 0x00,
-        kModuleType_Analog = 0x01,
-        kModuleType_Digital = 0x02,
-        kModuleType_Solenoid = 0x03,
-    } tModuleType;
-    bool EXPORT_FUNC getModulePresence(tModuleType moduleType, uint8_t moduleNumber);
-#endif
-    typedef enum {
-        kTargetClass_Unknown = 0x00,
-        kTargetClass_FRC1 = 0x10,
-        kTargetClass_FRC2 = 0x20,
-        kTargetClass_FRC3 = 0x30,
-        kTargetClass_RoboRIO = 0x40,
-#if defined(__vxworks) || defined(SIMULATION)
-        kTargetClass_FRC2_Analog = kTargetClass_FRC2 | kModuleType_Analog,
-        kTargetClass_FRC2_Digital = kTargetClass_FRC2 | kModuleType_Digital,
-        kTargetClass_FRC2_Solenoid = kTargetClass_FRC2 | kModuleType_Solenoid,
-#endif
-        kTargetClass_FamilyMask = 0xF0,
-        kTargetClass_ModuleMask = 0x0F,
-    } tTargetClass;
-    tTargetClass EXPORT_FUNC getTargetClass();
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__vxworks) || defined(SIMULATION)
-    uint32_t EXPORT_FUNC FRC_NetworkCommunication_nLoadOut_getModulePresence(uint32_t moduleType, uint8_t moduleNumber);
-#endif
-    uint32_t EXPORT_FUNC FRC_NetworkCommunication_nLoadOut_getTargetClass();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __LoadOut_h__
diff --git a/hal/include/FRC_NetworkCommunication/UsageReporting.h b/hal/include/FRC_NetworkCommunication/UsageReporting.h
deleted file mode 100644
index 17d5874209..0000000000
--- a/hal/include/FRC_NetworkCommunication/UsageReporting.h
+++ /dev/null
@@ -1,149 +0,0 @@
-
-#ifndef __UsageReporting_h__
-#define __UsageReporting_h__
-
-#ifdef WIN32
-#include <vxWorks_compat.h>
-#define EXPORT_FUNC __declspec(dllexport) __cdecl
-#elif defined (__vxworks)
-#include <vxWorks.h>
-#define EXPORT_FUNC
-#else
-#include <stdint.h>
-#include <stdlib.h>
-#define EXPORT_FUNC
-#endif
-
-#define kUsageReporting_version 1
-
-namespace nUsageReporting
-{
-    typedef enum
-    {
-        kResourceType_Controller,
-        kResourceType_Module,
-        kResourceType_Language,
-        kResourceType_CANPlugin,
-        kResourceType_Accelerometer,
-        kResourceType_ADXL345,
-        kResourceType_AnalogChannel,
-        kResourceType_AnalogTrigger,
-        kResourceType_AnalogTriggerOutput,
-        kResourceType_CANJaguar,
-        kResourceType_Compressor,
-        kResourceType_Counter,
-        kResourceType_Dashboard,
-        kResourceType_DigitalInput,
-        kResourceType_DigitalOutput,
-        kResourceType_DriverStationCIO,
-        kResourceType_DriverStationEIO,
-        kResourceType_DriverStationLCD,
-        kResourceType_Encoder,
-        kResourceType_GearTooth,
-        kResourceType_Gyro,
-        kResourceType_I2C,
-        kResourceType_Framework,
-        kResourceType_Jaguar,
-        kResourceType_Joystick,
-        kResourceType_Kinect,
-        kResourceType_KinectStick,
-        kResourceType_PIDController,
-        kResourceType_Preferences,
-        kResourceType_PWM,
-        kResourceType_Relay,
-        kResourceType_RobotDrive,
-        kResourceType_SerialPort,
-        kResourceType_Servo,
-        kResourceType_Solenoid,
-        kResourceType_SPI,
-        kResourceType_Task,
-        kResourceType_Ultrasonic,
-        kResourceType_Victor,
-        kResourceType_Button,
-        kResourceType_Command,
-        kResourceType_AxisCamera,
-        kResourceType_PCVideoServer,
-        kResourceType_SmartDashboard,
-        kResourceType_Talon,
-        kResourceType_HiTechnicColorSensor,
-        kResourceType_HiTechnicAccel,
-        kResourceType_HiTechnicCompass,
-        kResourceType_SRF08,
-        kResourceType_AnalogOutput,
-        kResourceType_VictorSP,
-        kResourceType_TalonSRX,
-        kResourceType_CANTalonSRX,
-        kResourceType_ADXL362,
-        kResourceType_ADXRS450,
-        kResourceType_RevSPARK,
-        kResourceType_MindsensorsSD540,
-        kResourceType_DigitalFilter,
-    } tResourceType;
-
-    typedef enum
-    {
-        kLanguage_LabVIEW = 1,
-        kLanguage_CPlusPlus = 2,
-        kLanguage_Java = 3,
-        kLanguage_Python = 4,
-
-        kCANPlugin_BlackJagBridge = 1,
-        kCANPlugin_2CAN = 2,
-
-        kFramework_Iterative = 1,
-        kFramework_Simple = 2,
-        kFramework_CommandControl = 3,
-
-        kRobotDrive_ArcadeStandard = 1,
-        kRobotDrive_ArcadeButtonSpin = 2,
-        kRobotDrive_ArcadeRatioCurve = 3,
-        kRobotDrive_Tank = 4,
-        kRobotDrive_MecanumPolar = 5,
-        kRobotDrive_MecanumCartesian = 6,
-
-        kDriverStationCIO_Analog = 1,
-        kDriverStationCIO_DigitalIn = 2,
-        kDriverStationCIO_DigitalOut = 3,
-
-        kDriverStationEIO_Acceleration = 1,
-        kDriverStationEIO_AnalogIn = 2,
-        kDriverStationEIO_AnalogOut = 3,
-        kDriverStationEIO_Button = 4,
-        kDriverStationEIO_LED = 5,
-        kDriverStationEIO_DigitalIn = 6,
-        kDriverStationEIO_DigitalOut = 7,
-        kDriverStationEIO_FixedDigitalOut = 8,
-        kDriverStationEIO_PWM = 9,
-        kDriverStationEIO_Encoder = 10,
-        kDriverStationEIO_TouchSlider = 11,
-
-        kADXL345_SPI = 1,
-        kADXL345_I2C = 2,
-
-        kCommand_Scheduler = 1,
-
-        kSmartDashboard_Instance = 1,
-    } tInstances;
-
-    /**
-     * Report the usage of a resource of interest.
-     * 
-     * @param resource one of the values in the tResourceType above (max value 51).
-     * @param instanceNumber an index that identifies the resource instance.
-     * @param context an optional additional context number for some cases (such as module number).  Set to 0 to omit.
-     * @param feature a string to be included describing features in use on a specific resource.  Setting the same resource more than once allows you to change the feature string.
-     */
-    uint32_t EXPORT_FUNC report(tResourceType resource, uint8_t instanceNumber, uint8_t context = 0, const char *feature = NULL);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    uint32_t EXPORT_FUNC FRC_NetworkCommunication_nUsageReporting_report(uint8_t resource, uint8_t instanceNumber, uint8_t context, const char *feature);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __UsageReporting_h__
diff --git a/hal/lib/athena/ChipObject.h b/hal/include/HAL/ChipObject.h
similarity index 100%
rename from hal/lib/athena/ChipObject.h
rename to hal/include/HAL/ChipObject.h
diff --git a/hal/lib/athena/Accelerometer.cpp b/hal/lib/athena/Accelerometer.cpp
index 4b198cd0f9..c57a5801b7 100644
--- a/hal/lib/athena/Accelerometer.cpp
+++ b/hal/lib/athena/Accelerometer.cpp
@@ -13,7 +13,7 @@
 #include <cstdio>
 #include <memory>
 
-#include "ChipObject.h"
+#include "HAL/ChipObject.h"
 #include "HAL/HAL.h"
 
 using namespace hal;
diff --git a/hal/lib/athena/AnalogInternal.cpp b/hal/lib/athena/AnalogInternal.cpp
index 82a68d92a5..d4a0c3a8e1 100644
--- a/hal/lib/athena/AnalogInternal.cpp
+++ b/hal/lib/athena/AnalogInternal.cpp
@@ -9,8 +9,8 @@
 
 #include <atomic>
 
-#include "ChipObject.h"
 #include "HAL/AnalogInput.h"
+#include "HAL/ChipObject.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "PortsInternal.h"
 
diff --git a/hal/lib/athena/AnalogInternal.h b/hal/lib/athena/AnalogInternal.h
index baff302eab..58236e02f2 100644
--- a/hal/lib/athena/AnalogInternal.h
+++ b/hal/lib/athena/AnalogInternal.h
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "ChipObject.h"
+#include "HAL/ChipObject.h"
 #include "HAL/Ports.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "HAL/handles/IndexedHandleResource.h"
diff --git a/hal/lib/athena/DigitalInternal.cpp b/hal/lib/athena/DigitalInternal.cpp
index fbad7eef98..457901b436 100644
--- a/hal/lib/athena/DigitalInternal.cpp
+++ b/hal/lib/athena/DigitalInternal.cpp
@@ -11,10 +11,10 @@
 #include <mutex>
 #include <thread>
 
-#include "ChipObject.h"
 #include "ConstantsInternal.h"
 #include "FRC_NetworkCommunication/LoadOut.h"
 #include "HAL/AnalogTrigger.h"
+#include "HAL/ChipObject.h"
 #include "HAL/HAL.h"
 #include "HAL/Ports.h"
 #include "HAL/cpp/priority_mutex.h"
diff --git a/hal/lib/athena/DigitalInternal.h b/hal/lib/athena/DigitalInternal.h
index a432ddffcd..e0f791fcdf 100644
--- a/hal/lib/athena/DigitalInternal.h
+++ b/hal/lib/athena/DigitalInternal.h
@@ -11,8 +11,8 @@
 
 #include <memory>
 
-#include "ChipObject.h"
 #include "HAL/AnalogTrigger.h"
+#include "HAL/ChipObject.h"
 #include "HAL/Ports.h"
 #include "HAL/Types.h"
 #include "HAL/handles/DigitalHandleResource.h"
diff --git a/hal/lib/athena/Encoder.cpp b/hal/lib/athena/Encoder.cpp
index b611048032..807d504dbe 100644
--- a/hal/lib/athena/Encoder.cpp
+++ b/hal/lib/athena/Encoder.cpp
@@ -7,9 +7,9 @@
 
 #include "HAL/Encoder.h"
 
-#include "ChipObject.h"
 #include "EncoderInternal.h"
 #include "FPGAEncoder.h"
+#include "HAL/ChipObject.h"
 #include "HAL/Counter.h"
 #include "HAL/Errors.h"
 #include "HAL/handles/LimitedClassedHandleResource.h"
diff --git a/hal/lib/athena/HAL.cpp b/hal/lib/athena/HAL.cpp
index 2be97c5b53..83b7b0fd2e 100644
--- a/hal/lib/athena/HAL.cpp
+++ b/hal/lib/athena/HAL.cpp
@@ -17,10 +17,10 @@
 #include <mutex>
 #include <thread>
 
-#include "ChipObject.h"
 #include "FRC_NetworkCommunication/CANSessionMux.h"
 #include "FRC_NetworkCommunication/FRCComm.h"
 #include "FRC_NetworkCommunication/LoadOut.h"
+#include "HAL/ChipObject.h"
 #include "HAL/Errors.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "HAL/handles/HandlesInternal.h"
diff --git a/hal/lib/athena/Interrupts.cpp b/hal/lib/athena/Interrupts.cpp
index e42b30b01f..f47e9d2b76 100644
--- a/hal/lib/athena/Interrupts.cpp
+++ b/hal/lib/athena/Interrupts.cpp
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "ChipObject.h"
 #include "DigitalInternal.h"
+#include "HAL/ChipObject.h"
 #include "HAL/Errors.h"
 #include "HAL/cpp/make_unique.h"
 #include "HAL/handles/HandlesInternal.h"
diff --git a/hal/lib/athena/Notifier.cpp b/hal/lib/athena/Notifier.cpp
index cbde6ce978..7c9bba09a6 100644
--- a/hal/lib/athena/Notifier.cpp
+++ b/hal/lib/athena/Notifier.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <mutex>
 
-#include "ChipObject.h"
+#include "HAL/ChipObject.h"
 #include "HAL/HAL.h"
 #include "HAL/cpp/make_unique.h"
 #include "HAL/cpp/priority_mutex.h"
diff --git a/hal/lib/athena/PortsInternal.h b/hal/lib/athena/PortsInternal.h
index 28f638a058..185030b0da 100644
--- a/hal/lib/athena/PortsInternal.h
+++ b/hal/lib/athena/PortsInternal.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "ChipObject.h"
+#include "HAL/ChipObject.h"
 
 namespace hal {
 constexpr int32_t kNumAccumulators = tAccumulator::kNumSystems;
diff --git a/hal/lib/athena/Power.cpp b/hal/lib/athena/Power.cpp
index 53131572d8..51183ac643 100644
--- a/hal/lib/athena/Power.cpp
+++ b/hal/lib/athena/Power.cpp
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "ChipObject.h"
+#include "HAL/ChipObject.h"
 
 using namespace hal;
 
diff --git a/hal/lib/athena/Solenoid.cpp b/hal/lib/athena/Solenoid.cpp
index 756f3f7906..ef0e47a478 100644
--- a/hal/lib/athena/Solenoid.cpp
+++ b/hal/lib/athena/Solenoid.cpp
@@ -7,8 +7,8 @@
 
 #include "HAL/Solenoid.h"
 
-#include "ChipObject.h"
 #include "FRC_NetworkCommunication/LoadOut.h"
+#include "HAL/ChipObject.h"
 #include "HAL/Errors.h"
 #include "HAL/Ports.h"
 #include "HAL/handles/HandlesInternal.h"
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h b/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h b/ni-libraries/include/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/fpgainterfacecapi/NiFpga.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/printFpgaVersion.h b/ni-libraries/include/FRC_FPGA_ChipObject/printFpgaVersion.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/printFpgaVersion.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/printFpgaVersion.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h b/ni-libraries/include/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/tDMAChannelDescriptor.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/tDMAManager.h b/ni-libraries/include/FRC_FPGA_ChipObject/tDMAManager.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/tDMAManager.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/tDMAManager.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/tInterruptManager.h b/ni-libraries/include/FRC_FPGA_ChipObject/tInterruptManager.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/tInterruptManager.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/tInterruptManager.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/tSystem.h b/ni-libraries/include/FRC_FPGA_ChipObject/tSystem.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/tSystem.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/tSystem.h
diff --git a/hal/lib/athena/FRC_FPGA_ChipObject/tSystemInterface.h b/ni-libraries/include/FRC_FPGA_ChipObject/tSystemInterface.h
similarity index 100%
rename from hal/lib/athena/FRC_FPGA_ChipObject/tSystemInterface.h
rename to ni-libraries/include/FRC_FPGA_ChipObject/tSystemInterface.h
diff --git a/hal/lib/athena/FRC_NetworkCommunication/AICalibration.h b/ni-libraries/include/FRC_NetworkCommunication/AICalibration.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/AICalibration.h
rename to ni-libraries/include/FRC_NetworkCommunication/AICalibration.h
diff --git a/hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h b/ni-libraries/include/FRC_NetworkCommunication/CANInterfacePlugin.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h
rename to ni-libraries/include/FRC_NetworkCommunication/CANInterfacePlugin.h
diff --git a/hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h b/ni-libraries/include/FRC_NetworkCommunication/CANSessionMux.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/CANSessionMux.h
rename to ni-libraries/include/FRC_NetworkCommunication/CANSessionMux.h
diff --git a/hal/lib/athena/FRC_NetworkCommunication/FRCComm.h b/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/FRCComm.h
rename to ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
diff --git a/hal/lib/athena/FRC_NetworkCommunication/LoadOut.h b/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/LoadOut.h
rename to ni-libraries/include/FRC_NetworkCommunication/LoadOut.h
diff --git a/hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h b/ni-libraries/include/FRC_NetworkCommunication/UsageReporting.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h
rename to ni-libraries/include/FRC_NetworkCommunication/UsageReporting.h
diff --git a/hal/lib/athena/i2clib/i2c-lib.h b/ni-libraries/include/i2clib/i2c-lib.h
similarity index 100%
rename from hal/lib/athena/i2clib/i2c-lib.h
rename to ni-libraries/include/i2clib/i2c-lib.h
diff --git a/hal/lib/athena/spilib/spi-lib.h b/ni-libraries/include/spilib/spi-lib.h
similarity index 100%
rename from hal/lib/athena/spilib/spi-lib.h
rename to ni-libraries/include/spilib/spi-lib.h
diff --git a/ni-libraries/genlinks b/ni-libraries/lib/genlinks
similarity index 100%
rename from ni-libraries/genlinks
rename to ni-libraries/lib/genlinks
diff --git a/ni-libraries/libFRC_NetworkCommunication.so b/ni-libraries/lib/libFRC_NetworkCommunication.so
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunication.so
rename to ni-libraries/lib/libFRC_NetworkCommunication.so
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.17 b/ni-libraries/lib/libFRC_NetworkCommunication.so.17
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunication.so.17
rename to ni-libraries/lib/libFRC_NetworkCommunication.so.17
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.17.0 b/ni-libraries/lib/libFRC_NetworkCommunication.so.17.0
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunication.so.17.0
rename to ni-libraries/lib/libFRC_NetworkCommunication.so.17.0
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.17.0.0 b/ni-libraries/lib/libFRC_NetworkCommunication.so.17.0.0
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunication.so.17.0.0
rename to ni-libraries/lib/libFRC_NetworkCommunication.so.17.0.0
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so b/ni-libraries/lib/libFRC_NetworkCommunicationLV.so
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunicationLV.so
rename to ni-libraries/lib/libFRC_NetworkCommunicationLV.so
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.17 b/ni-libraries/lib/libFRC_NetworkCommunicationLV.so.17
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunicationLV.so.17
rename to ni-libraries/lib/libFRC_NetworkCommunicationLV.so.17
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0 b/ni-libraries/lib/libFRC_NetworkCommunicationLV.so.17.0
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunicationLV.so.17.0
rename to ni-libraries/lib/libFRC_NetworkCommunicationLV.so.17.0
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.17.0.0 b/ni-libraries/lib/libFRC_NetworkCommunicationLV.so.17.0.0
similarity index 100%
rename from ni-libraries/libFRC_NetworkCommunicationLV.so.17.0.0
rename to ni-libraries/lib/libFRC_NetworkCommunicationLV.so.17.0.0
diff --git a/ni-libraries/libGCBase_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/libGCBase_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/libGCBase_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/libGCBase_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libGenApi_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/libGenApi_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/libGenApi_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/libGenApi_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libLog_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/libLog_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/libLog_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/libLog_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libMathParser_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/libMathParser_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/libMathParser_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/libMathParser_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libNiFpga.so b/ni-libraries/lib/libNiFpga.so
similarity index 100%
rename from ni-libraries/libNiFpga.so
rename to ni-libraries/lib/libNiFpga.so
diff --git a/ni-libraries/libNiFpga.so.16 b/ni-libraries/lib/libNiFpga.so.16
similarity index 100%
rename from ni-libraries/libNiFpga.so.16
rename to ni-libraries/lib/libNiFpga.so.16
diff --git a/ni-libraries/libNiFpga.so.16.0 b/ni-libraries/lib/libNiFpga.so.16.0
similarity index 100%
rename from ni-libraries/libNiFpga.so.16.0
rename to ni-libraries/lib/libNiFpga.so.16.0
diff --git a/ni-libraries/libNiFpga.so.16.0.0 b/ni-libraries/lib/libNiFpga.so.16.0.0
similarity index 100%
rename from ni-libraries/libNiFpga.so.16.0.0
rename to ni-libraries/lib/libNiFpga.so.16.0.0
diff --git a/ni-libraries/libNiFpgaLv.so b/ni-libraries/lib/libNiFpgaLv.so
similarity index 100%
rename from ni-libraries/libNiFpgaLv.so
rename to ni-libraries/lib/libNiFpgaLv.so
diff --git a/ni-libraries/libNiFpgaLv.so.16 b/ni-libraries/lib/libNiFpgaLv.so.16
similarity index 100%
rename from ni-libraries/libNiFpgaLv.so.16
rename to ni-libraries/lib/libNiFpgaLv.so.16
diff --git a/ni-libraries/libNiFpgaLv.so.16.0 b/ni-libraries/lib/libNiFpgaLv.so.16.0
similarity index 100%
rename from ni-libraries/libNiFpgaLv.so.16.0
rename to ni-libraries/lib/libNiFpgaLv.so.16.0
diff --git a/ni-libraries/libNiFpgaLv.so.16.0.0 b/ni-libraries/lib/libNiFpgaLv.so.16.0.0
similarity index 100%
rename from ni-libraries/libNiFpgaLv.so.16.0.0
rename to ni-libraries/lib/libNiFpgaLv.so.16.0.0
diff --git a/ni-libraries/libNiRioSrv.so b/ni-libraries/lib/libNiRioSrv.so
similarity index 100%
rename from ni-libraries/libNiRioSrv.so
rename to ni-libraries/lib/libNiRioSrv.so
diff --git a/ni-libraries/libNiRioSrv.so.16 b/ni-libraries/lib/libNiRioSrv.so.16
similarity index 100%
rename from ni-libraries/libNiRioSrv.so.16
rename to ni-libraries/lib/libNiRioSrv.so.16
diff --git a/ni-libraries/libNiRioSrv.so.16.0 b/ni-libraries/lib/libNiRioSrv.so.16.0
similarity index 100%
rename from ni-libraries/libNiRioSrv.so.16.0
rename to ni-libraries/lib/libNiRioSrv.so.16.0
diff --git a/ni-libraries/libNiRioSrv.so.16.0.0 b/ni-libraries/lib/libNiRioSrv.so.16.0.0
similarity index 100%
rename from ni-libraries/libNiRioSrv.so.16.0.0
rename to ni-libraries/lib/libNiRioSrv.so.16.0.0
diff --git a/ni-libraries/libNodeMapData_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/libNodeMapData_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/libNodeMapData_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/libNodeMapData_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so
similarity index 100%
rename from ni-libraries/libRoboRIO_FRC_ChipObject.so
rename to ni-libraries/lib/libRoboRIO_FRC_ChipObject.so
diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.17 b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.17
similarity index 100%
rename from ni-libraries/libRoboRIO_FRC_ChipObject.so.17
rename to ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.17
diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0 b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.17.0
similarity index 100%
rename from ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0
rename to ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.17.0
diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0.0 b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.17.0.0
similarity index 100%
rename from ni-libraries/libRoboRIO_FRC_ChipObject.so.17.0.0
rename to ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.17.0.0
diff --git a/ni-libraries/libXmlParser_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/libXmlParser_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/libXmlParser_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/libXmlParser_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libavcodec.so b/ni-libraries/lib/libavcodec.so
similarity index 100%
rename from ni-libraries/libavcodec.so
rename to ni-libraries/lib/libavcodec.so
diff --git a/ni-libraries/libavcodec.so.54 b/ni-libraries/lib/libavcodec.so.54
similarity index 100%
rename from ni-libraries/libavcodec.so.54
rename to ni-libraries/lib/libavcodec.so.54
diff --git a/ni-libraries/libavcodec.so.54.59 b/ni-libraries/lib/libavcodec.so.54.59
similarity index 100%
rename from ni-libraries/libavcodec.so.54.59
rename to ni-libraries/lib/libavcodec.so.54.59
diff --git a/ni-libraries/libavcodec.so.54.59.100 b/ni-libraries/lib/libavcodec.so.54.59.100
similarity index 100%
rename from ni-libraries/libavcodec.so.54.59.100
rename to ni-libraries/lib/libavcodec.so.54.59.100
diff --git a/ni-libraries/libavformat.so b/ni-libraries/lib/libavformat.so
similarity index 100%
rename from ni-libraries/libavformat.so
rename to ni-libraries/lib/libavformat.so
diff --git a/ni-libraries/libavformat.so.54 b/ni-libraries/lib/libavformat.so.54
similarity index 100%
rename from ni-libraries/libavformat.so.54
rename to ni-libraries/lib/libavformat.so.54
diff --git a/ni-libraries/libavformat.so.54.29 b/ni-libraries/lib/libavformat.so.54.29
similarity index 100%
rename from ni-libraries/libavformat.so.54.29
rename to ni-libraries/lib/libavformat.so.54.29
diff --git a/ni-libraries/libavformat.so.54.29.104 b/ni-libraries/lib/libavformat.so.54.29.104
similarity index 100%
rename from ni-libraries/libavformat.so.54.29.104
rename to ni-libraries/lib/libavformat.so.54.29.104
diff --git a/ni-libraries/libavutil.so b/ni-libraries/lib/libavutil.so
similarity index 100%
rename from ni-libraries/libavutil.so
rename to ni-libraries/lib/libavutil.so
diff --git a/ni-libraries/libavutil.so.51 b/ni-libraries/lib/libavutil.so.51
similarity index 100%
rename from ni-libraries/libavutil.so.51
rename to ni-libraries/lib/libavutil.so.51
diff --git a/ni-libraries/libavutil.so.51.73 b/ni-libraries/lib/libavutil.so.51.73
similarity index 100%
rename from ni-libraries/libavutil.so.51.73
rename to ni-libraries/lib/libavutil.so.51.73
diff --git a/ni-libraries/libavutil.so.51.73.101 b/ni-libraries/lib/libavutil.so.51.73.101
similarity index 100%
rename from ni-libraries/libavutil.so.51.73.101
rename to ni-libraries/lib/libavutil.so.51.73.101
diff --git a/ni-libraries/libi2c.so b/ni-libraries/lib/libi2c.so
similarity index 100%
rename from ni-libraries/libi2c.so
rename to ni-libraries/lib/libi2c.so
diff --git a/ni-libraries/libi2c.so.2 b/ni-libraries/lib/libi2c.so.2
similarity index 100%
rename from ni-libraries/libi2c.so.2
rename to ni-libraries/lib/libi2c.so.2
diff --git a/ni-libraries/libi2c.so.2.0 b/ni-libraries/lib/libi2c.so.2.0
similarity index 100%
rename from ni-libraries/libi2c.so.2.0
rename to ni-libraries/lib/libi2c.so.2.0
diff --git a/ni-libraries/libi2c.so.2.0.0 b/ni-libraries/lib/libi2c.so.2.0.0
similarity index 100%
rename from ni-libraries/libi2c.so.2.0.0
rename to ni-libraries/lib/libi2c.so.2.0.0
diff --git a/ni-libraries/liblog4cpp_gcc-4.4-arm_v3_0_NI.so b/ni-libraries/lib/liblog4cpp_gcc-4.4-arm_v3_0_NI.so
similarity index 100%
rename from ni-libraries/liblog4cpp_gcc-4.4-arm_v3_0_NI.so
rename to ni-libraries/lib/liblog4cpp_gcc-4.4-arm_v3_0_NI.so
diff --git a/ni-libraries/libni_emb.so b/ni-libraries/lib/libni_emb.so
similarity index 100%
rename from ni-libraries/libni_emb.so
rename to ni-libraries/lib/libni_emb.so
diff --git a/ni-libraries/libni_emb.so.9 b/ni-libraries/lib/libni_emb.so.9
similarity index 100%
rename from ni-libraries/libni_emb.so.9
rename to ni-libraries/lib/libni_emb.so.9
diff --git a/ni-libraries/libni_emb.so.9.0 b/ni-libraries/lib/libni_emb.so.9.0
similarity index 100%
rename from ni-libraries/libni_emb.so.9.0
rename to ni-libraries/lib/libni_emb.so.9.0
diff --git a/ni-libraries/libni_emb.so.9.0.0 b/ni-libraries/lib/libni_emb.so.9.0.0
similarity index 100%
rename from ni-libraries/libni_emb.so.9.0.0
rename to ni-libraries/lib/libni_emb.so.9.0.0
diff --git a/ni-libraries/libni_rtlog.so b/ni-libraries/lib/libni_rtlog.so
similarity index 100%
rename from ni-libraries/libni_rtlog.so
rename to ni-libraries/lib/libni_rtlog.so
diff --git a/ni-libraries/libni_rtlog.so.2 b/ni-libraries/lib/libni_rtlog.so.2
similarity index 100%
rename from ni-libraries/libni_rtlog.so.2
rename to ni-libraries/lib/libni_rtlog.so.2
diff --git a/ni-libraries/libni_rtlog.so.2.5 b/ni-libraries/lib/libni_rtlog.so.2.5
similarity index 100%
rename from ni-libraries/libni_rtlog.so.2.5
rename to ni-libraries/lib/libni_rtlog.so.2.5
diff --git a/ni-libraries/libni_rtlog.so.2.5.0 b/ni-libraries/lib/libni_rtlog.so.2.5.0
similarity index 100%
rename from ni-libraries/libni_rtlog.so.2.5.0
rename to ni-libraries/lib/libni_rtlog.so.2.5.0
diff --git a/ni-libraries/libniimaqdx.so b/ni-libraries/lib/libniimaqdx.so
similarity index 100%
rename from ni-libraries/libniimaqdx.so
rename to ni-libraries/lib/libniimaqdx.so
diff --git a/ni-libraries/libniimaqdx.so.15 b/ni-libraries/lib/libniimaqdx.so.15
similarity index 100%
rename from ni-libraries/libniimaqdx.so.15
rename to ni-libraries/lib/libniimaqdx.so.15
diff --git a/ni-libraries/libniimaqdx.so.15.5 b/ni-libraries/lib/libniimaqdx.so.15.5
similarity index 100%
rename from ni-libraries/libniimaqdx.so.15.5
rename to ni-libraries/lib/libniimaqdx.so.15.5
diff --git a/ni-libraries/libniimaqdx.so.15.5.0 b/ni-libraries/lib/libniimaqdx.so.15.5.0
similarity index 100%
rename from ni-libraries/libniimaqdx.so.15.5.0
rename to ni-libraries/lib/libniimaqdx.so.15.5.0
diff --git a/ni-libraries/libnilibraries.so b/ni-libraries/lib/libnilibraries.so
similarity index 100%
rename from ni-libraries/libnilibraries.so
rename to ni-libraries/lib/libnilibraries.so
diff --git a/ni-libraries/libnipalu.so b/ni-libraries/lib/libnipalu.so
similarity index 100%
rename from ni-libraries/libnipalu.so
rename to ni-libraries/lib/libnipalu.so
diff --git a/ni-libraries/libnipalu.so.16 b/ni-libraries/lib/libnipalu.so.16
similarity index 100%
rename from ni-libraries/libnipalu.so.16
rename to ni-libraries/lib/libnipalu.so.16
diff --git a/ni-libraries/libnipalu.so.16.0 b/ni-libraries/lib/libnipalu.so.16.0
similarity index 100%
rename from ni-libraries/libnipalu.so.16.0
rename to ni-libraries/lib/libnipalu.so.16.0
diff --git a/ni-libraries/libnipalu.so.16.0.0 b/ni-libraries/lib/libnipalu.so.16.0.0
similarity index 100%
rename from ni-libraries/libnipalu.so.16.0.0
rename to ni-libraries/lib/libnipalu.so.16.0.0
diff --git a/ni-libraries/libnirio_emb_can.so b/ni-libraries/lib/libnirio_emb_can.so
similarity index 100%
rename from ni-libraries/libnirio_emb_can.so
rename to ni-libraries/lib/libnirio_emb_can.so
diff --git a/ni-libraries/libnirio_emb_can.so.16 b/ni-libraries/lib/libnirio_emb_can.so.16
similarity index 100%
rename from ni-libraries/libnirio_emb_can.so.16
rename to ni-libraries/lib/libnirio_emb_can.so.16
diff --git a/ni-libraries/libnirio_emb_can.so.16.0 b/ni-libraries/lib/libnirio_emb_can.so.16.0
similarity index 100%
rename from ni-libraries/libnirio_emb_can.so.16.0
rename to ni-libraries/lib/libnirio_emb_can.so.16.0
diff --git a/ni-libraries/libnirio_emb_can.so.16.0.0 b/ni-libraries/lib/libnirio_emb_can.so.16.0.0
similarity index 100%
rename from ni-libraries/libnirio_emb_can.so.16.0.0
rename to ni-libraries/lib/libnirio_emb_can.so.16.0.0
diff --git a/ni-libraries/libniriodevenum.so b/ni-libraries/lib/libniriodevenum.so
similarity index 100%
rename from ni-libraries/libniriodevenum.so
rename to ni-libraries/lib/libniriodevenum.so
diff --git a/ni-libraries/libniriodevenum.so.16 b/ni-libraries/lib/libniriodevenum.so.16
similarity index 100%
rename from ni-libraries/libniriodevenum.so.16
rename to ni-libraries/lib/libniriodevenum.so.16
diff --git a/ni-libraries/libniriodevenum.so.16.0 b/ni-libraries/lib/libniriodevenum.so.16.0
similarity index 100%
rename from ni-libraries/libniriodevenum.so.16.0
rename to ni-libraries/lib/libniriodevenum.so.16.0
diff --git a/ni-libraries/libniriodevenum.so.16.0.0 b/ni-libraries/lib/libniriodevenum.so.16.0.0
similarity index 100%
rename from ni-libraries/libniriodevenum.so.16.0.0
rename to ni-libraries/lib/libniriodevenum.so.16.0.0
diff --git a/ni-libraries/libniriosession.so b/ni-libraries/lib/libniriosession.so
similarity index 100%
rename from ni-libraries/libniriosession.so
rename to ni-libraries/lib/libniriosession.so
diff --git a/ni-libraries/libniriosession.so.16 b/ni-libraries/lib/libniriosession.so.16
similarity index 100%
rename from ni-libraries/libniriosession.so.16
rename to ni-libraries/lib/libniriosession.so.16
diff --git a/ni-libraries/libniriosession.so.16.0 b/ni-libraries/lib/libniriosession.so.16.0
similarity index 100%
rename from ni-libraries/libniriosession.so.16.0
rename to ni-libraries/lib/libniriosession.so.16.0
diff --git a/ni-libraries/libniriosession.so.16.0.0 b/ni-libraries/lib/libniriosession.so.16.0.0
similarity index 100%
rename from ni-libraries/libniriosession.so.16.0.0
rename to ni-libraries/lib/libniriosession.so.16.0.0
diff --git a/ni-libraries/libnivision.so b/ni-libraries/lib/libnivision.so
similarity index 100%
rename from ni-libraries/libnivision.so
rename to ni-libraries/lib/libnivision.so
diff --git a/ni-libraries/libnivision.so.16 b/ni-libraries/lib/libnivision.so.16
similarity index 100%
rename from ni-libraries/libnivision.so.16
rename to ni-libraries/lib/libnivision.so.16
diff --git a/ni-libraries/libnivision.so.16.0 b/ni-libraries/lib/libnivision.so.16.0
similarity index 100%
rename from ni-libraries/libnivision.so.16.0
rename to ni-libraries/lib/libnivision.so.16.0
diff --git a/ni-libraries/libnivision.so.16.0.0 b/ni-libraries/lib/libnivision.so.16.0.0
similarity index 100%
rename from ni-libraries/libnivision.so.16.0.0
rename to ni-libraries/lib/libnivision.so.16.0.0
diff --git a/ni-libraries/libnivissvc.so b/ni-libraries/lib/libnivissvc.so
similarity index 100%
rename from ni-libraries/libnivissvc.so
rename to ni-libraries/lib/libnivissvc.so
diff --git a/ni-libraries/libnivissvc.so.16 b/ni-libraries/lib/libnivissvc.so.16
similarity index 100%
rename from ni-libraries/libnivissvc.so.16
rename to ni-libraries/lib/libnivissvc.so.16
diff --git a/ni-libraries/libnivissvc.so.16.0 b/ni-libraries/lib/libnivissvc.so.16.0
similarity index 100%
rename from ni-libraries/libnivissvc.so.16.0
rename to ni-libraries/lib/libnivissvc.so.16.0
diff --git a/ni-libraries/libnivissvc.so.16.0.0 b/ni-libraries/lib/libnivissvc.so.16.0.0
similarity index 100%
rename from ni-libraries/libnivissvc.so.16.0.0
rename to ni-libraries/lib/libnivissvc.so.16.0.0
diff --git a/ni-libraries/libspi.so b/ni-libraries/lib/libspi.so
similarity index 100%
rename from ni-libraries/libspi.so
rename to ni-libraries/lib/libspi.so
diff --git a/ni-libraries/libspi.so.1 b/ni-libraries/lib/libspi.so.1
similarity index 100%
rename from ni-libraries/libspi.so.1
rename to ni-libraries/lib/libspi.so.1
diff --git a/ni-libraries/libspi.so.1.0 b/ni-libraries/lib/libspi.so.1.0
similarity index 100%
rename from ni-libraries/libspi.so.1.0
rename to ni-libraries/lib/libspi.so.1.0
diff --git a/ni-libraries/libspi.so.1.0.0 b/ni-libraries/lib/libspi.so.1.0.0
old mode 100755
new mode 100644
similarity index 100%
rename from ni-libraries/libspi.so.1.0.0
rename to ni-libraries/lib/libspi.so.1.0.0
diff --git a/ni-libraries/libswscale.so b/ni-libraries/lib/libswscale.so
similarity index 100%
rename from ni-libraries/libswscale.so
rename to ni-libraries/lib/libswscale.so
diff --git a/ni-libraries/libswscale.so.2 b/ni-libraries/lib/libswscale.so.2
similarity index 100%
rename from ni-libraries/libswscale.so.2
rename to ni-libraries/lib/libswscale.so.2
diff --git a/ni-libraries/libswscale.so.2.1 b/ni-libraries/lib/libswscale.so.2.1
similarity index 100%
rename from ni-libraries/libswscale.so.2.1
rename to ni-libraries/lib/libswscale.so.2.1
diff --git a/ni-libraries/libswscale.so.2.1.101 b/ni-libraries/lib/libswscale.so.2.1.101
similarity index 100%
rename from ni-libraries/libswscale.so.2.1.101
rename to ni-libraries/lib/libswscale.so.2.1.101
diff --git a/ni-libraries/libvisa.so b/ni-libraries/lib/libvisa.so
old mode 100755
new mode 100644
similarity index 100%
rename from ni-libraries/libvisa.so
rename to ni-libraries/lib/libvisa.so
diff --git a/ni-libraries/libwpi.so b/ni-libraries/lib/libwpi.so
similarity index 100%
rename from ni-libraries/libwpi.so
rename to ni-libraries/lib/libwpi.so