diff --git a/Server/BotsScripts.js b/Server/BotsScripts.js
index 98cee047b..d0735e9a6 100644
--- a/Server/BotsScripts.js
+++ b/Server/BotsScripts.js
@@ -83,11 +83,11 @@
                 }
             }
 
-            function getCommons(pDevTeam, pBot, callBack) {
+            function getCommons(pDevTeam, pRepo, callBack) {
 
                 let moduleName = "Commons.js";
-                let key = pDevTeam + "." + pBot;
-                let path = pDevTeam + "/" + pBot;
+                let key = pDevTeam + "." + pRepo;
+                let path = pDevTeam + "/" + pRepo;
 
                 switch (serverConfig.configAndPlugins.Location) {
 
@@ -95,7 +95,7 @@
 
                         if (CONSOLE_LOG === true) { console.log("[INFO] BotScripts -> retrieveScripts -> Cloud -> Entering Case."); }
 
-                        storage.getStorageData(pDevTeam, pBot, moduleName, onDataArrived);
+                        storage.getStorageData(pDevTeam, pRepo, moduleName, onDataArrived);
 
                         function onDataArrived(pData) {
 
@@ -110,7 +110,7 @@
 
                                     data = browserify(data);
 
-                                    fileSystemData.set(key, data);
+                                    storageData.set(key, data);
 
                                 }
 
@@ -183,7 +183,7 @@
 
                                     data = browserify(data);
 
-                                    fileSystemData.set(key, data);
+                                    githubData.set(key, data);
 
                                 }
 
@@ -199,11 +199,11 @@
                 }
             }
 
-            function getUserBot(pDevTeam, pBot, pProcess, callBack) {
+            function getUserBot(pDevTeam, pRepo, pProcess, callBack) {
 
                 let moduleName = "User.Bot.js";
-                let key = pDevTeam + "." + pBot + "." + pProcess;
-                let path = pDevTeam + "/" + pBot + "/" + pProcess;
+                let key = pDevTeam + "." + pRepo + "." + pProcess + "/" + moduleName;
+                let path = pProcess + "/" + moduleName;
 
                 switch (serverConfig.configAndPlugins.Location) {
 
@@ -211,7 +211,7 @@
 
                         if (CONSOLE_LOG === true) { console.log("[INFO] BotScripts -> retrieveScripts -> Cloud -> Entering Case."); }
 
-                        storage.getStorageData(pDevTeam, pBot, moduleName, onDataArrived);
+                        storage.getStorageData(pDevTeam, pRepo, path, onDataArrived);
 
                         function onDataArrived(pData) {
 
@@ -226,7 +226,7 @@
 
                                     data = browserify(data);
 
-                                    fileSystemData.set(key, data);
+                                    storageData.set(key, data);
 
                                 }
 
@@ -247,7 +247,7 @@
 
                         let fs = require('fs');
                         try {
-                            let fileName = '../Bots/' + path + "/" + moduleName;
+                            let fileName = '../Bots/' + pDevTeam + pRepo + path + "/" + moduleName;
                             fs.readFile(fileName, onFileRead);
 
                             function onFileRead(err, pData) {
@@ -286,7 +286,7 @@
 
                         if (CONSOLE_LOG === true) { console.log("[INFO] BotScripts -> retrieveScripts -> Github -> Entering Case."); }
 
-                        github.getGithubData(path, moduleName, onDataArrived);
+                        github.getGithubData(pDevTeam, pRepo, path, onDataArrived);
 
                         function onDataArrived(pData) {
 
@@ -299,7 +299,7 @@
 
                                     data = browserify(data);
 
-                                    fileSystemData.set(key, data);
+                                    githubData.set(key, data);
 
                                 }
 
diff --git a/Server/Storage.js b/Server/Storage.js
index 1c242fcb1..ab5524872 100644
--- a/Server/Storage.js
+++ b/Server/Storage.js
@@ -76,9 +76,9 @@
 
                         if (err !== null || text === null) {
 
-                            console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Error Received from Storage Library. ");
-                            console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> err = " + JSON.stringify(err));
-                            console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Returning an empty JSON object string. ");
+                            if (CONSOLE_LOG === true) { console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Error Received from Storage Library. "); }
+                            if (CONSOLE_LOG === true) { console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> err = " + JSON.stringify(err)); }
+                            if (CONSOLE_LOG === true) { console.log("[ERROR] Storage -> getStorageData -> onFileReceived -> Returning an empty JSON object string. "); }
 
                             callBackFunction("{}");
                             return;
diff --git a/server.js b/server.js
index b41513f9c..ffeee582a 100644
--- a/server.js
+++ b/server.js
@@ -456,8 +456,6 @@ function onBrowserRequest(request, response) {
 
                         if (CONSOLE_LOG === true) { console.log("[INFO] server -> onBrowserRequest -> readEcosystemConfig -> Github -> Entering Case."); }
 
-                        github.getGithubData(requestParameters[2], requestParameters[3], requestParameters[4], onDataArrived);
-
                         map = githubData;
                         break;
                     }
@@ -515,19 +513,19 @@ function onBrowserRequest(request, response) {
 
                 let key;
 
-                if (requestParameters[4] !== undefined) {
+                if (requestParameters[5] !== undefined) {
 
-                    key = requestParameters[2] + "." + requestParameters[3] + "." + requestParameters[4];
+                    key = requestParameters[2] + "." + requestParameters[3] + "." + requestParameters[4] + "/" + requestParameters[5];
 
                 } else {
 
-                    key = requestParameters[2] + "." + requestParameters[3];
+                    key = requestParameters[2] + "." + requestParameters[3] + "." + requestParameters[4];
 
                 }
 
                 let script = map.get(key);
 
-                if (script !== undefined) {
+                if (script !== undefined && script !== null) {
 
                     respondWithContent(script, response);