diff --git a/src/main/java/frc4388/robot/Robot.java b/src/main/java/frc4388/robot/Robot.java
index 1ee2f5e..ed3e072 100644
--- a/src/main/java/frc4388/robot/Robot.java
+++ b/src/main/java/frc4388/robot/Robot.java
@@ -15,6 +15,7 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import frc4388.robot.commands.ExampleCommand;
 import frc4388.robot.subsystems.ExampleSubsystem;
 import frc4388.robot.subsystems.LED;
+import frc4388.utility.controller.XboxController;
 
 /**
  * The VM is configured to automatically run this class, and to call the
@@ -25,7 +26,7 @@ import frc4388.robot.subsystems.LED;
  */
 public class Robot extends TimedRobot {
   public static ExampleSubsystem m_subsystem = new ExampleSubsystem();
-  public static LED led = new LED();
+  public static LED m_led = new LED();
   public static OI m_oi;
 
   Command m_autonomousCommand;
diff --git a/src/main/java/frc4388/robot/commands/setLEDPattern.java b/src/main/java/frc4388/robot/commands/setLEDPattern.java
index 4c3d16f..83885cd 100644
--- a/src/main/java/frc4388/robot/commands/setLEDPattern.java
+++ b/src/main/java/frc4388/robot/commands/setLEDPattern.java
@@ -14,11 +14,11 @@ import edu.wpi.first.wpilibj.command.Command;
 
 public class setLEDPattern extends Command {
 
-  LEDPatterns pattern;
+  public static LEDPatterns m_pattern;
 
   public setLEDPattern(LEDPatterns pattern) {
-    requires(Robot.led);
-    this.pattern = pattern;
+    requires(Robot.m_led);
+    m_pattern = pattern;
   }
 
   // Called just before this Command runs the first time
@@ -29,7 +29,7 @@ public class setLEDPattern extends Command {
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
-    Robot.led.setPattern(pattern);
+    Robot.m_led.setPattern(m_pattern);
   }
 
   // Make this return true when this Command no longer needs to run execute()
diff --git a/src/main/java/frc4388/robot/constants/LEDPatterns.java b/src/main/java/frc4388/robot/constants/LEDPatterns.java
index 16dde54..dc18958 100644
--- a/src/main/java/frc4388/robot/constants/LEDPatterns.java
+++ b/src/main/java/frc4388/robot/constants/LEDPatterns.java
@@ -33,6 +33,10 @@ public enum LEDPatterns {
   
   // GETTERS/SETTERS
   private final float id;
-  LEDPatterns(float id) { this.id = id; }
-  public float getValue() { return id; }
+  LEDPatterns(float id) {
+    this.id = id;
+  }
+  public float getValue() {
+    return id;
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/frc4388/controller/IHandController.java b/src/main/java/frc4388/utility/controller/IHandController.java
similarity index 88%
rename from src/main/java/frc4388/controller/IHandController.java
rename to src/main/java/frc4388/utility/controller/IHandController.java
index 5d5ca19..40ba864 100644
--- a/src/main/java/frc4388/controller/IHandController.java
+++ b/src/main/java/frc4388/utility/controller/IHandController.java
@@ -1,4 +1,4 @@
-package frc4388.controller;
+package frc4388.utility.controller;
 
 public interface IHandController {
 
diff --git a/src/main/java/frc4388/controller/XboxController.java b/src/main/java/frc4388/utility/controller/XboxController.java
similarity index 99%
rename from src/main/java/frc4388/controller/XboxController.java
rename to src/main/java/frc4388/utility/controller/XboxController.java
index bd0582c..8a5c326 100644
--- a/src/main/java/frc4388/controller/XboxController.java
+++ b/src/main/java/frc4388/utility/controller/XboxController.java
@@ -1,4 +1,4 @@
-package frc4388.controller;
+package frc4388.utility.controller;
 
 import edu.wpi.first.wpilibj.Joystick;
 
diff --git a/src/main/java/frc4388/controller/XboxTriggerButton.java b/src/main/java/frc4388/utility/controller/XboxTriggerButton.java
similarity index 96%
rename from src/main/java/frc4388/controller/XboxTriggerButton.java
rename to src/main/java/frc4388/utility/controller/XboxTriggerButton.java
index ee5b957..aed4436 100644
--- a/src/main/java/frc4388/controller/XboxTriggerButton.java
+++ b/src/main/java/frc4388/utility/controller/XboxTriggerButton.java
@@ -1,6 +1,6 @@
-package frc4388.controller;
+package frc4388.utility.controller;
 
-import frc4388.controller.XboxController;
+import frc4388.utility.controller.XboxController;
 
 import edu.wpi.first.wpilibj.buttons.Button;