diff --git a/src/components/input/gamepadtokey.js b/src/components/input/gamepadtokey.js
index 865a37f101..0b17981f55 100644
--- a/src/components/input/gamepadtokey.js
+++ b/src/components/input/gamepadtokey.js
@@ -253,13 +253,13 @@ require(['apphost'], function (appHost) {
 
     function runInputLoop() {
         // Get the latest gamepad state.
-        var gamepads;
-        gamepads = navigator.getGamepads();
-        var i;
-        var j;
-        var len;
-        for (i = 0, len = gamepads.length; i < len; i++) {
+        var gamepads = navigator.getGamepads();
+        for (var i = 0, len = gamepads.length; i < len; i++) {
             var gamepad = gamepads[i];
+            if (!gamepad)
+            {
+                return;
+            }
             // Iterate through the axes
             var axes = gamepad.axes;
             var leftStickX = axes[0];
@@ -280,6 +280,7 @@ require(['apphost'], function (appHost) {
             }
             // Iterate through the buttons to see if Left thumbstick, DPad, A and B are pressed.
             var buttons = gamepad.buttons;
+            var j;
             for (j = 0, len = buttons.length; j < len; j++) {
                 if (ProcessedButtons.indexOf(j) !== -1) {
                     if (buttons[j].pressed) {
diff --git a/src/components/keyboardnavigation.js b/src/components/input/keyboardnavigation.js
similarity index 95%
rename from src/components/keyboardnavigation.js
rename to src/components/input/keyboardnavigation.js
index 8e0bc2f9d4..3840c08e8a 100644
--- a/src/components/keyboardnavigation.js
+++ b/src/components/input/keyboardnavigation.js
@@ -128,12 +128,9 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
 
     function isGamepadConnected() {
         var gamepads = navigator.getGamepads();
-        var i;
-        var len;
-        for (i = 0, len = gamepads.length; i < len; i++) {
+        for (var i = 0, len = gamepads.length; i < len; i++) {
             var gamepad = gamepads[i];
             if (gamepad) {
-                console.log(gamepad);
                 return true;
             }
         }
@@ -149,7 +146,6 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
 
     function dettachGamepad(e) {
         if (!isGamepadConnected()) {
-            delete require.cache[require(["components/input/gamepadtokey"])];
             console.log("Gamepad disconnected! No other gamepads are connected, dettaching gamepadtokey.js");
         } else {
             console.log("Gamepad disconnected! There are gamepads still connected.");
diff --git a/src/components/serverNotifications/serverNotifications.js b/src/components/serverNotifications.js
similarity index 100%
rename from src/components/serverNotifications/serverNotifications.js
rename to src/components/serverNotifications.js
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 3a10dc85a1..4ad1d10352 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -882,9 +882,9 @@ var AppInfo = {};
         define("htmlMediaHelper", [componentsPath + "/htmlMediaHelper"], returnFirstDependency);
         define("viewContainer", [componentsPath + "/viewContainer"], returnFirstDependency);
         define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency);
-        define("serverNotifications", [componentsPath + "/serverNotifications/serverNotifications"], returnFirstDependency);
+        define("serverNotifications", [componentsPath + "/serverNotifications"], returnFirstDependency);
         define("skinManager", [componentsPath + "/skinManager"], returnFirstDependency);
-        define("keyboardnavigation", [componentsPath + "/keyboardnavigation"], returnFirstDependency);
+        define("keyboardnavigation", [componentsPath + "/input/keyboardnavigation"], returnFirstDependency);
         define("scrollManager", [componentsPath + "/scrollManager"], returnFirstDependency);
         define("autoFocuser", [componentsPath + "/autoFocuser"], returnFirstDependency);
         define("connectionManager", [], function () {