Move HAL classes to their own base package (#1317)

Needed for modularization.

hal/src/main/java/edu/wpi/first/hal/AccelerometerJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class AccelerometerJNI extends JNIWrapper {
   public static native void setAccelerometerActive(boolean active);

hal/src/main/java/edu/wpi/first/hal/AccumulatorResult.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj;
+package edu.wpi.first.hal;
 
 /**
  * Structure for holding the values stored in an accumulator.

hal/src/main/java/edu/wpi/first/hal/AllianceStationID.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public enum AllianceStationID {
   Red1, Red2, Red3, Blue1, Blue2, Blue3

hal/src/main/java/edu/wpi/first/hal/AnalogGyroJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class AnalogGyroJNI extends JNIWrapper {
   public static native int initializeAnalogGyro(int halAnalogInputHandle);

hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java

@@ -5,12 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 import java.nio.IntBuffer;
 
-import edu.wpi.first.wpilibj.AccumulatorResult;
-
 public class AnalogJNI extends JNIWrapper {
   /**
    * <i>native declaration : AthenaJava\target\native\include\HAL\Analog.h:58</i><br> enum values

hal/src/main/java/edu/wpi/first/hal/CANAPIJNI.java

@@ -5,9 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
-
-import edu.wpi.first.wpilibj.CANData;
+package edu.wpi.first.hal;
 
 @SuppressWarnings("AbbreviationAsWordInName")
 public class CANAPIJNI extends JNIWrapper {

hal/src/main/java/edu/wpi/first/hal/CANData.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj;
+package edu.wpi.first.hal;
 
 public class CANData {
   @SuppressWarnings("MemberName")

hal/src/main/java/edu/wpi/first/hal/CompressorJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class CompressorJNI extends JNIWrapper {
   public static native int initializeCompressor(byte module);

hal/src/main/java/edu/wpi/first/hal/ConstantsJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class ConstantsJNI extends JNIWrapper {
   public static native int getSystemClockTicksPerMicrosecond();

hal/src/main/java/edu/wpi/first/hal/ControlWord.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 /**
  * A wrapper for the HALControlWord bitfield.

hal/src/main/java/edu/wpi/first/hal/CounterJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 import java.nio.IntBuffer;
 

hal/src/main/java/edu/wpi/first/hal/DIOJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 @SuppressWarnings("AbbreviationAsWordInName")
 public class DIOJNI extends JNIWrapper {

hal/src/main/java/edu/wpi/first/hal/DigitalGlitchFilterJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class DigitalGlitchFilterJNI extends JNIWrapper {
   public static native void setFilterSelect(int digitalPortHandle, int filterIndex);

hal/src/main/java/edu/wpi/first/hal/EncoderJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class EncoderJNI extends JNIWrapper {
   public static native int initializeEncoder(int digitalSourceHandleA, int analogTriggerTypeA,

hal/src/main/java/edu/wpi/first/hal/HAL.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 import java.nio.ByteBuffer;
 

hal/src/main/java/edu/wpi/first/hal/HALUtil.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 @SuppressWarnings("AbbreviationAsWordInName")
 public final class HALUtil extends JNIWrapper {

hal/src/main/java/edu/wpi/first/hal/I2CJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 import java.nio.ByteBuffer;
 

hal/src/main/java/edu/wpi/first/hal/InterruptJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class InterruptJNI extends JNIWrapper {
   public static final int HalInvalidHandle = 0;

hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 import java.io.IOException;
 

hal/src/main/java/edu/wpi/first/hal/MatchInfoData.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 /**
  * Structure for holding the match info data request.

hal/src/main/java/edu/wpi/first/hal/NotifierJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 /**
  * The NotifierJNI class directly wraps the C++ HAL Notifier.

hal/src/main/java/edu/wpi/first/hal/PDPJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 @SuppressWarnings("AbbreviationAsWordInName")
 public class PDPJNI extends JNIWrapper {

hal/src/main/java/edu/wpi/first/hal/PWMConfigDataResult.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj;
+package edu.wpi.first.hal;
 
 /**
  * Structure for holding the config data result for PWM.

hal/src/main/java/edu/wpi/first/hal/PWMJNI.java

@@ -5,9 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
-
-import edu.wpi.first.wpilibj.PWMConfigDataResult;
+package edu.wpi.first.hal;
 
 @SuppressWarnings("AbbreviationAsWordInName")
 public class PWMJNI extends DIOJNI {

hal/src/main/java/edu/wpi/first/hal/PortsJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class PortsJNI extends JNIWrapper {
   public static native int getNumAccumulators();

hal/src/main/java/edu/wpi/first/hal/PowerJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class PowerJNI extends JNIWrapper {
   public static native double getVinVoltage();

hal/src/main/java/edu/wpi/first/hal/RelayJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class RelayJNI extends DIOJNI {
   public static native int initializeRelayPort(int halPortHandle, boolean forward);

hal/src/main/java/edu/wpi/first/hal/SPIJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 import java.nio.ByteBuffer;
 

hal/src/main/java/edu/wpi/first/hal/SerialPortJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class SerialPortJNI extends JNIWrapper {
   public static native void serialInitializePort(byte port);

hal/src/main/java/edu/wpi/first/hal/SolenoidJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class SolenoidJNI extends JNIWrapper {
   public static native int initializeSolenoidPort(int halPortHandle);

hal/src/main/java/edu/wpi/first/hal/ThreadsJNI.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.hal;
+package edu.wpi.first.hal;
 
 public class ThreadsJNI extends JNIWrapper {
   public static native int getCurrentThreadPriority();

hal/src/main/java/edu/wpi/first/hal/can/CANExceptionFactory.java

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
-import edu.wpi.first.wpilibj.communication.NIRioStatus;
-import edu.wpi.first.wpilibj.util.UncleanStatusException;
+import edu.wpi.first.hal.communication.NIRioStatus;
+import edu.wpi.first.hal.util.UncleanStatusException;
 
 public final class CANExceptionFactory {
   // FRC Error codes

hal/src/main/java/edu/wpi/first/hal/can/CANInvalidBufferException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
 /**
  * Exception indicating that a CAN driver library entry-point was passed an invalid buffer.

hal/src/main/java/edu/wpi/first/hal/can/CANJNI.java

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.JNIWrapper;
 
 @SuppressWarnings("AbbreviationAsWordInName")
 public class CANJNI extends JNIWrapper {

hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotAllowedException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
 /**
  * Exception indicating that the Jaguar CAN Driver layer refused to send a restricted message ID to

hal/src/main/java/edu/wpi/first/hal/can/CANMessageNotFoundException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
 /**
  * Exception indicating that a can message is not available from Network Communications. This

hal/src/main/java/edu/wpi/first/hal/can/CANNotInitializedException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
 /**
  * Exception indicating that the CAN driver layer has not been initialized. This happens when an

hal/src/main/java/edu/wpi/first/hal/can/CANStatus.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.can;
+package edu.wpi.first.hal.can;
 
 /**
  * Structure for holding the result of a CAN Status request.

hal/src/main/java/edu/wpi/first/hal/communication/NIRioStatus.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.communication;
+package edu.wpi.first.hal.communication;
 
 public class NIRioStatus {
   public static final int kRioStatusOffset = -63000;

hal/src/main/java/edu/wpi/first/hal/sim/AccelerometerSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.AccelerometerDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/AnalogGyroSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.AnalogGyroDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/AnalogInSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.AnalogInDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/AnalogOutSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.AnalogOutDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/AnalogTriggerSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.AnalogTriggerDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/BufferCallback.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 public interface BufferCallback {
   void callback(String name, byte[] buffer, int count);

hal/src/main/java/edu/wpi/first/hal/sim/CallbackStore.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 public class CallbackStore implements AutoCloseable {
   interface CancelCallbackFunc {

hal/src/main/java/edu/wpi/first/hal/sim/ConstBufferCallback.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 public interface ConstBufferCallback {
   void callback(String name, byte[] buffer, int count);

hal/src/main/java/edu/wpi/first/hal/sim/DIOSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.DIODataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/DigitalPWMSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.DigitalPWMDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/DriverStationSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.DriverStationDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/EncoderSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.EncoderDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/I2CSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.I2CDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/NotifyCallback.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 public interface NotifyCallback {
   void callback(String name, SimValue value);

hal/src/main/java/edu/wpi/first/hal/sim/PCMSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.PCMDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/PDPSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.PDPDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/PWMSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.PWMDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/RelaySim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.RelayDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/RoboRioSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.RoboRioDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/SPIAccelerometerSim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.SPIAccelerometerDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/SPISim.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.SPIDataJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/SimHooks.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 import edu.wpi.first.hal.sim.mockdata.SimulatorJNI;
 

hal/src/main/java/edu/wpi/first/hal/sim/SimValue.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 public final class SimValue {
   private boolean m_boolean;

hal/src/main/java/edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.sim;
+package edu.wpi.first.hal.sim;
 
 public interface SpiReadAutoReceiveBufferCallback {
   int callback(String name, byte[] buffer, int numToRead);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AccelerometerDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class AccelerometerDataJNI extends JNIWrapper {
   public static native int registerActiveCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogGyroDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class AnalogGyroDataJNI extends JNIWrapper {
   public static native int registerAngleCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogInDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class AnalogInDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogOutDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class AnalogOutDataJNI extends JNIWrapper {
   public static native int registerVoltageCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/AnalogTriggerDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class AnalogTriggerDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DIODataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class DIODataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DigitalPWMDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class DigitalPWMDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
 
 public class DriverStationDataJNI extends JNIWrapper {
   public static native int registerEnabledCallback(NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/EncoderDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class EncoderDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/I2CDataJNI.java

@@ -7,10 +7,10 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.BufferCallback;
-import edu.wpi.first.wpilibj.sim.ConstBufferCallback;
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.BufferCallback;
+import edu.wpi.first.hal.sim.ConstBufferCallback;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class I2CDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PCMDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class PCMDataJNI extends JNIWrapper {
   public static native int registerSolenoidInitializedCallback(int index, int channel, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PDPDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class PDPDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/PWMDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class PWMDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RelayDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class RelayDataJNI extends JNIWrapper {
   public static native int registerInitializedForwardCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/RoboRioDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class RoboRioDataJNI extends JNIWrapper {
   public static native int registerFPGAButtonCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIAccelerometerDataJNI.java

@@ -7,8 +7,8 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class SPIAccelerometerDataJNI extends JNIWrapper {
   public static native int registerActiveCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SPIDataJNI.java

@@ -7,11 +7,11 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.sim.BufferCallback;
-import edu.wpi.first.wpilibj.sim.ConstBufferCallback;
-import edu.wpi.first.wpilibj.sim.NotifyCallback;
-import edu.wpi.first.wpilibj.sim.SpiReadAutoReceiveBufferCallback;
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.sim.BufferCallback;
+import edu.wpi.first.hal.sim.ConstBufferCallback;
+import edu.wpi.first.hal.sim.NotifyCallback;
+import edu.wpi.first.hal.sim.SpiReadAutoReceiveBufferCallback;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class SPIDataJNI extends JNIWrapper {
   public static native int registerInitializedCallback(int index, NotifyCallback callback, boolean initialNotify);

hal/src/main/java/edu/wpi/first/hal/sim/mockdata/SimulatorJNI.java

@@ -7,7 +7,7 @@
 
 package edu.wpi.first.hal.sim.mockdata;
 
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
+import edu.wpi.first.hal.JNIWrapper;
 
 public class SimulatorJNI extends JNIWrapper {
   public static native void waitForProgramStart();

hal/src/main/java/edu/wpi/first/hal/util/AllocationException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.util;
+package edu.wpi.first.hal.util;
 
 /**
  * Exception indicating that the resource is already allocated.

hal/src/main/java/edu/wpi/first/hal/util/BoundaryException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.util;
+package edu.wpi.first.hal.util;
 
 /**
  * This exception represents an error in which a lower limit was set as higher than an upper limit.

hal/src/main/java/edu/wpi/first/hal/util/CheckedAllocationException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.util;
+package edu.wpi.first.hal.util;
 
 /**
  * Exception indicating that the resource is already allocated This is meant to be thrown by the

hal/src/main/java/edu/wpi/first/hal/util/HalHandleException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.util;
+package edu.wpi.first.hal.util;
 
 /**
  * Exception indicating that an error has occured with a HAL Handle.

hal/src/main/java/edu/wpi/first/hal/util/UncleanStatusException.java

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.wpilibj.util;
+package edu.wpi.first.hal.util;
 
 /**
  * Exception for bad status codes from the chip object.