diff --git a/y2016/control_loops/python/BUILD b/y2016/control_loops/python/BUILD
index adb3150..08a34e8 100644
--- a/y2016/control_loops/python/BUILD
+++ b/y2016/control_loops/python/BUILD
@@ -70,7 +70,7 @@
     restricted_to = ["//tools:k8"],
     deps = [
         ":python_init",
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -87,7 +87,7 @@
     restricted_to = ["//tools:k8"],
     deps = [
         ":python_init",
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -104,7 +104,7 @@
     restricted_to = ["//tools:k8"],
     deps = [
         ":python_init",
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -119,7 +119,7 @@
     ],
     restricted_to = ["//tools:k8"],
     deps = [
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -133,7 +133,7 @@
     ],
     restricted_to = ["//tools:k8"],
     deps = [
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -150,7 +150,7 @@
     deps = [
         ":shoulder_lib",
         ":wrist_lib",
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
@@ -169,7 +169,7 @@
         ":python_init",
         ":shoulder_lib",
         ":wrist_lib",
-        "//aos/common/util:py_trapezoid_profile",
+        "//aos/util:py_trapezoid_profile",
         "//external:python-gflags",
         "//external:python-glog",
         "//frc971/control_loops/python:controls",
diff --git a/y2016/control_loops/python/arm.py b/y2016/control_loops/python/arm.py
index 8908038..5c5793b 100755
--- a/y2016/control_loops/python/arm.py
+++ b/y2016/control_loops/python/arm.py
@@ -9,7 +9,7 @@
 
 from y2016.control_loops.python.shoulder import Shoulder, IntegralShoulder
 from y2016.control_loops.python.wrist import Wrist, IntegralWrist
-from aos.common.util.trapezoid_profile import TrapezoidProfile
+from aos.util.trapezoid_profile import TrapezoidProfile
 
 from matplotlib import pylab
 import gflags
diff --git a/y2016/control_loops/python/intake.py b/y2016/control_loops/python/intake.py
index 02c1ada..abb755c 100755
--- a/y2016/control_loops/python/intake.py
+++ b/y2016/control_loops/python/intake.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from aos.common.util.trapezoid_profile import TrapezoidProfile
+from aos.util.trapezoid_profile import TrapezoidProfile
 from frc971.control_loops.python import control_loop
 from frc971.control_loops.python import controls
 import numpy