diff --git a/frc971/autonomous/BUILD b/frc971/autonomous/BUILD
index 5fe1455..003ceb6 100644
--- a/frc971/autonomous/BUILD
+++ b/frc971/autonomous/BUILD
@@ -8,7 +8,7 @@
     'auto.q',
   ],
   deps = [
-    '//aos/common/actions:action_queue',
+    '//aos/actions:action_queue',
   ],
 )
 
@@ -22,9 +22,9 @@
   ],
   deps = [
     ':auto_queue',
-    '//aos/common/actions:action_lib',
-    '//aos/common/util:phased_loop',
-    '//aos/common/logging',
+    '//aos/actions:action_lib',
+    '//aos/util:phased_loop',
+    '//aos/logging',
     '//frc971/control_loops/drivetrain:drivetrain_config',
     '//frc971/control_loops/drivetrain:drivetrain_queue',
   ],
diff --git a/frc971/autonomous/auto.q b/frc971/autonomous/auto.q
index 1f639b1..b72688e 100644
--- a/frc971/autonomous/auto.q
+++ b/frc971/autonomous/auto.q
@@ -1,6 +1,6 @@
 package frc971.autonomous;
 
-import "aos/common/actions/actions.q";
+import "aos/actions/actions.q";
 
 message AutoControl {
   // True if auto mode should be running, false otherwise.
diff --git a/frc971/autonomous/base_autonomous_actor.cc b/frc971/autonomous/base_autonomous_actor.cc
index 3363125..df558ab 100644
--- a/frc971/autonomous/base_autonomous_actor.cc
+++ b/frc971/autonomous/base_autonomous_actor.cc
@@ -5,8 +5,8 @@
 #include <chrono>
 #include <cmath>
 
-#include "aos/common/util/phased_loop.h"
-#include "aos/common/logging/logging.h"
+#include "aos/util/phased_loop.h"
+#include "aos/logging/logging.h"
 
 #include "frc971/control_loops/drivetrain/drivetrain.q.h"
 
diff --git a/frc971/autonomous/base_autonomous_actor.h b/frc971/autonomous/base_autonomous_actor.h
index c8f6398..dd53a7d 100644
--- a/frc971/autonomous/base_autonomous_actor.h
+++ b/frc971/autonomous/base_autonomous_actor.h
@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "aos/common/actions/actions.h"
-#include "aos/common/actions/actor.h"
+#include "aos/actions/actions.h"
+#include "aos/actions/actor.h"
 #include "frc971/autonomous/auto.q.h"
 #include "frc971/control_loops/drivetrain/drivetrain.q.h"
 #include "frc971/control_loops/drivetrain/drivetrain_config.h"