diff --git a/y2014/control_loops/claw/BUILD b/y2014/control_loops/claw/BUILD
index 1c0d157..252edce 100644
--- a/y2014/control_loops/claw/BUILD
+++ b/y2014/control_loops/claw/BUILD
@@ -9,7 +9,7 @@
   ],
   deps = [
     ':claw_queue',
-    '//aos/common/controls:replay_control_loop',
+    '//aos/controls:replay_control_loop',
     '//aos/linux_code:init',
   ],
 )
@@ -20,7 +20,7 @@
     'claw.q',
   ],
   deps = [
-    '//aos/common/controls:control_loop_queues',
+    '//aos/controls:control_loop_queues',
     '//frc971/control_loops:queues',
   ],
 )
@@ -50,11 +50,11 @@
   ],
   deps = [
     ':claw_queue',
-    '//aos/common/controls:control_loop',
-    '//aos/common/controls:polytope',
-    '//aos/common/logging:queue_logging',
-    '//aos/common/logging:matrix_logging',
-    '//aos/common:math',
+    '//aos/controls:control_loop',
+    '//aos/controls:polytope',
+    '//aos/logging:queue_logging',
+    '//aos/logging:matrix_logging',
+    '//aos:math',
     '//frc971/control_loops:state_feedback_loop',
     '//frc971/control_loops:coerce_goal',
     '//frc971/control_loops:hall_effect_tracker',
@@ -73,7 +73,7 @@
   deps = [
     ':claw_lib',
     ':claw_queue',
-    '//aos/common/controls:control_loop_test',
+    '//aos/controls:control_loop_test',
     '//aos/testing:googletest',
     '//frc971/control_loops:state_feedback_loop',
     '//frc971/control_loops:team_number_test_environment',
@@ -88,7 +88,7 @@
   deps = [
     '//aos/linux_code:init',
     ':claw_queue',
-    '//aos/common/controls:control_loop',
+    '//aos/controls:control_loop',
     '//y2014:constants',
   ],
 )
diff --git a/y2014/control_loops/claw/claw.cc b/y2014/control_loops/claw/claw.cc
index 11dbd80..088472c 100644
--- a/y2014/control_loops/claw/claw.cc
+++ b/y2014/control_loops/claw/claw.cc
@@ -2,11 +2,11 @@
 
 #include <algorithm>
 
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
-#include "aos/common/logging/matrix_logging.h"
-#include "aos/common/commonmath.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
+#include "aos/logging/matrix_logging.h"
+#include "aos/commonmath.h"
 
 #include "y2014/constants.h"
 #include "y2014/control_loops/claw/claw_motor_plant.h"
diff --git a/y2014/control_loops/claw/claw.h b/y2014/control_loops/claw/claw.h
index 88f038f..7995512 100644
--- a/y2014/control_loops/claw/claw.h
+++ b/y2014/control_loops/claw/claw.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/controls/polytope.h"
+#include "aos/controls/control_loop.h"
+#include "aos/controls/polytope.h"
 #include "y2014/constants.h"
 #include "frc971/control_loops/state_feedback_loop.h"
 #include "frc971/control_loops/coerce_goal.h"
diff --git a/y2014/control_loops/claw/claw.q b/y2014/control_loops/claw/claw.q
index 1afdd85..efe445d 100644
--- a/y2014/control_loops/claw/claw.q
+++ b/y2014/control_loops/claw/claw.q
@@ -1,6 +1,6 @@
 package y2014.control_loops;
 
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
 import "frc971/control_loops/control_loops.q";
 
 struct HalfClawPosition {
diff --git a/y2014/control_loops/claw/claw_lib_test.cc b/y2014/control_loops/claw/claw_lib_test.cc
index 8a7e9c3..753c087 100644
--- a/y2014/control_loops/claw/claw_lib_test.cc
+++ b/y2014/control_loops/claw/claw_lib_test.cc
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <memory>
 
-#include "aos/common/controls/control_loop_test.h"
+#include "aos/controls/control_loop_test.h"
 #include "frc971/control_loops/team_number_test_environment.h"
 #include "gtest/gtest.h"
 #include "y2014/constants.h"
diff --git a/y2014/control_loops/claw/replay_claw.cc b/y2014/control_loops/claw/replay_claw.cc
index 15cc9d9..21b44dd 100644
--- a/y2014/control_loops/claw/replay_claw.cc
+++ b/y2014/control_loops/claw/replay_claw.cc
@@ -1,4 +1,4 @@
-#include "aos/common/controls/replay_control_loop.h"
+#include "aos/controls/replay_control_loop.h"
 #include "aos/linux_code/init.h"
 
 #include "y2014/control_loops/claw/claw.q.h"
diff --git a/y2014/control_loops/shooter/BUILD b/y2014/control_loops/shooter/BUILD
index 6ab2a8b..c7e9ccc 100644
--- a/y2014/control_loops/shooter/BUILD
+++ b/y2014/control_loops/shooter/BUILD
@@ -9,7 +9,7 @@
   ],
   deps = [
     ':shooter_queue',
-    '//aos/common/controls:replay_control_loop',
+    '//aos/controls:replay_control_loop',
     '//aos/linux_code:init',
   ],
 )
@@ -20,7 +20,7 @@
     'shooter.q',
   ],
   deps = [
-    '//aos/common/controls:control_loop_queues',
+    '//aos/controls:control_loop_queues',
     '//frc971/control_loops:queues',
   ],
 )
@@ -54,10 +54,10 @@
   ],
   deps = [
     ':shooter_queue',
-    '//aos/common/controls:control_loop',
+    '//aos/controls:control_loop',
     '//y2014:constants',
     '//frc971/control_loops:state_feedback_loop',
-    '//aos/common/logging:queue_logging',
+    '//aos/logging:queue_logging',
   ],
   linkopts = [
     '-lm',
@@ -72,7 +72,7 @@
   deps = [
     ':shooter_lib',
     ':shooter_queue',
-    '//aos/common/controls:control_loop_test',
+    '//aos/controls:control_loop_test',
     '//aos/testing:googletest',
     '//frc971/control_loops:state_feedback_loop',
     '//frc971/control_loops:team_number_test_environment',
diff --git a/y2014/control_loops/shooter/replay_shooter.cc b/y2014/control_loops/shooter/replay_shooter.cc
index 1263f8a..2f42875 100644
--- a/y2014/control_loops/shooter/replay_shooter.cc
+++ b/y2014/control_loops/shooter/replay_shooter.cc
@@ -1,4 +1,4 @@
-#include "aos/common/controls/replay_control_loop.h"
+#include "aos/controls/replay_control_loop.h"
 #include "aos/linux_code/init.h"
 
 #include "y2014/control_loops/shooter/shooter.q.h"
diff --git a/y2014/control_loops/shooter/shooter.cc b/y2014/control_loops/shooter/shooter.cc
index 70a6cad..e2f104c 100644
--- a/y2014/control_loops/shooter/shooter.cc
+++ b/y2014/control_loops/shooter/shooter.cc
@@ -6,9 +6,9 @@
 #include <limits>
 #include <chrono>
 
-#include "aos/common/controls/control_loops.q.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/queue_logging.h"
+#include "aos/controls/control_loops.q.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/queue_logging.h"
 
 #include "y2014/constants.h"
 #include "y2014/control_loops/shooter/shooter_motor_plant.h"
diff --git a/y2014/control_loops/shooter/shooter.h b/y2014/control_loops/shooter/shooter.h
index f2ddbc8..0530012 100644
--- a/y2014/control_loops/shooter/shooter.h
+++ b/y2014/control_loops/shooter/shooter.h
@@ -3,9 +3,9 @@
 
 #include <memory>
 
-#include "aos/common/controls/control_loop.h"
+#include "aos/controls/control_loop.h"
 #include "frc971/control_loops/state_feedback_loop.h"
-#include "aos/common/time.h"
+#include "aos/time/time.h"
 
 #include "y2014/constants.h"
 #include "y2014/control_loops/shooter/shooter_motor_plant.h"
diff --git a/y2014/control_loops/shooter/shooter.q b/y2014/control_loops/shooter/shooter.q
index ab8f590..5624d84 100644
--- a/y2014/control_loops/shooter/shooter.q
+++ b/y2014/control_loops/shooter/shooter.q
@@ -1,6 +1,6 @@
 package y2014.control_loops;
 
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
 import "frc971/control_loops/control_loops.q";
 
 queue_group ShooterQueue {
diff --git a/y2014/control_loops/shooter/shooter_lib_test.cc b/y2014/control_loops/shooter/shooter_lib_test.cc
index 851e617..2869331 100644
--- a/y2014/control_loops/shooter/shooter_lib_test.cc
+++ b/y2014/control_loops/shooter/shooter_lib_test.cc
@@ -3,8 +3,8 @@
 #include <chrono>
 #include <memory>
 
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/network/team_number.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/network/team_number.h"
 #include "frc971/control_loops/team_number_test_environment.h"
 #include "gtest/gtest.h"
 #include "y2014/constants.h"