Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2014_bot3/control_loops/rollers/BUILD b/y2014_bot3/control_loops/rollers/BUILD
index 548b375..029c190 100644
--- a/y2014_bot3/control_loops/rollers/BUILD
+++ b/y2014_bot3/control_loops/rollers/BUILD
@@ -8,7 +8,7 @@
     'rollers.q',
   ],
   deps = [
-    '//aos/common/controls:control_loop_queues',
+    '//aos/controls:control_loop_queues',
     '//frc971/control_loops:queues',
   ],
 )
@@ -23,8 +23,8 @@
   ],
   deps = [
     ':rollers_queue',
-    '//aos/common/logging',
-    '//aos/common/controls:control_loop',
+    '//aos/logging',
+    '//aos/controls:control_loop',
   ],
 )
 
diff --git a/y2014_bot3/control_loops/rollers/rollers.cc b/y2014_bot3/control_loops/rollers/rollers.cc
index ef895b3..573a41f 100644
--- a/y2014_bot3/control_loops/rollers/rollers.cc
+++ b/y2014_bot3/control_loops/rollers/rollers.cc
@@ -1,6 +1,6 @@
 #include "y2014_bot3/control_loops/rollers/rollers.h"
 
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
 
 namespace y2014_bot3 {
 namespace control_loops {
diff --git a/y2014_bot3/control_loops/rollers/rollers.h b/y2014_bot3/control_loops/rollers/rollers.h
index f0cae13..edbea7a 100644
--- a/y2014_bot3/control_loops/rollers/rollers.h
+++ b/y2014_bot3/control_loops/rollers/rollers.h
@@ -1,7 +1,7 @@
 #ifndef Y2014_BOT3_CONTROL_LOOPS_ROLLERS_H_
 #define Y2014_BOT3_CONTROL_LOOPS_ROLLERS_H_
 
-#include "aos/common/controls/control_loop.h"
+#include "aos/controls/control_loop.h"
 
 #include "y2014_bot3/control_loops/rollers/rollers.q.h"
 
diff --git a/y2014_bot3/control_loops/rollers/rollers.q b/y2014_bot3/control_loops/rollers/rollers.q
index f218a41..e36d43e 100644
--- a/y2014_bot3/control_loops/rollers/rollers.q
+++ b/y2014_bot3/control_loops/rollers/rollers.q
@@ -1,6 +1,6 @@
 package y2014_bot3.control_loops;
 
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
 import "frc971/control_loops/control_loops.q";
 
 queue_group RollersQueue {