diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfc7c842a9..0922779bc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,7 @@ if (NOT ANDROID)
   set_target_properties(domain-server PROPERTIES FOLDER "Apps")
   add_subdirectory(ice-server)
   set_target_properties(ice-server PROPERTIES FOLDER "Apps")
-  add_subdirectory(console)
+  add_subdirectory(server-console)
   if (NOT SERVER_ONLY)
     add_subdirectory(interface)
     set_target_properties(interface PROPERTIES FOLDER "Apps")
diff --git a/console/.gitignore b/server-console/.gitignore
similarity index 100%
rename from console/.gitignore
rename to server-console/.gitignore
diff --git a/console/CMakeLists.txt b/server-console/CMakeLists.txt
similarity index 100%
rename from console/CMakeLists.txt
rename to server-console/CMakeLists.txt
diff --git a/console/README.md b/server-console/README.md
similarity index 100%
rename from console/README.md
rename to server-console/README.md
diff --git a/console/package.json b/server-console/package.json
similarity index 100%
rename from console/package.json
rename to server-console/package.json
diff --git a/console/packager.js b/server-console/packager.js
similarity index 100%
rename from console/packager.js
rename to server-console/packager.js
diff --git a/console/resources/console-beta.icns b/server-console/resources/console-beta.icns
similarity index 100%
rename from console/resources/console-beta.icns
rename to server-console/resources/console-beta.icns
diff --git a/console/resources/console-beta.ico b/server-console/resources/console-beta.ico
similarity index 100%
rename from console/resources/console-beta.ico
rename to server-console/resources/console-beta.ico
diff --git a/console/resources/console-beta.png b/server-console/resources/console-beta.png
similarity index 100%
rename from console/resources/console-beta.png
rename to server-console/resources/console-beta.png
diff --git a/console/resources/console-notification-win.png b/server-console/resources/console-notification-win.png
similarity index 100%
rename from console/resources/console-notification-win.png
rename to server-console/resources/console-notification-win.png
diff --git a/console/resources/console-tray-Template.png b/server-console/resources/console-tray-Template.png
similarity index 100%
rename from console/resources/console-tray-Template.png
rename to server-console/resources/console-tray-Template.png
diff --git a/console/resources/console-tray-Template@2x.png b/server-console/resources/console-tray-Template@2x.png
similarity index 100%
rename from console/resources/console-tray-Template@2x.png
rename to server-console/resources/console-tray-Template@2x.png
diff --git a/console/resources/console-tray.ico b/server-console/resources/console-tray.ico
similarity index 100%
rename from console/resources/console-tray.ico
rename to server-console/resources/console-tray.ico
diff --git a/console/resources/console-tray.png b/server-console/resources/console-tray.png
similarity index 100%
rename from console/resources/console-tray.png
rename to server-console/resources/console-tray.png
diff --git a/console/resources/console-tray@2x.png b/server-console/resources/console-tray@2x.png
similarity index 100%
rename from console/resources/console-tray@2x.png
rename to server-console/resources/console-tray@2x.png
diff --git a/console/resources/console.icns b/server-console/resources/console.icns
similarity index 100%
rename from console/resources/console.icns
rename to server-console/resources/console.icns
diff --git a/console/resources/console.ico b/server-console/resources/console.ico
similarity index 100%
rename from console/resources/console.ico
rename to server-console/resources/console.ico
diff --git a/console/resources/console.png b/server-console/resources/console.png
similarity index 100%
rename from console/resources/console.png
rename to server-console/resources/console.png
diff --git a/console/src/downloader.css b/server-console/src/downloader.css
similarity index 100%
rename from console/src/downloader.css
rename to server-console/src/downloader.css
diff --git a/console/src/downloader.html b/server-console/src/downloader.html
similarity index 100%
rename from console/src/downloader.html
rename to server-console/src/downloader.html
diff --git a/console/src/downloader.js b/server-console/src/downloader.js
similarity index 100%
rename from console/src/downloader.js
rename to server-console/src/downloader.js
diff --git a/console/src/images/console-hf-logo-2x.png b/server-console/src/images/console-hf-logo-2x.png
similarity index 100%
rename from console/src/images/console-hf-logo-2x.png
rename to server-console/src/images/console-hf-logo-2x.png
diff --git a/console/src/images/console-menubar-osx-2x.png b/server-console/src/images/console-menubar-osx-2x.png
similarity index 100%
rename from console/src/images/console-menubar-osx-2x.png
rename to server-console/src/images/console-menubar-osx-2x.png
diff --git a/console/src/images/console-menubar-windows-2x.png b/server-console/src/images/console-menubar-windows-2x.png
similarity index 100%
rename from console/src/images/console-menubar-windows-2x.png
rename to server-console/src/images/console-menubar-windows-2x.png
diff --git a/console/src/log.css b/server-console/src/log.css
similarity index 100%
rename from console/src/log.css
rename to server-console/src/log.css
diff --git a/console/src/log.html b/server-console/src/log.html
similarity index 100%
rename from console/src/log.html
rename to server-console/src/log.html
diff --git a/console/src/log.js b/server-console/src/log.js
similarity index 100%
rename from console/src/log.js
rename to server-console/src/log.js
diff --git a/console/src/main.js b/server-console/src/main.js
similarity index 100%
rename from console/src/main.js
rename to server-console/src/main.js
diff --git a/console/src/modules/config.js b/server-console/src/modules/config.js
similarity index 100%
rename from console/src/modules/config.js
rename to server-console/src/modules/config.js
diff --git a/console/src/modules/hf-process.js b/server-console/src/modules/hf-process.js
similarity index 100%
rename from console/src/modules/hf-process.js
rename to server-console/src/modules/hf-process.js
diff --git a/console/src/modules/hf-updater.js b/server-console/src/modules/hf-updater.js
similarity index 100%
rename from console/src/modules/hf-updater.js
rename to server-console/src/modules/hf-updater.js
diff --git a/console/src/modules/path-finder.js b/server-console/src/modules/path-finder.js
similarity index 100%
rename from console/src/modules/path-finder.js
rename to server-console/src/modules/path-finder.js
diff --git a/console/src/splash.css b/server-console/src/splash.css
similarity index 100%
rename from console/src/splash.css
rename to server-console/src/splash.css
diff --git a/console/src/splash.html b/server-console/src/splash.html
similarity index 100%
rename from console/src/splash.html
rename to server-console/src/splash.html
diff --git a/console/src/splash.js b/server-console/src/splash.js
similarity index 100%
rename from console/src/splash.js
rename to server-console/src/splash.js
diff --git a/console/src/vendor/jquery/jquery-2.1.4.min.js b/server-console/src/vendor/jquery/jquery-2.1.4.min.js
similarity index 100%
rename from console/src/vendor/jquery/jquery-2.1.4.min.js
rename to server-console/src/vendor/jquery/jquery-2.1.4.min.js