Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/frc971/control_loops/drivetrain/BUILD b/frc971/control_loops/drivetrain/BUILD
index 64d1d9d..16c6340 100644
--- a/frc971/control_loops/drivetrain/BUILD
+++ b/frc971/control_loops/drivetrain/BUILD
@@ -10,7 +10,7 @@
     ],
     deps = [
         ":drivetrain_queue",
-        "//aos/common/controls:replay_control_loop",
+        "//aos/controls:replay_control_loop",
         "//aos/linux_code:init",
         "//frc971/queues:gyro",
     ],
@@ -25,7 +25,7 @@
         "//tools:armhf-debian",
     ],
     deps = [
-        "//aos/common/controls:control_loop_queues",
+        "//aos/controls:control_loop_queues",
         "//frc971/control_loops:queues",
     ],
 )
@@ -61,14 +61,14 @@
         ":drivetrain_config",
         ":drivetrain_queue",
         ":gear",
-        "//aos/common:math",
-        "//aos/common/controls:control_loop",
-        "//aos/common/controls:polytope",
-        "//aos/common/logging:matrix_logging",
-        "//aos/common/logging:queue_logging",
-        "//aos/common/messages:robot_state",
-        "//aos/common/util:log_interval",
-        "//aos/common/util:trapezoid_profile",
+        "//aos:math",
+        "//aos/controls:control_loop",
+        "//aos/controls:polytope",
+        "//aos/logging:matrix_logging",
+        "//aos/logging:queue_logging",
+        "//aos/robot_state:robot_state",
+        "//aos/util:log_interval",
+        "//aos/util:trapezoid_profile",
         "//frc971:shifter_hall_effect",
         "//frc971/control_loops:coerce_goal",
         "//frc971/control_loops:state_feedback_loop",
@@ -87,12 +87,12 @@
         ":drivetrain_config",
         ":drivetrain_queue",
         ":gear",
-        "//aos/common:math",
-        "//aos/common/controls:polytope",
-        "//aos/common/logging:matrix_logging",
-        "//aos/common/logging:queue_logging",
-        "//aos/common/messages:robot_state",
-        "//aos/common/util:log_interval",
+        "//aos:math",
+        "//aos/controls:polytope",
+        "//aos/logging:matrix_logging",
+        "//aos/logging:queue_logging",
+        "//aos/robot_state:robot_state",
+        "//aos/util:log_interval",
         "//frc971/control_loops:coerce_goal",
         "//frc971/control_loops:state_feedback_loop",
     ],
@@ -124,8 +124,8 @@
     deps = [
         ":drivetrain_config_uc",
         ":gear",
-        "//aos/common:math",
-        "//aos/common/controls:polytope_uc",
+        "//aos:math",
+        "//aos/controls:polytope_uc",
         "//frc971/control_loops:coerce_goal_uc",
         "//frc971/control_loops:state_feedback_loop_uc",
     ],
@@ -171,10 +171,10 @@
         ":gear",
         ":polydrivetrain",
         ":ssdrivetrain",
-        "//aos/common/controls:control_loop",
-        "//aos/common/logging:matrix_logging",
-        "//aos/common/logging:queue_logging",
-        "//aos/common/util:log_interval",
+        "//aos/controls:control_loop",
+        "//aos/logging:matrix_logging",
+        "//aos/logging:queue_logging",
+        "//aos/util:log_interval",
         "//frc971/queues:gyro",
         "//frc971/wpilib:imu_queue",
     ],
@@ -189,8 +189,8 @@
         ":drivetrain_config",
         ":drivetrain_lib",
         ":drivetrain_queue",
-        "//aos/common:queues",
-        "//aos/common/controls:control_loop_test",
+        "//aos:queues",
+        "//aos/controls:control_loop_test",
         "//aos/testing:googletest",
         "//frc971/control_loops:state_feedback_loop",
         "//frc971/queues:gyro",