diff --git a/aos/actions/BUILD b/aos/actions/BUILD
index d5920fd..90588ca 100644
--- a/aos/actions/BUILD
+++ b/aos/actions/BUILD
@@ -16,10 +16,10 @@
     target_compatible_with = ["@platforms//os:linux"],
     deps = [
         ":actions_fbs",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
         "//aos/time",
         "//aos/util:phased_loop",
+        "//frc971/control_loops:control_loop",
     ],
 )
 
diff --git a/frc971/codelab/BUILD b/frc971/codelab/BUILD
index 7565daf..d69bf53 100644
--- a/frc971/codelab/BUILD
+++ b/frc971/codelab/BUILD
@@ -15,9 +15,9 @@
         ":basic_output_fbs",
         ":basic_position_fbs",
         ":basic_status_fbs",
-        "//frc971/control_loops:control_loop_test",
         "//aos/events:shm_event_loop",
         "//aos/testing:googletest",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:state_feedback_loop",
         "//frc971/control_loops:team_number_test_environment",
     ],
diff --git a/frc971/control_loops/BUILD b/frc971/control_loops/BUILD
index 3341402..644346a 100644
--- a/frc971/control_loops/BUILD
+++ b/frc971/control_loops/BUILD
@@ -250,8 +250,8 @@
     target_compatible_with = ["@platforms//os:linux"],
     deps = [
         ":coerce_goal",
-        "//frc971/control_loops:polytope",
         "//aos/testing:googletest",
+        "//frc971/control_loops:polytope",
         "@org_tuxfamily_eigen//:eigen",
     ],
 )
@@ -280,8 +280,8 @@
         ":c2d",
         ":state_feedback_loop",
         "//aos:macros",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
+        "//frc971/control_loops:control_loop",
         "@org_tuxfamily_eigen//:eigen",
     ],
 )
@@ -367,8 +367,8 @@
         ":profiled_subsystem_fbs",
         ":simple_capped_state_feedback_loop",
         ":state_feedback_loop",
-        "//frc971/control_loops:control_loop",
         "//aos/util:trapezoid_profile",
+        "//frc971/control_loops:control_loop",
         "//frc971/zeroing",
     ],
 )
@@ -613,8 +613,8 @@
         ":static_zeroing_single_dof_profiled_subsystem_test_pot_and_absolute_position_fbs",
         ":static_zeroing_single_dof_profiled_subsystem_test_subsystem_goal_fbs",
         ":static_zeroing_single_dof_profiled_subsystem_test_subsystem_output_fbs",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
+        "//frc971/control_loops:control_loop_test",
     ],
 )
 
diff --git a/frc971/control_loops/drivetrain/BUILD b/frc971/control_loops/drivetrain/BUILD
index f44abe0..02f8e3a 100644
--- a/frc971/control_loops/drivetrain/BUILD
+++ b/frc971/control_loops/drivetrain/BUILD
@@ -315,15 +315,15 @@
         ":localizer",
         ":spline_goal_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
-        "//frc971/control_loops:polytope",
-        "//frc971/input:robot_state_fbs",
         "//aos/util:log_interval",
         "//aos/util:trapezoid_profile",
         "//frc971:shifter_hall_effect",
         "//frc971/control_loops:coerce_goal",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
+        "//frc971/control_loops:polytope",
         "//frc971/control_loops:state_feedback_loop",
+        "//frc971/input:robot_state_fbs",
     ],
 )
 
@@ -425,8 +425,8 @@
         ":spline_goal_fbs",
         ":splinedrivetrain",
         ":ssdrivetrain",
-        "//frc971/control_loops:control_loop",
         "//aos/util:log_interval",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:runge_kutta",
         "//frc971/queues:gyro_fbs",
         "//frc971/wpilib:imu_batch_fbs",
@@ -728,9 +728,9 @@
     deps = [
         ":drivetrain_config",
         ":drivetrain_status_fbs",
-        "//frc971/control_loops:quaternion_utils",
         "//aos/events:event_loop",
         "//frc971/control_loops:control_loops_fbs",
+        "//frc971/control_loops:quaternion_utils",
         "//frc971/control_loops:runge_kutta",
         "@//aos/time",
         "@com_github_google_glog//:glog",
@@ -746,9 +746,9 @@
     target_compatible_with = ["@platforms//os:linux"],
     deps = [
         ":drivetrain_test_lib",
-        "//frc971/control_loops:quaternion_utils",
         "//aos/testing:googletest",
         "//aos/testing:random_seed",
+        "//frc971/control_loops:quaternion_utils",
         "//frc971/control_loops/drivetrain:improved_down_estimator",
         "@org_tuxfamily_eigen//:eigen",
     ],
diff --git a/frc971/input/BUILD b/frc971/input/BUILD
index 72be201..5b5c5d1 100644
--- a/frc971/input/BUILD
+++ b/frc971/input/BUILD
@@ -15,8 +15,8 @@
     deps = [
         ":robot_state_fbs",
         "//aos/events:event_loop",
-        "//frc971/input:driver_station_data",
         "//aos/logging",
+        "//frc971/input:driver_station_data",
     ],
 )
 
@@ -32,13 +32,13 @@
     deps = [
         ":robot_state_fbs",
         "//aos:math",
-        "//frc971/input:driver_station_data",
         "//aos/logging",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_config",
         "//frc971/control_loops/drivetrain:drivetrain_goal_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
         "//frc971/control_loops/drivetrain:spline_goal_fbs",
+        "//frc971/input:driver_station_data",
     ],
 )
 
@@ -66,11 +66,11 @@
         ":drivetrain_input",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:joystick_input",
         "//aos/logging",
         "//frc971/autonomous:auto_fbs",
         "//frc971/autonomous:auto_mode_fbs",
         "//frc971/autonomous:base_autonomous_actor",
+        "//frc971/input:joystick_input",
     ],
 )
 
diff --git a/y2012/BUILD b/y2012/BUILD
index 37032a8..ddcdb43 100644
--- a/y2012/BUILD
+++ b/y2012/BUILD
@@ -39,7 +39,6 @@
     target_compatible_with = ["//tools/platforms/hardware:roborio"],
     deps = [
         "//aos:init",
-        "//frc971/control_loops:control_loop",
         "//aos/events:shm_event_loop",
         "//aos/logging",
         "//aos/stl_mutex",
@@ -47,6 +46,7 @@
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_output_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
diff --git a/y2014/BUILD b/y2014/BUILD
index 51590c7..d483883 100644
--- a/y2014/BUILD
+++ b/y2014/BUILD
@@ -32,12 +32,12 @@
         ":constants",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
         "//aos/logging",
         "//aos/time",
         "//aos/util:log_interval",
         "//frc971/autonomous:auto_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
+        "//frc971/input:action_joystick_input",
         "//frc971/queues:gyro_fbs",
         "//y2014/actors:shoot_action_lib",
         "//y2014/control_loops/claw:claw_goal_fbs",
@@ -91,8 +91,8 @@
     target_compatible_with = ["@platforms//os:linux"],
     visibility = ["//visibility:public"],
     deps = [
-        "//frc971/input:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
     ],
 )
 
@@ -105,17 +105,17 @@
     deps = [
         ":constants",
         "//aos:init",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_output_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:dma",
         "//frc971/wpilib:dma_edge_counting",
diff --git a/y2014/control_loops/claw/BUILD b/y2014/control_loops/claw/BUILD
index a79dc78..d947f6b 100644
--- a/y2014/control_loops/claw/BUILD
+++ b/y2014/control_loops/claw/BUILD
@@ -75,10 +75,10 @@
         ":claw_position_fbs",
         ":claw_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
-        "//frc971/control_loops:polytope",
         "//frc971/control_loops:coerce_goal",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:hall_effect_tracker",
+        "//frc971/control_loops:polytope",
         "//frc971/control_loops:state_feedback_loop",
         "//y2014:constants",
     ],
@@ -97,8 +97,8 @@
         ":claw_output_fbs",
         ":claw_position_fbs",
         ":claw_status_fbs",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:state_feedback_loop",
         "//frc971/control_loops:team_number_test_environment",
     ],
diff --git a/y2014/control_loops/shooter/BUILD b/y2014/control_loops/shooter/BUILD
index d67050d..d4051ab 100644
--- a/y2014/control_loops/shooter/BUILD
+++ b/y2014/control_loops/shooter/BUILD
@@ -98,8 +98,8 @@
         ":shooter_output_fbs",
         ":shooter_position_fbs",
         ":shooter_status_fbs",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:state_feedback_loop",
         "//frc971/control_loops:team_number_test_environment",
     ],
diff --git a/y2014_bot3/BUILD b/y2014_bot3/BUILD
index 40233c5..86f5fb2 100644
--- a/y2014_bot3/BUILD
+++ b/y2014_bot3/BUILD
@@ -9,12 +9,12 @@
     deps = [
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:drivetrain_input",
-        "//frc971/input:joystick_input",
         "//aos/logging",
         "//aos/time",
         "//aos/util:log_interval",
         "//frc971/autonomous:base_autonomous_actor",
+        "//frc971/input:drivetrain_input",
+        "//frc971/input:joystick_input",
         "//y2014_bot3/control_loops/drivetrain:drivetrain_base",
         "//y2014_bot3/control_loops/rollers:rollers_goal_fbs",
     ],
@@ -39,17 +39,17 @@
     target_compatible_with = ["//tools/platforms/hardware:roborio"],
     deps = [
         "//aos:init",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_output_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:dma",
         "//frc971/wpilib:drivetrain_writer",
diff --git a/y2014_bot3/control_loops/rollers/BUILD b/y2014_bot3/control_loops/rollers/BUILD
index a4ee768..4f1fcc7 100644
--- a/y2014_bot3/control_loops/rollers/BUILD
+++ b/y2014_bot3/control_loops/rollers/BUILD
@@ -52,8 +52,8 @@
         ":rollers_output_fbs",
         ":rollers_position_fbs",
         ":rollers_status_fbs",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
+        "//frc971/control_loops:control_loop",
     ],
 )
 
diff --git a/y2016/BUILD b/y2016/BUILD
index 0c9852f..bf3919d 100644
--- a/y2016/BUILD
+++ b/y2016/BUILD
@@ -33,7 +33,6 @@
         ":constants",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
         "//aos/logging",
         "//aos/time",
         "//aos/util:log_interval",
@@ -41,6 +40,7 @@
         "//frc971/control_loops/drivetrain:drivetrain_goal_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
         "//frc971/control_loops/drivetrain:spline_goal_fbs",
+        "//frc971/input:action_joystick_input",
         "//frc971/queues:gyro_fbs",
         "//y2016/actors:autonomous_action_lib",
         "//y2016/actors:superstructure_action_lib",
@@ -96,9 +96,9 @@
     target_compatible_with = ["@platforms//os:linux"],
     visibility = ["//visibility:public"],
     deps = [
-        "//frc971/input:config",
         "//frc971/autonomous:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
         "//frc971/wpilib:config",
     ],
 )
@@ -113,9 +113,7 @@
         ":constants",
         "//aos:init",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
@@ -123,9 +121,11 @@
         "//aos/util:wrapping_counter",
         "//frc971/autonomous:auto_fbs",
         "//frc971/autonomous:auto_mode_fbs",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_output_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:ADIS16448",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:dma",
diff --git a/y2016/control_loops/shooter/BUILD b/y2016/control_loops/shooter/BUILD
index 6cae6fa..b00f2e8 100644
--- a/y2016/control_loops/shooter/BUILD
+++ b/y2016/control_loops/shooter/BUILD
@@ -102,8 +102,8 @@
         ":shooter_output_fbs",
         ":shooter_position_fbs",
         ":shooter_status_fbs",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:state_feedback_loop",
         "//frc971/control_loops:team_number_test_environment",
     ],
diff --git a/y2016/control_loops/superstructure/BUILD b/y2016/control_loops/superstructure/BUILD
index b4c26d9..8825850 100644
--- a/y2016/control_loops/superstructure/BUILD
+++ b/y2016/control_loops/superstructure/BUILD
@@ -114,8 +114,8 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/util:trapezoid_profile",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:profiled_subsystem",
         "//frc971/control_loops:simple_capped_state_feedback_loop",
         "//frc971/control_loops:state_feedback_loop",
@@ -139,9 +139,9 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
         "//aos/time",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:position_sensor_sim",
         "//frc971/control_loops:team_number_test_environment",
     ],
diff --git a/y2017/BUILD b/y2017/BUILD
index ba6d452..12a585b 100644
--- a/y2017/BUILD
+++ b/y2017/BUILD
@@ -36,11 +36,11 @@
         ":constants",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
-        "//frc971/input:drivetrain_input",
         "//aos/logging",
         "//aos/time",
         "//aos/util:log_interval",
+        "//frc971/input:action_joystick_input",
+        "//frc971/input:drivetrain_input",
         "//y2017/actors:autonomous_action_lib",
         "//y2017/control_loops/drivetrain:drivetrain_base",
         "//y2017/control_loops/superstructure:superstructure_goal_fbs",
@@ -61,8 +61,8 @@
     target_compatible_with = ["@platforms//os:linux"],
     visibility = ["//visibility:public"],
     deps = [
-        "//frc971/input:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
     ],
 )
 
@@ -76,9 +76,7 @@
         ":constants",
         "//aos:init",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
@@ -86,9 +84,11 @@
         "//aos/util:wrapping_counter",
         "//frc971/autonomous:auto_fbs",
         "//frc971/autonomous:auto_mode_fbs",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_output_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:ADIS16448",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:dma",
diff --git a/y2017/control_loops/superstructure/BUILD b/y2017/control_loops/superstructure/BUILD
index a7c75ac..89fff7a 100644
--- a/y2017/control_loops/superstructure/BUILD
+++ b/y2017/control_loops/superstructure/BUILD
@@ -63,8 +63,8 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         ":vision_distance_average",
-        "//frc971/control_loops:control_loop",
         "//aos/events:event_loop",
+        "//frc971/control_loops:control_loop",
         "//y2017:constants",
         "//y2017/control_loops/superstructure/column",
         "//y2017/control_loops/superstructure/hood",
@@ -87,9 +87,9 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
         "//aos/time",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:position_sensor_sim",
         "//frc971/control_loops:team_number_test_environment",
         "//y2017/control_loops/superstructure/column:column_plants",
diff --git a/y2018/BUILD b/y2018/BUILD
index 6d3bc47..0d0cb5d 100644
--- a/y2018/BUILD
+++ b/y2018/BUILD
@@ -25,8 +25,6 @@
         ":vision_proto",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
-        "//frc971/input:drivetrain_input",
         "//aos/logging",
         "//aos/network:team_number",
         "//aos/stl_mutex",
@@ -35,6 +33,8 @@
         "//aos/vision/events:udp",
         "//frc971/autonomous:auto_fbs",
         "//frc971/autonomous:base_autonomous_actor",
+        "//frc971/input:action_joystick_input",
+        "//frc971/input:drivetrain_input",
         "//y2018/control_loops/drivetrain:drivetrain_base",
         "//y2018/control_loops/superstructure:superstructure_goal_fbs",
         "//y2018/control_loops/superstructure:superstructure_position_fbs",
@@ -75,17 +75,17 @@
         ":status_light_fbs",
         "//aos:init",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
         "//frc971/autonomous:auto_fbs",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:ADIS16448",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:dma",
@@ -131,8 +131,8 @@
     target_compatible_with = ["@platforms//os:linux"],
     visibility = ["//visibility:public"],
     deps = [
-        "//frc971/input:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
     ],
 )
 
diff --git a/y2018/control_loops/superstructure/BUILD b/y2018/control_loops/superstructure/BUILD
index 6ef3734..347b427 100644
--- a/y2018/control_loops/superstructure/BUILD
+++ b/y2018/control_loops/superstructure/BUILD
@@ -61,8 +61,8 @@
         ":superstructure_output_fbs",
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
-        "//frc971/control_loops:control_loop",
         "//aos/events:event_loop",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_output_fbs",
         "//y2018:constants",
@@ -89,9 +89,9 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
         "//aos/time",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:position_sensor_sim",
         "//frc971/control_loops:team_number_test_environment",
         "//y2018/control_loops/superstructure/intake:intake_plants",
diff --git a/y2019/BUILD b/y2019/BUILD
index 1fc03c5..b5f42cd 100644
--- a/y2019/BUILD
+++ b/y2019/BUILD
@@ -64,18 +64,18 @@
         ":status_light_fbs",
         "//aos:init",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/events:shm_event_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
         "//frc971/autonomous:auto_mode_fbs",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:ADIS16448",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:drivetrain_writer",
@@ -135,9 +135,6 @@
         ":vision_proto",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
-        "//frc971/input:drivetrain_input",
-        "//frc971/input:joystick_input",
         "//aos/logging",
         "//aos/network:team_number",
         "//aos/stl_mutex",
@@ -148,6 +145,9 @@
         "//frc971/autonomous:base_autonomous_actor",
         "//frc971/control_loops:profiled_subsystem_fbs",
         "//frc971/control_loops/drivetrain:localizer_fbs",
+        "//frc971/input:action_joystick_input",
+        "//frc971/input:drivetrain_input",
+        "//frc971/input:joystick_input",
         "//y2019/control_loops/drivetrain:drivetrain_base",
         "//y2019/control_loops/drivetrain:target_selector_fbs",
         "//y2019/control_loops/superstructure:superstructure_goal_fbs",
@@ -193,9 +193,9 @@
     target_compatible_with = ["@platforms//os:linux"],
     visibility = ["//visibility:public"],
     deps = [
-        "//frc971/input:config",
         "//frc971/autonomous:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
         "//frc971/wpilib:config",
     ],
 )
diff --git a/y2019/control_loops/drivetrain/BUILD b/y2019/control_loops/drivetrain/BUILD
index fd5386b..2da69ce 100644
--- a/y2019/control_loops/drivetrain/BUILD
+++ b/y2019/control_loops/drivetrain/BUILD
@@ -226,9 +226,9 @@
         ":drivetrain_base",
         ":event_loop_localizer",
         ":localizer",
-        "//frc971/control_loops:control_loop_test",
         "//aos/events:shm_event_loop",
         "//aos/network:team_number",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:team_number_test_environment",
         "//frc971/control_loops/drivetrain:drivetrain_lib",
         "//frc971/control_loops/drivetrain:drivetrain_test_lib",
diff --git a/y2019/control_loops/superstructure/BUILD b/y2019/control_loops/superstructure/BUILD
index 29e04fe..765e342 100644
--- a/y2019/control_loops/superstructure/BUILD
+++ b/y2019/control_loops/superstructure/BUILD
@@ -66,8 +66,8 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         ":vacuum",
-        "//frc971/control_loops:control_loop",
         "//aos/events:event_loop",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
         "//y2019:constants",
         "//y2019:status_light_fbs",
@@ -90,10 +90,10 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop_test",
         "//aos/testing:googletest",
         "//aos/time",
         "//frc971/control_loops:capped_test_plant",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:position_sensor_sim",
         "//frc971/control_loops:team_number_test_environment",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
@@ -127,8 +127,8 @@
     deps = [
         ":superstructure_goal_fbs",
         ":superstructure_status_fbs",
-        "//frc971/control_loops:control_loop",
         "//frc971:constants",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops:profiled_subsystem_fbs",
     ],
diff --git a/y2020/BUILD b/y2020/BUILD
index 1987939..ab03ea3 100644
--- a/y2020/BUILD
+++ b/y2020/BUILD
@@ -87,18 +87,18 @@
         ":constants",
         "//aos:init",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/events:shm_event_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
         "//frc971/autonomous:auto_mode_fbs",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:ADIS16470",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:drivetrain_writer",
@@ -128,13 +128,13 @@
         ":setpoint_fbs",
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
-        "//frc971/input:drivetrain_input",
-        "//frc971/input:joystick_input",
         "//aos/logging",
         "//frc971/autonomous:auto_fbs",
         "//frc971/autonomous:base_autonomous_actor",
         "//frc971/control_loops:profiled_subsystem_fbs",
+        "//frc971/input:action_joystick_input",
+        "//frc971/input:drivetrain_input",
+        "//frc971/input:joystick_input",
         "//y2020:constants",
         "//y2020/control_loops/drivetrain:drivetrain_base",
         "//y2020/control_loops/superstructure:superstructure_goal_fbs",
@@ -184,8 +184,8 @@
         visibility = ["//visibility:public"],
         deps = [
             "//aos/events:config",
-            "//frc971/input:config",
             "//frc971/control_loops/drivetrain:config",
+            "//frc971/input:config",
         ],
     )
     for pi in [
@@ -213,8 +213,8 @@
     visibility = ["//visibility:public"],
     deps = [
         "//aos/events:config",
-        "//frc971/input:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
     ],
 )
 
@@ -236,9 +236,9 @@
     target_compatible_with = ["@platforms//os:linux"],
     deps = [
         "//aos/events:config",
-        "//frc971/input:config",
         "//frc971/autonomous:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
         "//frc971/wpilib:config",
     ],
 )
diff --git a/y2020/actors/BUILD b/y2020/actors/BUILD
index be0d6dd..4ec7b08 100644
--- a/y2020/actors/BUILD
+++ b/y2020/actors/BUILD
@@ -48,7 +48,6 @@
     deps = [
         "//aos/events:event_loop",
         "//aos/logging",
-        "//frc971/input:joystick_state_fbs",
         "//aos/util:math",
         "//aos/util:phased_loop",
         "//frc971/autonomous:base_autonomous_actor",
@@ -57,6 +56,7 @@
         "//frc971/control_loops/drivetrain:drivetrain_config",
         "//frc971/control_loops/drivetrain:localizer_fbs",
         "//frc971/control_loops/drivetrain:spline",
+        "//frc971/input:joystick_state_fbs",
         "//y2020/control_loops/drivetrain:drivetrain_base",
         "//y2020/control_loops/superstructure:superstructure_goal_fbs",
         "//y2020/control_loops/superstructure:superstructure_status_fbs",
diff --git a/y2020/control_loops/drivetrain/BUILD b/y2020/control_loops/drivetrain/BUILD
index 4fd61f6..89d8044 100644
--- a/y2020/control_loops/drivetrain/BUILD
+++ b/y2020/control_loops/drivetrain/BUILD
@@ -140,11 +140,11 @@
     deps = [
         ":drivetrain_base",
         ":localizer",
-        "//frc971/control_loops:control_loop_test",
         "//aos/events:simulated_event_loop",
         "//aos/events/logging:log_writer",
         "//aos/network:team_number",
         "//aos/network:testing_time_converter",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:team_number_test_environment",
         "//frc971/control_loops/drivetrain:drivetrain_lib",
         "//frc971/control_loops/drivetrain:drivetrain_test_lib",
diff --git a/y2020/control_loops/superstructure/BUILD b/y2020/control_loops/superstructure/BUILD
index 1b24fc4..73be810 100644
--- a/y2020/control_loops/superstructure/BUILD
+++ b/y2020/control_loops/superstructure/BUILD
@@ -66,8 +66,8 @@
         ":superstructure_output_fbs",
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
-        "//frc971/control_loops:control_loop",
         "//aos/events:event_loop",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
         "//y2020:constants",
@@ -105,11 +105,11 @@
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
         "//aos:math",
-        "//frc971/control_loops:control_loop_test",
         "//aos/events/logging:log_writer",
         "//aos/testing:googletest",
         "//aos/time",
         "//frc971/control_loops:capped_test_plant",
+        "//frc971/control_loops:control_loop_test",
         "//frc971/control_loops:position_sensor_sim",
         "//frc971/control_loops:team_number_test_environment",
         "//frc971/control_loops/drivetrain:drivetrain_status_fbs",
diff --git a/y2021_bot3/BUILD b/y2021_bot3/BUILD
index 8c68771..949820a 100644
--- a/y2021_bot3/BUILD
+++ b/y2021_bot3/BUILD
@@ -47,18 +47,18 @@
         ":constants",
         "//aos:init",
         "//aos:math",
-        "//frc971/control_loops:control_loop",
         "//aos/events:shm_event_loop",
         "//aos/logging",
-        "//frc971/input:robot_state_fbs",
         "//aos/stl_mutex",
         "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
         "//frc971/autonomous:auto_mode_fbs",
+        "//frc971/control_loops:control_loop",
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops/drivetrain:drivetrain_position_fbs",
+        "//frc971/input:robot_state_fbs",
         "//frc971/wpilib:ADIS16448",
         "//frc971/wpilib:buffered_pcm",
         "//frc971/wpilib:drivetrain_writer",
@@ -86,13 +86,13 @@
     deps = [
         "//aos:init",
         "//aos/actions:action_lib",
-        "//frc971/input:action_joystick_input",
-        "//frc971/input:drivetrain_input",
-        "//frc971/input:joystick_input",
         "//aos/logging",
         "//frc971/autonomous:auto_fbs",
         "//frc971/autonomous:base_autonomous_actor",
         "//frc971/control_loops:profiled_subsystem_fbs",
+        "//frc971/input:action_joystick_input",
+        "//frc971/input:drivetrain_input",
+        "//frc971/input:joystick_input",
         "//y2021_bot3/control_loops/drivetrain:drivetrain_base",
         "//y2021_bot3/control_loops/superstructure:superstructure_goal_fbs",
         "//y2021_bot3/control_loops/superstructure:superstructure_status_fbs",
@@ -110,9 +110,9 @@
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//frc971/input:config",
         "//frc971/autonomous:config",
         "//frc971/control_loops/drivetrain:config",
+        "//frc971/input:config",
         "//frc971/wpilib:config",
     ],
 )
diff --git a/y2021_bot3/control_loops/superstructure/BUILD b/y2021_bot3/control_loops/superstructure/BUILD
index 24cc73f..404555f 100644
--- a/y2021_bot3/control_loops/superstructure/BUILD
+++ b/y2021_bot3/control_loops/superstructure/BUILD
@@ -59,8 +59,8 @@
         ":superstructure_output_fbs",
         ":superstructure_position_fbs",
         ":superstructure_status_fbs",
-        "//frc971/control_loops:control_loop",
         "//aos/events:event_loop",
+        "//frc971/control_loops:control_loop",
         "//y2021_bot3:constants",
     ],
 )