diff --git a/src/main/java/common/core/subsystems/NAR_PIDSubsystem.java b/src/main/java/common/core/subsystems/NAR_PIDSubsystem.java
index 74ed10d..d0c1b3c 100644
--- a/src/main/java/common/core/subsystems/NAR_PIDSubsystem.java
+++ b/src/main/java/common/core/subsystems/NAR_PIDSubsystem.java
@@ -5,7 +5,7 @@
 
 import common.core.controllers.Controller;
 import common.core.controllers.Controller.Type;
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
 import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.wpilibj2.command.PIDSubsystem;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
diff --git a/src/main/java/common/core/subsystems/NAR_ProfiledPIDSubsystem.java b/src/main/java/common/core/subsystems/NAR_ProfiledPIDSubsystem.java
index 22b0a62..64d8e6f 100644
--- a/src/main/java/common/core/subsystems/NAR_ProfiledPIDSubsystem.java
+++ b/src/main/java/common/core/subsystems/NAR_ProfiledPIDSubsystem.java
@@ -3,7 +3,7 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.DoubleSupplier;
 
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
 import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.math.controller.ProfiledPIDController;
 import edu.wpi.first.math.trajectory.TrapezoidProfile;
diff --git a/src/main/java/common/swerveNeo/CTREConfigs.java b/src/main/java/common/core/swerve/CTREConfigs.java
similarity index 96%
rename from src/main/java/common/swerveNeo/CTREConfigs.java
rename to src/main/java/common/core/swerve/CTREConfigs.java
index b36bfd0..9eba077 100644
--- a/src/main/java/common/swerveNeo/CTREConfigs.java
+++ b/src/main/java/common/core/swerve/CTREConfigs.java
@@ -1,4 +1,6 @@
-package common.swerveNeo;
+package common.core.swerve;
+
+import static common.core.swerve.SwerveConstants.*;
 
 import com.ctre.phoenix.motorcontrol.SupplyCurrentLimitConfiguration;
 import com.ctre.phoenix.motorcontrol.can.TalonFXConfiguration;
@@ -7,8 +9,6 @@
 import com.ctre.phoenix.sensors.SensorInitializationStrategy;
 import com.ctre.phoenix.sensors.SensorTimeBase;
 
-import static common.swerveNeo.SwerveConstants.*;
-
 /**
  * Team 3128's defaults
  */
diff --git a/src/main/java/common/swerveNeo/CTREModuleState.java b/src/main/java/common/core/swerve/CTREModuleState.java
similarity index 98%
rename from src/main/java/common/swerveNeo/CTREModuleState.java
rename to src/main/java/common/core/swerve/CTREModuleState.java
index 4d9b385..2b1305f 100644
--- a/src/main/java/common/swerveNeo/CTREModuleState.java
+++ b/src/main/java/common/core/swerve/CTREModuleState.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 import edu.wpi.first.math.geometry.Rotation2d;
 import edu.wpi.first.math.kinematics.SwerveModuleState;
diff --git a/src/main/java/common/swerveNeo/SwerveConstants.java b/src/main/java/common/core/swerve/SwerveConstants.java
similarity index 95%
rename from src/main/java/common/swerveNeo/SwerveConstants.java
rename to src/main/java/common/core/swerve/SwerveConstants.java
index 05f435b..fc8fb65 100644
--- a/src/main/java/common/swerveNeo/SwerveConstants.java
+++ b/src/main/java/common/core/swerve/SwerveConstants.java
@@ -1,6 +1,6 @@
-package common.swerveNeo;
+package common.core.swerve;
 
-import common.swerveNeo.SwerveModule.ModuleType;
+import common.core.swerve.SwerveModule.ModuleType;
 import edu.wpi.first.math.util.Units;;
 
 /**
diff --git a/src/main/java/common/swerveNeo/SwerveConversions.java b/src/main/java/common/core/swerve/SwerveConversions.java
similarity index 98%
rename from src/main/java/common/swerveNeo/SwerveConversions.java
rename to src/main/java/common/core/swerve/SwerveConversions.java
index d0691d1..9a2b363 100644
--- a/src/main/java/common/swerveNeo/SwerveConversions.java
+++ b/src/main/java/common/core/swerve/SwerveConversions.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 /**
  * Team 3128's conversion class for Swerve
diff --git a/src/main/java/common/swerveNeo/SwerveModule.java b/src/main/java/common/core/swerve/SwerveModule.java
similarity index 98%
rename from src/main/java/common/swerveNeo/SwerveModule.java
rename to src/main/java/common/core/swerve/SwerveModule.java
index 3b200f6..67c3046 100644
--- a/src/main/java/common/swerveNeo/SwerveModule.java
+++ b/src/main/java/common/core/swerve/SwerveModule.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.math.controller.SimpleMotorFeedforward;
@@ -6,6 +6,9 @@
 import edu.wpi.first.math.kinematics.SwerveModulePosition;
 import edu.wpi.first.math.kinematics.SwerveModuleState;
 
+import static common.core.swerve.SwerveConstants.*;
+import static common.core.swerve.SwerveConversions.*;
+
 import com.ctre.phoenix.sensors.CANCoder;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
@@ -16,9 +19,6 @@
 import common.hardware.motorcontroller.NAR_Motor.Control;
 import common.hardware.motorcontroller.NAR_Motor.Neutral;
 
-import static common.swerveNeo.SwerveConstants.*;
-import static common.swerveNeo.SwerveConversions.*;
-
 
 /**
  * Team 3128's Swerve Module class
diff --git a/src/main/java/common/swerveNeo/SwerveModuleConstants.java b/src/main/java/common/core/swerve/SwerveModuleConstants.java
similarity index 95%
rename from src/main/java/common/swerveNeo/SwerveModuleConstants.java
rename to src/main/java/common/core/swerve/SwerveModuleConstants.java
index c5f3a89..78ad27f 100644
--- a/src/main/java/common/swerveNeo/SwerveModuleConstants.java
+++ b/src/main/java/common/core/swerve/SwerveModuleConstants.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 public class SwerveModuleConstants {
     public final int driveMotorID;
diff --git a/src/main/java/common/hardware/motorcontroller/NAR_CANSparkMax.java b/src/main/java/common/hardware/motorcontroller/NAR_CANSparkMax.java
index b73eb62..c2c70cc 100644
--- a/src/main/java/common/hardware/motorcontroller/NAR_CANSparkMax.java
+++ b/src/main/java/common/hardware/motorcontroller/NAR_CANSparkMax.java
@@ -12,7 +12,8 @@
 import com.revrobotics.SparkMaxRelativeEncoder;
 
 import common.core.NAR_Robot;
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
+
 import static common.hardware.motorcontroller.MotorControllerConstants.*;
 
 import com.revrobotics.CANSparkMax.ControlType;
diff --git a/src/main/java/common/hardware/motorcontroller/NAR_TalonFX.java b/src/main/java/common/hardware/motorcontroller/NAR_TalonFX.java
index 9bfaa4e..96b6d0e 100644
--- a/src/main/java/common/hardware/motorcontroller/NAR_TalonFX.java
+++ b/src/main/java/common/hardware/motorcontroller/NAR_TalonFX.java
@@ -9,7 +9,7 @@
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonFX;
 
 import common.core.NAR_Robot;
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
 
 import static common.hardware.motorcontroller.MotorControllerConstants.*;
 
diff --git a/src/main/java/common/narwhaldashboard/NarwhalDashboard.java b/src/main/java/common/utility/narwhaldashboard/NarwhalDashboard.java
similarity index 99%
rename from src/main/java/common/narwhaldashboard/NarwhalDashboard.java
rename to src/main/java/common/utility/narwhaldashboard/NarwhalDashboard.java
index 12efd22..b4496ad 100644
--- a/src/main/java/common/narwhaldashboard/NarwhalDashboard.java
+++ b/src/main/java/common/utility/narwhaldashboard/NarwhalDashboard.java
@@ -1,4 +1,4 @@
-package common.narwhaldashboard;
+package common.utility.narwhaldashboard;
 
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/common/utility/NAR_Shuffleboard.java b/src/main/java/common/utility/shuffleboard/NAR_Shuffleboard.java
similarity index 99%
rename from src/main/java/common/utility/NAR_Shuffleboard.java
rename to src/main/java/common/utility/shuffleboard/NAR_Shuffleboard.java
index 02fa62a..55241c1 100644
--- a/src/main/java/common/utility/NAR_Shuffleboard.java
+++ b/src/main/java/common/utility/shuffleboard/NAR_Shuffleboard.java
@@ -1,4 +1,4 @@
-package common.utility;
+package common.utility.shuffleboard;
 
 import java.util.HashMap;
 import java.util.function.DoubleSupplier;