diff --git a/frc971/codelab/BUILD b/frc971/codelab/BUILD
index 2823200..252e01d 100644
--- a/frc971/codelab/BUILD
+++ b/frc971/codelab/BUILD
@@ -9,8 +9,8 @@
     ':basic_queue',
     ':basic',
     '//aos/testing:googletest',
-    '//aos/common:queues',
-    '//aos/common/controls:control_loop_test',
+    '//aos:queues',
+    '//aos/controls:control_loop_test',
     '//frc971/control_loops:state_feedback_loop',
     '//frc971/control_loops:team_number_test_environment',
   ],
@@ -23,7 +23,7 @@
   hdrs = ['basic.h'],
   deps = [
     ':basic_queue',
-    '//aos/common/controls:control_loop',
+    '//aos/controls:control_loop',
   ],
 )
 
@@ -33,7 +33,7 @@
     'basic.q',
   ],
   deps = [
-    '//aos/common/controls:control_loop_queues',
+    '//aos/controls:control_loop_queues',
     '//frc971/control_loops:queues',
   ],
 )
diff --git a/frc971/codelab/basic.h b/frc971/codelab/basic.h
index b67fdbd..0332168 100644
--- a/frc971/codelab/basic.h
+++ b/frc971/codelab/basic.h
@@ -1,8 +1,8 @@
 #ifndef FRC971_CODELAB_BASIC_H_
 #define FRC971_CODELAB_BASIC_H_
 
-#include "aos/common/controls/control_loop.h"
-#include "aos/common/time.h"
+#include "aos/controls/control_loop.h"
+#include "aos/time/time.h"
 
 #include "frc971/codelab/basic.q.h"
 
diff --git a/frc971/codelab/basic.q b/frc971/codelab/basic.q
index 8183271..58fd69e 100644
--- a/frc971/codelab/basic.q
+++ b/frc971/codelab/basic.q
@@ -1,6 +1,6 @@
 package frc971.codelab;
 
-import "aos/common/controls/control_loops.q";
+import "aos/controls/control_loops.q";
 import "frc971/control_loops/control_loops.q";
 
 // The theme of this basic test is a simple intake system.
diff --git a/frc971/codelab/basic_test.cc b/frc971/codelab/basic_test.cc
index 0acf9e7..0761cb2 100644
--- a/frc971/codelab/basic_test.cc
+++ b/frc971/codelab/basic_test.cc
@@ -5,8 +5,8 @@
 #include <chrono>
 #include <memory>
 
-#include "aos/common/controls/control_loop_test.h"
-#include "aos/common/queue.h"
+#include "aos/controls/control_loop_test.h"
+#include "aos/queue.h"
 #include "frc971/codelab/basic.q.h"
 #include "frc971/control_loops/team_number_test_environment.h"
 #include "gtest/gtest.h"