diff --git a/interface/src/InputPlugins.cpp b/interface/src/InputPlugins.cpp
index a4f21e46bf..87d4311545 100644
--- a/interface/src/InputPlugins.cpp
+++ b/interface/src/InputPlugins.cpp
@@ -1,5 +1,5 @@
 //
-//  Created by Bradley Austin Davis on 2015/05/30
+//  Created by Sam Gondelman on 7/16/2015
 //  Copyright 2015 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 4753b74dc3..937aa69e2f 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -28,7 +28,7 @@
 #include "devices/DdeFaceTracker.h"
 #include "devices/Faceshift.h"
 #include "devices/RealSense.h"
-#include <input-plugins\SixenseManager.h> // TODO: should be able to remove this once input plugin architecture is finished
+#include <input-plugins/SixenseManager.h> // TODO: should be able to remove this once input plugin architecture is finished
 #include "MainWindow.h"
 #include "scripting/MenuScriptingInterface.h"
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
diff --git a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
index 417496bbb1..af222521fc 100644
--- a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
@@ -35,7 +35,7 @@ const QString & OpenVrDisplayPlugin::getName() const {
     return NAME;
 }
 
-vr::IVRSystem *_hmd{ nullptr };
+vr::IVRSystem* _hmd{ nullptr };
 int hmdRefCount = 0;
 static vr::IVRCompositor* _compositor{ nullptr };
 vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount];
diff --git a/libraries/input-plugins/src/input-plugins/InputDevice.cpp b/libraries/input-plugins/src/input-plugins/InputDevice.cpp
index 057fb7ddf1..351d5b6d1d 100644
--- a/libraries/input-plugins/src/input-plugins/InputDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/InputDevice.cpp
@@ -1,4 +1,7 @@
 //
+//  InputDevice.cpp
+//  input-plugins/src/input-plugins
+//
 //  Created by Sam Gondelman on 7/15/2015
 //  Copyright 2015 High Fidelity, Inc.
 //
diff --git a/libraries/input-plugins/src/input-plugins/InputDevice.h b/libraries/input-plugins/src/input-plugins/InputDevice.h
index 17f28c1bd8..7d36557ab9 100644
--- a/libraries/input-plugins/src/input-plugins/InputDevice.h
+++ b/libraries/input-plugins/src/input-plugins/InputDevice.h
@@ -1,4 +1,7 @@
 //
+//  InputDevice.h
+//  input-plugins/src/input-plugins
+//
 //  Created by Sam Gondelman on 7/15/2015
 //  Copyright 2015 High Fidelity, Inc.
 //
diff --git a/libraries/input-plugins/src/input-plugins/InputPlugin.cpp b/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
index 0543c3547f..36000ae5cc 100644
--- a/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
+++ b/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
@@ -1,4 +1,7 @@
 //
+//  InputPlugin.cpp
+//  input-plugins/src/input-plugins
+//
 //  Created by Sam Gondelman on 7/13/2015
 //  Copyright 2015 High Fidelity, Inc.
 //
diff --git a/libraries/input-plugins/src/input-plugins/InputPlugin.h b/libraries/input-plugins/src/input-plugins/InputPlugin.h
index d12ba4652f..787922e04c 100644
--- a/libraries/input-plugins/src/input-plugins/InputPlugin.h
+++ b/libraries/input-plugins/src/input-plugins/InputPlugin.h
@@ -1,4 +1,7 @@
 //
+//  InputPlugin.h
+//  input-plugins/src/input-plugins
+//
 //  Created by Sam Gondelman on 7/13/2015
 //  Copyright 2015 High Fidelity, Inc.
 //
diff --git a/libraries/input-plugins/src/input-plugins/Joystick.cpp b/libraries/input-plugins/src/input-plugins/Joystick.cpp
index a29b74ac40..aba9ec706c 100644
--- a/libraries/input-plugins/src/input-plugins/Joystick.cpp
+++ b/libraries/input-plugins/src/input-plugins/Joystick.cpp
@@ -1,7 +1,4 @@
 //
-//  Joystick.cpp
-//  interface/src/devices
-//
 //  Created by Stephen Birarda on 2014-09-23.
 //  Copyright 2014 High Fidelity, Inc.
 //
diff --git a/libraries/input-plugins/src/input-plugins/Joystick.h b/libraries/input-plugins/src/input-plugins/Joystick.h
index d78aef34d6..2ba89da052 100644
--- a/libraries/input-plugins/src/input-plugins/Joystick.h
+++ b/libraries/input-plugins/src/input-plugins/Joystick.h
@@ -1,6 +1,6 @@
 //
 //  Joystick.h
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Stephen Birarda on 2014-09-23.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index a6edfc392d..c855cba88e 100644
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -1,7 +1,6 @@
-
 //
 //  KeyboardMouseDevice.cpp
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gateau on 4/27/15.
 //  Copyright 2015 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h
index 85f9c3679e..656bb61455 100644
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h
@@ -1,6 +1,6 @@
 //
 //  KeyboardMouseDevice.h
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gateau on 4/27/15.
 //  Copyright 2015 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp b/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
index e8cae6be54..28874efdb0 100644
--- a/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
+++ b/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SDL2Manager.cpp
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gondelman on 6/5/15.
 //  Copyright 2015 High Fidelity, Inc.
@@ -121,20 +121,6 @@ void SDL2Manager::pluginUpdate(float deltaTime, bool jointsCaptured) {
                     
                     qApp->sendEvent(qApp, &backEvent);
                 }
-                // TODO: This will probably end up being deleted
-                //else if (event.cbutton.button == SDL_CONTROLLER_BUTTON_A) {
-                //    // this will either start or stop a global action event
-                //    QEvent::Type actionType = (event.type == SDL_CONTROLLERBUTTONDOWN)
-                //    ? HFActionEvent::startType()
-                //    : HFActionEvent::endType();
-                //    
-                //    // global action events fire in the center of the screen
-                //    Application* app = Application::getInstance();
-                //    PickRay pickRay = app->getCamera()->computePickRay(app->getTrueMouseX(),
-                //                                                       app->getTrueMouseY());
-                //    HFActionEvent actionEvent(actionType, pickRay);
-                //    qApp->sendEvent(qApp, &actionEvent);
-                //}
                 
             } else if (event.type == SDL_CONTROLLERDEVICEADDED) {
                 SDL_GameController* controller = SDL_GameControllerOpen(event.cdevice.which);
diff --git a/libraries/input-plugins/src/input-plugins/SDL2Manager.h b/libraries/input-plugins/src/input-plugins/SDL2Manager.h
index 62b3f60d47..136ab11c0a 100644
--- a/libraries/input-plugins/src/input-plugins/SDL2Manager.h
+++ b/libraries/input-plugins/src/input-plugins/SDL2Manager.h
@@ -1,6 +1,6 @@
 //
 //  SDL2Manager.h
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gondelman on 6/5/15.
 //  Copyright 2015 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/SixenseManager.cpp b/libraries/input-plugins/src/input-plugins/SixenseManager.cpp
index e6555b5442..aa92252230 100644
--- a/libraries/input-plugins/src/input-plugins/SixenseManager.cpp
+++ b/libraries/input-plugins/src/input-plugins/SixenseManager.cpp
@@ -1,6 +1,6 @@
 //
 //  SixenseManager.cpp
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Andrzej Kapolka on 11/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/SixenseManager.h b/libraries/input-plugins/src/input-plugins/SixenseManager.h
index 37b0acd51e..ab712999b2 100644
--- a/libraries/input-plugins/src/input-plugins/SixenseManager.h
+++ b/libraries/input-plugins/src/input-plugins/SixenseManager.h
@@ -1,6 +1,6 @@
 //
 //  SixenseManager.h
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Andrzej Kapolka on 11/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/UserInputMapper.cpp b/libraries/input-plugins/src/input-plugins/UserInputMapper.cpp
index fc959650ba..f6973cb31e 100755
--- a/libraries/input-plugins/src/input-plugins/UserInputMapper.cpp
+++ b/libraries/input-plugins/src/input-plugins/UserInputMapper.cpp
@@ -1,6 +1,6 @@
 //
 //  UserInputMapper.cpp
-//  interface/src/ui
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gateau on 4/27/15.
 //  Copyright 2015 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/UserInputMapper.h b/libraries/input-plugins/src/input-plugins/UserInputMapper.h
index 300f3cf5c3..fca19af3d7 100755
--- a/libraries/input-plugins/src/input-plugins/UserInputMapper.h
+++ b/libraries/input-plugins/src/input-plugins/UserInputMapper.h
@@ -1,6 +1,6 @@
 //
 //  UserInputMapper.h
-//  interface/src/ui
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gateau on 4/27/15.
 //  Copyright 2015 High Fidelity, Inc.
diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
index 825eb96789..0804378317 100644
--- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
+++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
@@ -1,6 +1,6 @@
 //
 //  ViveControllerManager.cpp
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gondelman on 6/29/15.
 //  Copyright 2013 High Fidelity, Inc.
@@ -21,7 +21,7 @@
 #include "NumericalConstants.h"
 #include "UserActivityLogger.h"
 
-extern vr::IVRSystem *_hmd;
+extern vr::IVRSystem* _hmd;
 extern int hmdRefCount;
 extern vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount];
 extern mat4 _trackedDevicePoseMat4[vr::k_unMaxTrackedDeviceCount];
diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h
index 9ba90a5ca8..4b132e4961 100644
--- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h
+++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h
@@ -1,6 +1,6 @@
 //
 //  ViveControllerManager.h
-//  interface/src/devices
+//  input-plugins/src/input-plugins
 //
 //  Created by Sam Gondelman on 6/29/15.
 //  Copyright 2013 High Fidelity, Inc.