cleaned up a bunch of build + formatting
diff --git a/aos/crio/controls/ControlsManager.cpp b/aos/crio/controls/ControlsManager.cpp
index c1f11cd..cfc429b 100644
--- a/aos/crio/controls/ControlsManager.cpp
+++ b/aos/crio/controls/ControlsManager.cpp
@@ -1,10 +1,11 @@
+#include "aos/crio/controls/ControlsManager.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "WPILib/Compressor.h"
 
 #include "aos/crio/logging/crio_logging.h"
-#include "aos/crio/controls/ControlsManager.h"
 #include "aos/common/Configuration.h"
 #include "aos/crio/aos_ctdt.h"
 #include "aos/crio/motor_server/CRIOControlLoopRunner.h"
@@ -50,4 +51,4 @@
 }
 
 }  // namespace crio
-} // namespace aos
+}  // namespace aos
diff --git a/aos/crio/controls/controls.gyp b/aos/crio/controls/controls.gyp
new file mode 100644
index 0000000..2dd7098
--- /dev/null
+++ b/aos/crio/controls/controls.gyp
@@ -0,0 +1,22 @@
+{
+  'targets': [
+    {
+      'target_name': 'ControlsManager',
+      'type': 'static_library',
+      'sources': [
+        'ControlsManager.cpp',
+        'JoyStickRead.cpp',
+      ],
+      'dependencies': [
+        '<(EXTERNALS):WPILib',
+        '<(AOS)/build/aos.gyp:logging',
+        '<(AOS)/common/common.gyp:common',
+        '<(AOS)/crio/motor_server/motor_server.gyp:CRIOControlLoopRunner',
+        '<(AOS)/crio/motor_server/motor_server.gyp:MotorServer',
+      ],
+      'export_dependent_settings': [
+        '<(EXTERNALS):WPILib',
+      ],
+    },
+  ],
+}