aos/common/{control_loop=>controls} and moved polytope.h into it
diff --git a/frc971/control_loops/shooter/shooter.cc b/frc971/control_loops/shooter/shooter.cc
index da2aa42..ce8aa71 100755
--- a/frc971/control_loops/shooter/shooter.cc
+++ b/frc971/control_loops/shooter/shooter.cc
@@ -4,7 +4,7 @@
#include <algorithm>
-#include "aos/common/control_loop/control_loops.q.h"
+#include "aos/common/controls/control_loops.q.h"
#include "aos/common/logging/logging.h"
#include "aos/common/logging/queue_logging.h"
diff --git a/frc971/control_loops/shooter/shooter.h b/frc971/control_loops/shooter/shooter.h
index 7221751..a909d40 100755
--- a/frc971/control_loops/shooter/shooter.h
+++ b/frc971/control_loops/shooter/shooter.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "aos/common/control_loop/control_loop.h"
+#include "aos/common/controls/control_loop.h"
#include "frc971/control_loops/state_feedback_loop.h"
#include "aos/common/time.h"
diff --git a/frc971/control_loops/shooter/shooter.q b/frc971/control_loops/shooter/shooter.q
index 2a42172..bc83ff7 100755
--- a/frc971/control_loops/shooter/shooter.q
+++ b/frc971/control_loops/shooter/shooter.q
@@ -1,6 +1,6 @@
package frc971.control_loops;
-import "aos/common/control_loop/control_loops.q";
+import "aos/common/controls/control_loops.q";
import "frc971/control_loops/control_loops.q";
queue_group ShooterGroup {