diff --git a/y2017/control_loops/python/BUILD b/y2017/control_loops/python/BUILD
index 47c24e8..5d7a002 100644
--- a/y2017/control_loops/python/BUILD
+++ b/y2017/control_loops/python/BUILD
@@ -86,7 +86,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",
@@ -103,7 +103,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",
@@ -120,7 +120,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",
@@ -135,7 +135,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",
diff --git a/y2017/control_loops/python/column.py b/y2017/control_loops/python/column.py
index 4cbf4dd..1f8bd76 100755
--- a/y2017/control_loops/python/column.py
+++ b/y2017/control_loops/python/column.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
 from y2017.control_loops.python import turret
diff --git a/y2017/control_loops/python/hood.py b/y2017/control_loops/python/hood.py
index 2704216..fb5aa4e 100755
--- a/y2017/control_loops/python/hood.py
+++ b/y2017/control_loops/python/hood.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
diff --git a/y2017/control_loops/python/intake.py b/y2017/control_loops/python/intake.py
index 5f557f1..64998c7 100755
--- a/y2017/control_loops/python/intake.py
+++ b/y2017/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
diff --git a/y2017/control_loops/python/turret.py b/y2017/control_loops/python/turret.py
index f07e7a5..e8829eb 100755
--- a/y2017/control_loops/python/turret.py
+++ b/y2017/control_loops/python/turret.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