Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2018/BUILD b/y2018/BUILD
index cccc2cf..51bffd2 100644
--- a/y2018/BUILD
+++ b/y2018/BUILD
@@ -43,12 +43,12 @@
     ],
     deps = [
         ":vision_proto",
-        "//aos/common:stl_mutex",
-        "//aos/common:time",
-        "//aos/common/actions:action_lib",
-        "//aos/common/logging",
-        "//aos/common/network:team_number",
-        "//aos/common/util:log_interval",
+        "//aos/stl_mutex:stl_mutex",
+        "//aos/time:time",
+        "//aos/actions:action_lib",
+        "//aos/logging",
+        "//aos/network:team_number",
+        "//aos/util:log_interval",
         "//aos/input:drivetrain_input",
         "//aos/input:joystick_input",
         "//aos/linux_code:init",
@@ -73,9 +73,9 @@
     visibility = ["//visibility:public"],
     deps = [
         "//aos:once",
-        "//aos/common:mutex",
-        "//aos/common/logging",
-        "//aos/common/network:team_number",
+        "//aos/mutex:mutex",
+        "//aos/logging",
+        "//aos/network:team_number",
         "//frc971:constants",
         "//frc971/shooter_interpolation:interpolation",
         "//y2018/control_loops/drivetrain:polydrivetrain_plants",
@@ -92,16 +92,16 @@
     restricted_to = ["//tools:roborio"],
     deps = [
         ":status_light",
-        "//aos/common:math",
-        "//aos/common:stl_mutex",
-        "//aos/common:time",
-        "//aos/common/controls:control_loop",
-        "//aos/common/logging",
-        "//aos/common/logging:queue_logging",
-        "//aos/common/messages:robot_state",
-        "//aos/common/util:log_interval",
-        "//aos/common/util:phased_loop",
-        "//aos/common/util:wrapping_counter",
+        "//aos:math",
+        "//aos/stl_mutex:stl_mutex",
+        "//aos/time:time",
+        "//aos/controls:control_loop",
+        "//aos/logging",
+        "//aos/logging:queue_logging",
+        "//aos/robot_state:robot_state",
+        "//aos/util:log_interval",
+        "//aos/util:phased_loop",
+        "//aos/util:wrapping_counter",
         "//aos/linux_code:init",
         "//frc971/autonomous:auto_queue",
         "//frc971/control_loops:queues",