diff --git a/y2017/control_loops/superstructure/BUILD b/y2017/control_loops/superstructure/BUILD
index 3a3d17e..732c6dc 100644
--- a/y2017/control_loops/superstructure/BUILD
+++ b/y2017/control_loops/superstructure/BUILD
@@ -1,123 +1,123 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
-load('//aos/build:queues.bzl', 'queue_library')
+load("//aos/build:queues.bzl", "queue_library")
 
 queue_library(
-  name = 'superstructure_queue',
-  srcs = [
-    'superstructure.q',
-  ],
-  deps = [
-    '//aos/controls:control_loop_queues',
-    '//frc971/control_loops:profiled_subsystem_queue',
-    '//frc971/control_loops:queues',
-  ],
+    name = "superstructure_queue",
+    srcs = [
+        "superstructure.q",
+    ],
+    deps = [
+        "//aos/controls:control_loop_queues",
+        "//frc971/control_loops:profiled_subsystem_queue",
+        "//frc971/control_loops:queues",
+    ],
 )
 
 cc_library(
-  name = 'superstructure_lib',
-  srcs = [
-    'superstructure.cc',
-  ],
-  hdrs = [
-    'superstructure.h',
-  ],
-  deps = [
-    ':vision_distance_average',
-    ':superstructure_queue',
-    '//aos/controls:control_loop',
-    '//y2017/control_loops/superstructure/column',
-    '//y2017/control_loops/superstructure/hood',
-    '//y2017/control_loops/superstructure/intake',
-    '//y2017/control_loops/superstructure/shooter',
-    '//y2017:constants',
-  ],
+    name = "superstructure_lib",
+    srcs = [
+        "superstructure.cc",
+    ],
+    hdrs = [
+        "superstructure.h",
+    ],
+    deps = [
+        ":superstructure_queue",
+        ":vision_distance_average",
+        "//aos/controls:control_loop",
+        "//y2017:constants",
+        "//y2017/control_loops/superstructure/column",
+        "//y2017/control_loops/superstructure/hood",
+        "//y2017/control_loops/superstructure/intake",
+        "//y2017/control_loops/superstructure/shooter",
+    ],
 )
 
 cc_test(
-  name = 'superstructure_lib_test',
-  srcs = [
-    'superstructure_lib_test.cc',
-  ],
-  deps = [
-    ':superstructure_queue',
-    ':superstructure_lib',
-    '//aos/controls:control_loop_test',
-    '//aos:math',
-    '//aos:queues',
-    '//aos/time:time',
-    '//aos/testing:googletest',
-    '//frc971/control_loops:position_sensor_sim',
-    '//frc971/control_loops:team_number_test_environment',
-    '//y2017/control_loops/superstructure/column:column_plants',
-    '//y2017/control_loops/superstructure/hood:hood_plants',
-    '//y2017/control_loops/superstructure/intake:intake_plants',
-    '//y2017/control_loops/superstructure/shooter:shooter_plants',
-  ],
+    name = "superstructure_lib_test",
+    srcs = [
+        "superstructure_lib_test.cc",
+    ],
+    deps = [
+        ":superstructure_lib",
+        ":superstructure_queue",
+        "//aos:math",
+        "//aos:queues",
+        "//aos/controls:control_loop_test",
+        "//aos/testing:googletest",
+        "//aos/time",
+        "//frc971/control_loops:position_sensor_sim",
+        "//frc971/control_loops:team_number_test_environment",
+        "//y2017/control_loops/superstructure/column:column_plants",
+        "//y2017/control_loops/superstructure/hood:hood_plants",
+        "//y2017/control_loops/superstructure/intake:intake_plants",
+        "//y2017/control_loops/superstructure/shooter:shooter_plants",
+    ],
 )
 
 cc_binary(
-  name = 'superstructure',
-  srcs = [
-    'superstructure_main.cc',
-  ],
-  deps = [
-    '//aos:init',
-    ':superstructure_lib',
-    ':superstructure_queue',
-  ],
+    name = "superstructure",
+    srcs = [
+        "superstructure_main.cc",
+    ],
+    deps = [
+        ":superstructure_lib",
+        ":superstructure_queue",
+        "//aos:init",
+    ],
 )
 
 cc_library(
-  name = 'vision_time_adjuster',
-  hdrs = [
-    'vision_time_adjuster.h',
-  ],
-  srcs = [
-    'vision_time_adjuster.cc',
-  ],
-  deps = [
-    ':superstructure_queue',
-    '//aos/ring_buffer:ring_buffer',
-    '//frc971/control_loops/drivetrain:drivetrain_queue',
-    '//y2017/control_loops/drivetrain:polydrivetrain_plants',
-    '//y2017/vision:vision_queue',
-  ],
+    name = "vision_time_adjuster",
+    srcs = [
+        "vision_time_adjuster.cc",
+    ],
+    hdrs = [
+        "vision_time_adjuster.h",
+    ],
+    deps = [
+        ":superstructure_queue",
+        "//aos/containers:ring_buffer",
+        "//frc971/control_loops/drivetrain:drivetrain_queue",
+        "//y2017/control_loops/drivetrain:polydrivetrain_plants",
+        "//y2017/vision:vision_queue",
+    ],
 )
 
 cc_test(
-  name = 'vision_time_adjuster_test',
-  srcs = [
-    'vision_time_adjuster_test.cc',
-  ],
-  deps = [
-    ':vision_time_adjuster',
-    '//aos/time:time',
-    '//aos/testing:googletest',
-    '//aos/testing:test_shm',
-  ],
+    name = "vision_time_adjuster_test",
+    srcs = [
+        "vision_time_adjuster_test.cc",
+    ],
+    deps = [
+        ":vision_time_adjuster",
+        "//aos/testing:googletest",
+        "//aos/testing:test_shm",
+        "//aos/time",
+    ],
 )
 
 cc_library(
-  name = 'vision_distance_average',
-  hdrs = [
-    'vision_distance_average.h',
-  ],
-  deps = [
-    '//aos/time:time',
-    '//aos/ring_buffer:ring_buffer',
-    '//y2017/vision:vision_queue',
-  ],
+    name = "vision_distance_average",
+    hdrs = [
+        "vision_distance_average.h",
+    ],
+    deps = [
+        "//aos/containers:ring_buffer",
+        "//aos/time",
+        "//y2017/vision:vision_queue",
+    ],
 )
 
 cc_test(
-  name = 'vision_distance_average_test',
-  srcs = [
-    'vision_distance_average_test.cc',
-  ],
-  deps = [
-    ':vision_distance_average',
-    '//aos/time:time',
-    '//aos/testing:googletest',
-  ],
+    name = "vision_distance_average_test",
+    srcs = [
+        "vision_distance_average_test.cc",
+    ],
+    deps = [
+        ":vision_distance_average",
+        "//aos/testing:googletest",
+        "//aos/time",
+    ],
 )
diff --git a/y2017/control_loops/superstructure/vision_distance_average.h b/y2017/control_loops/superstructure/vision_distance_average.h
index 22464b7..74e775d 100644
--- a/y2017/control_loops/superstructure/vision_distance_average.h
+++ b/y2017/control_loops/superstructure/vision_distance_average.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <chrono>
 
-#include "aos/ring_buffer/ring_buffer.h"
+#include "aos/containers/ring_buffer.h"
 #include "aos/time/time.h"
 #include "y2017/vision/vision.q.h"
 
diff --git a/y2017/control_loops/superstructure/vision_time_adjuster.h b/y2017/control_loops/superstructure/vision_time_adjuster.h
index 52e7d70..b475a99 100644
--- a/y2017/control_loops/superstructure/vision_time_adjuster.h
+++ b/y2017/control_loops/superstructure/vision_time_adjuster.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "aos/ring_buffer/ring_buffer.h"
+#include "aos/containers/ring_buffer.h"
 #include "aos/time/time.h"
 #include "y2017/vision/vision.q.h"