Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/y2017/control_loops/superstructure/column/BUILD b/y2017/control_loops/superstructure/column/BUILD
index 149ef32..694dd47 100644
--- a/y2017/control_loops/superstructure/column/BUILD
+++ b/y2017/control_loops/superstructure/column/BUILD
@@ -44,8 +44,8 @@
deps = [
':column_plants',
':column_zeroing',
- '//aos/common/controls:control_loop',
- '//aos/common:math',
+ '//aos/controls:control_loop',
+ '//aos:math',
'//frc971/control_loops:profiled_subsystem',
'//y2017/control_loops/superstructure/intake:intake',
'//y2017/control_loops/superstructure:superstructure_queue',
diff --git a/y2017/control_loops/superstructure/column/column.cc b/y2017/control_loops/superstructure/column/column.cc
index 346a5d5..aaca601 100644
--- a/y2017/control_loops/superstructure/column/column.cc
+++ b/y2017/control_loops/superstructure/column/column.cc
@@ -7,7 +7,7 @@
#include "Eigen/Dense"
-#include "aos/common/commonmath.h"
+#include "aos/commonmath.h"
#include "frc971/constants.h"
#include "frc971/control_loops/profiled_subsystem.h"
#include "frc971/control_loops/state_feedback_loop.h"
diff --git a/y2017/control_loops/superstructure/column/column_zeroing_test.cc b/y2017/control_loops/superstructure/column/column_zeroing_test.cc
index e6739fc..3cc9c2e 100644
--- a/y2017/control_loops/superstructure/column/column_zeroing_test.cc
+++ b/y2017/control_loops/superstructure/column/column_zeroing_test.cc
@@ -2,7 +2,7 @@
#include <memory>
#include <random>
-#include "aos/common/die.h"
+#include "aos/die.h"
#include "aos/testing/test_shm.h"
#include "frc971/control_loops/position_sensor_sim.h"
#include "frc971/control_loops/team_number_test_environment.h"