diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 6f21471c7..d5ac6889b 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -12,7 +12,7 @@ var ContactList = require("./side_pannels/contactlist/ContactList");
 var Avatar = require("./avatar/Avatar");
 var EventEmitter = require("events");
 var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
-var Settings = require("./side_pannels/settings/Settings");
+var Settings = require("./../settings/Settings");
 var PanelToggler = require("./side_pannels/SidePanelToggler");
 var RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
 UI.messageHandler = require("./util/MessageHandler");
diff --git a/modules/UI/avatar/Avatar.js b/modules/UI/avatar/Avatar.js
index b7b61524e..b718be8d7 100644
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -1,4 +1,4 @@
-var Settings = require("../side_pannels/settings/Settings");
+var Settings = require("../../settings/Settings");
 var MediaStreamType = require("../../../service/RTC/MediaStreamTypes");
 
 var users = {};
diff --git a/modules/UI/side_pannels/SidePanelToggler.js b/modules/UI/side_pannels/SidePanelToggler.js
index 938e869d4..9b146e811 100644
--- a/modules/UI/side_pannels/SidePanelToggler.js
+++ b/modules/UI/side_pannels/SidePanelToggler.js
@@ -1,6 +1,6 @@
 var Chat = require("./chat/Chat");
 var ContactList = require("./contactlist/ContactList");
-var Settings = require("./settings/Settings");
+var Settings = require("./../../settings/Settings");
 var SettingsMenu = require("./settings/SettingsMenu");
 var VideoLayout = require("../videolayout/VideoLayout");
 var ToolbarToggler = require("../toolbars/ToolbarToggler");
diff --git a/modules/UI/side_pannels/settings/SettingsMenu.js b/modules/UI/side_pannels/settings/SettingsMenu.js
index f9c1483c7..62770340c 100644
--- a/modules/UI/side_pannels/settings/SettingsMenu.js
+++ b/modules/UI/side_pannels/settings/SettingsMenu.js
@@ -1,5 +1,5 @@
 var Avatar = require("../../avatar/Avatar");
-var Settings = require("./Settings");
+var Settings = require("./../../../settings/Settings");
 var UIUtil = require("../../util/UIUtil");
 var languages = require("../../../../service/translation/languages");
 
diff --git a/modules/UI/side_pannels/settings/Settings.js b/modules/settings/Settings.js
similarity index 87%
rename from modules/UI/side_pannels/settings/Settings.js
rename to modules/settings/Settings.js
index 620f9cb4e..724b964e4 100644
--- a/modules/UI/side_pannels/settings/Settings.js
+++ b/modules/settings/Settings.js
@@ -15,13 +15,13 @@ function supportsLocalStorage() {
 
 function generateUniqueId() {
     function _p8() {
-        return (Math.random().toString(16)+"000000000").substr(2,8);
+        return (Math.random().toString(16) + "000000000").substr(2, 8);
     }
     return _p8() + _p8() + _p8() + _p8();
 }
 
-if(supportsLocalStorage()) {
-    if(!window.localStorage.jitsiMeetId) {
+if (supportsLocalStorage()) {
+    if (!window.localStorage.jitsiMeetId) {
         window.localStorage.jitsiMeetId = generateUniqueId();
         console.log("generated id", window.localStorage.jitsiMeetId);
     }
@@ -40,7 +40,7 @@ var Settings =
         window.localStorage.displayname = displayName;
         return displayName;
     },
-    setEmail: function(newEmail)
+    setEmail: function (newEmail)
     {
         email = newEmail;
         window.localStorage.email = newEmail;