Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2016/control_loops/superstructure/BUILD b/y2016/control_loops/superstructure/BUILD
index fb0750b..38f20d2 100644
--- a/y2016/control_loops/superstructure/BUILD
+++ b/y2016/control_loops/superstructure/BUILD
@@ -8,7 +8,7 @@
     'superstructure.q',
   ],
   deps = [
-    '//aos/common/controls:control_loop_queues',
+    '//aos/controls:control_loop_queues',
     '//frc971/control_loops:queues',
   ],
 )
@@ -75,9 +75,9 @@
   deps = [
     ':superstructure_queue',
     ':superstructure_plants',
-    '//aos/common/controls:control_loop',
-    '//aos/common/util:trapezoid_profile',
-    '//aos/common:math',
+    '//aos/controls:control_loop',
+    '//aos/util:trapezoid_profile',
+    '//aos:math',
     '//frc971/control_loops:profiled_subsystem',
     '//frc971/control_loops:simple_capped_state_feedback_loop',
     '//frc971/control_loops:state_feedback_loop',
@@ -96,10 +96,10 @@
     ':superstructure_queue',
     ':superstructure_lib',
     '//aos/testing:googletest',
-    '//aos/common:queues',
-    '//aos/common/controls:control_loop_test',
-    '//aos/common:math',
-    '//aos/common:time',
+    '//aos:queues',
+    '//aos/controls:control_loop_test',
+    '//aos:math',
+    '//aos/time:time',
     '//frc971/control_loops:position_sensor_sim',
     '//frc971/control_loops:team_number_test_environment',
   ],