Once files moved to aos folder and files updated accordingly

Change-Id: Idd26fca1d4dc15407e92859400e1a15a8a142ec3
diff --git a/y2016/BUILD b/y2016/BUILD
index d3c4a9e..49e864c 100644
--- a/y2016/BUILD
+++ b/y2016/BUILD
@@ -11,7 +11,7 @@
   ],
   deps = [
     '//aos/common/logging',
-    '//aos/common:once',
+    '//aos:once',
     '//aos/common/network:team_number',
     '//aos/common:mutex',
     '//frc971/control_loops:state_feedback_loop',
diff --git a/y2016/constants.cc b/y2016/constants.cc
index 3e16b0c..8bbda56 100644
--- a/y2016/constants.cc
+++ b/y2016/constants.cc
@@ -11,9 +11,9 @@
 #endif
 
 #include "aos/common/logging/logging.h"
-#include "aos/common/once.h"
-#include "aos/common/network/team_number.h"
 #include "aos/common/mutex.h"
+#include "aos/common/network/team_number.h"
+#include "aos/once.h"
 
 #include "y2016/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
 #include "y2016/control_loops/drivetrain/drivetrain_dog_motor_plant.h"