diff --git a/WebServers/Matchmaker/config.json b/Matchmaker/config.json
similarity index 100%
rename from WebServers/Matchmaker/config.json
rename to Matchmaker/config.json
diff --git a/WebServers/Matchmaker/matchmaker.js b/Matchmaker/matchmaker.js
similarity index 100%
rename from WebServers/Matchmaker/matchmaker.js
rename to Matchmaker/matchmaker.js
diff --git a/WebServers/Matchmaker/modules/config.js b/Matchmaker/modules/config.js
similarity index 100%
rename from WebServers/Matchmaker/modules/config.js
rename to Matchmaker/modules/config.js
diff --git a/WebServers/Matchmaker/modules/logging.js b/Matchmaker/modules/logging.js
similarity index 100%
rename from WebServers/Matchmaker/modules/logging.js
rename to Matchmaker/modules/logging.js
diff --git a/WebServers/Matchmaker/package-lock.json b/Matchmaker/package-lock.json
similarity index 100%
rename from WebServers/Matchmaker/package-lock.json
rename to Matchmaker/package-lock.json
diff --git a/WebServers/Matchmaker/package.json b/Matchmaker/package.json
similarity index 100%
rename from WebServers/Matchmaker/package.json
rename to Matchmaker/package.json
diff --git a/WebServers/Matchmaker/platform_scripts/bash/common_utils.sh b/Matchmaker/platform_scripts/bash/common_utils.sh
similarity index 100%
rename from WebServers/Matchmaker/platform_scripts/bash/common_utils.sh
rename to Matchmaker/platform_scripts/bash/common_utils.sh
diff --git a/WebServers/Matchmaker/platform_scripts/bash/run.sh b/Matchmaker/platform_scripts/bash/run.sh
similarity index 100%
rename from WebServers/Matchmaker/platform_scripts/bash/run.sh
rename to Matchmaker/platform_scripts/bash/run.sh
diff --git a/WebServers/Matchmaker/platform_scripts/bash/setup.sh b/Matchmaker/platform_scripts/bash/setup.sh
similarity index 100%
rename from WebServers/Matchmaker/platform_scripts/bash/setup.sh
rename to Matchmaker/platform_scripts/bash/setup.sh
diff --git a/WebServers/Matchmaker/platform_scripts/cmd/run.bat b/Matchmaker/platform_scripts/cmd/run.bat
similarity index 100%
rename from WebServers/Matchmaker/platform_scripts/cmd/run.bat
rename to Matchmaker/platform_scripts/cmd/run.bat
diff --git a/WebServers/Matchmaker/platform_scripts/cmd/setup.bat b/Matchmaker/platform_scripts/cmd/setup.bat
similarity index 100%
rename from WebServers/Matchmaker/platform_scripts/cmd/setup.bat
rename to Matchmaker/platform_scripts/cmd/setup.bat
diff --git a/WebServers/Matchmaker/platform_scripts/cmd/setup_node.bat b/Matchmaker/platform_scripts/cmd/setup_node.bat
similarity index 100%
rename from WebServers/Matchmaker/platform_scripts/cmd/setup_node.bat
rename to Matchmaker/platform_scripts/cmd/setup_node.bat
diff --git a/WebServers/SFU/.dockerignore b/SFU/SFU/.dockerignore
similarity index 100%
rename from WebServers/SFU/.dockerignore
rename to SFU/SFU/.dockerignore
diff --git a/WebServers/SFU/config.js b/SFU/SFU/config.js
similarity index 100%
rename from WebServers/SFU/config.js
rename to SFU/SFU/config.js
diff --git a/WebServers/SFU/mediasoup-sdp-bridge/LICENSE b/SFU/SFU/mediasoup-sdp-bridge/LICENSE
similarity index 100%
rename from WebServers/SFU/mediasoup-sdp-bridge/LICENSE
rename to SFU/SFU/mediasoup-sdp-bridge/LICENSE
diff --git a/WebServers/SFU/mediasoup-sdp-bridge/README.md b/SFU/SFU/mediasoup-sdp-bridge/README.md
similarity index 100%
rename from WebServers/SFU/mediasoup-sdp-bridge/README.md
rename to SFU/SFU/mediasoup-sdp-bridge/README.md
diff --git a/WebServers/SFU/mediasoup-sdp-bridge/lib/BrowserRtpCapabilities.js b/SFU/SFU/mediasoup-sdp-bridge/lib/BrowserRtpCapabilities.js
similarity index 100%
rename from WebServers/SFU/mediasoup-sdp-bridge/lib/BrowserRtpCapabilities.js
rename to SFU/SFU/mediasoup-sdp-bridge/lib/BrowserRtpCapabilities.js
diff --git a/WebServers/SFU/mediasoup-sdp-bridge/lib/SdpUtils.js b/SFU/SFU/mediasoup-sdp-bridge/lib/SdpUtils.js
similarity index 100%
rename from WebServers/SFU/mediasoup-sdp-bridge/lib/SdpUtils.js
rename to SFU/SFU/mediasoup-sdp-bridge/lib/SdpUtils.js
diff --git a/WebServers/SFU/mediasoup-sdp-bridge/lib/index.js b/SFU/SFU/mediasoup-sdp-bridge/lib/index.js
similarity index 100%
rename from WebServers/SFU/mediasoup-sdp-bridge/lib/index.js
rename to SFU/SFU/mediasoup-sdp-bridge/lib/index.js
diff --git a/WebServers/SFU/mediasoup-sdp-bridge/package.json b/SFU/SFU/mediasoup-sdp-bridge/package.json
similarity index 100%
rename from WebServers/SFU/mediasoup-sdp-bridge/package.json
rename to SFU/SFU/mediasoup-sdp-bridge/package.json
diff --git a/WebServers/SFU/package-lock.json b/SFU/SFU/package-lock.json
similarity index 100%
rename from WebServers/SFU/package-lock.json
rename to SFU/SFU/package-lock.json
diff --git a/WebServers/SFU/package.json b/SFU/SFU/package.json
similarity index 100%
rename from WebServers/SFU/package.json
rename to SFU/SFU/package.json
diff --git a/WebServers/SFU/platform_scripts/bash/Dockerfile b/SFU/SFU/platform_scripts/bash/Dockerfile
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/Dockerfile
rename to SFU/SFU/platform_scripts/bash/Dockerfile
diff --git a/WebServers/SFU/platform_scripts/bash/common_utils.sh b/SFU/SFU/platform_scripts/bash/common_utils.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/common_utils.sh
rename to SFU/SFU/platform_scripts/bash/common_utils.sh
diff --git a/WebServers/SFU/platform_scripts/bash/docker-build.sh b/SFU/SFU/platform_scripts/bash/docker-build.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/docker-build.sh
rename to SFU/SFU/platform_scripts/bash/docker-build.sh
diff --git a/WebServers/SFU/platform_scripts/bash/docker-start.sh b/SFU/SFU/platform_scripts/bash/docker-start.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/docker-start.sh
rename to SFU/SFU/platform_scripts/bash/docker-start.sh
diff --git a/WebServers/SFU/platform_scripts/bash/docker-stop.sh b/SFU/SFU/platform_scripts/bash/docker-stop.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/docker-stop.sh
rename to SFU/SFU/platform_scripts/bash/docker-stop.sh
diff --git a/WebServers/SFU/platform_scripts/bash/run_cloud.sh b/SFU/SFU/platform_scripts/bash/run_cloud.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/run_cloud.sh
rename to SFU/SFU/platform_scripts/bash/run_cloud.sh
diff --git a/WebServers/SFU/platform_scripts/bash/run_local.sh b/SFU/SFU/platform_scripts/bash/run_local.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/run_local.sh
rename to SFU/SFU/platform_scripts/bash/run_local.sh
diff --git a/WebServers/SFU/platform_scripts/bash/setup.sh b/SFU/SFU/platform_scripts/bash/setup.sh
similarity index 100%
rename from WebServers/SFU/platform_scripts/bash/setup.sh
rename to SFU/SFU/platform_scripts/bash/setup.sh
diff --git a/WebServers/SFU/platform_scripts/cmd/run_cloud.bat b/SFU/SFU/platform_scripts/cmd/run_cloud.bat
similarity index 100%
rename from WebServers/SFU/platform_scripts/cmd/run_cloud.bat
rename to SFU/SFU/platform_scripts/cmd/run_cloud.bat
diff --git a/WebServers/SFU/platform_scripts/cmd/run_local.bat b/SFU/SFU/platform_scripts/cmd/run_local.bat
similarity index 100%
rename from WebServers/SFU/platform_scripts/cmd/run_local.bat
rename to SFU/SFU/platform_scripts/cmd/run_local.bat
diff --git a/WebServers/SFU/platform_scripts/cmd/setup.bat b/SFU/SFU/platform_scripts/cmd/setup.bat
similarity index 100%
rename from WebServers/SFU/platform_scripts/cmd/setup.bat
rename to SFU/SFU/platform_scripts/cmd/setup.bat
diff --git a/WebServers/SFU/platform_scripts/cmd/setup_node.bat b/SFU/SFU/platform_scripts/cmd/setup_node.bat
similarity index 100%
rename from WebServers/SFU/platform_scripts/cmd/setup_node.bat
rename to SFU/SFU/platform_scripts/cmd/setup_node.bat
diff --git a/WebServers/SFU/sfu_server.js b/SFU/SFU/sfu_server.js
similarity index 100%
rename from WebServers/SFU/sfu_server.js
rename to SFU/SFU/sfu_server.js
diff --git a/WebServers/SignallingWebServer/.dockerignore b/SignallingWebServer/SignallingWebServer/.dockerignore
similarity index 100%
rename from WebServers/SignallingWebServer/.dockerignore
rename to SignallingWebServer/SignallingWebServer/.dockerignore
diff --git a/WebServers/SignallingWebServer/Dockerfile b/SignallingWebServer/SignallingWebServer/Dockerfile
similarity index 100%
rename from WebServers/SignallingWebServer/Dockerfile
rename to SignallingWebServer/SignallingWebServer/Dockerfile
diff --git a/WebServers/SignallingWebServer/Public/Play.svg b/SignallingWebServer/SignallingWebServer/Public/Play.svg
similarity index 100%
rename from WebServers/SignallingWebServer/Public/Play.svg
rename to SignallingWebServer/SignallingWebServer/Public/Play.svg
diff --git a/WebServers/SignallingWebServer/Public/login.css b/SignallingWebServer/SignallingWebServer/Public/login.css
similarity index 100%
rename from WebServers/SignallingWebServer/Public/login.css
rename to SignallingWebServer/SignallingWebServer/Public/login.css
diff --git a/WebServers/SignallingWebServer/Public/login.html b/SignallingWebServer/SignallingWebServer/Public/login.html
similarity index 100%
rename from WebServers/SignallingWebServer/Public/login.html
rename to SignallingWebServer/SignallingWebServer/Public/login.html
diff --git a/WebServers/SignallingWebServer/Public/playbutton.svg b/SignallingWebServer/SignallingWebServer/Public/playbutton.svg
similarity index 100%
rename from WebServers/SignallingWebServer/Public/playbutton.svg
rename to SignallingWebServer/SignallingWebServer/Public/playbutton.svg
diff --git a/WebServers/SignallingWebServer/Public/player.css b/SignallingWebServer/SignallingWebServer/Public/player.css
similarity index 100%
rename from WebServers/SignallingWebServer/Public/player.css
rename to SignallingWebServer/SignallingWebServer/Public/player.css
diff --git a/WebServers/SignallingWebServer/Public/player.html b/SignallingWebServer/SignallingWebServer/Public/player.html
similarity index 100%
rename from WebServers/SignallingWebServer/Public/player.html
rename to SignallingWebServer/SignallingWebServer/Public/player.html
diff --git a/WebServers/SignallingWebServer/Public/stresstest.html b/SignallingWebServer/SignallingWebServer/Public/stresstest.html
similarity index 100%
rename from WebServers/SignallingWebServer/Public/stresstest.html
rename to SignallingWebServer/SignallingWebServer/Public/stresstest.html
diff --git a/WebServers/SignallingWebServer/cirrus.js b/SignallingWebServer/SignallingWebServer/cirrus.js
similarity index 100%
rename from WebServers/SignallingWebServer/cirrus.js
rename to SignallingWebServer/SignallingWebServer/cirrus.js
diff --git a/WebServers/SignallingWebServer/config.json b/SignallingWebServer/SignallingWebServer/config.json
similarity index 100%
rename from WebServers/SignallingWebServer/config.json
rename to SignallingWebServer/SignallingWebServer/config.json
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Bold.woff b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Bold.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Bold.woff
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Bold.woff
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Bold.woff2 b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Bold.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Bold.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Bold.woff2
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Light.woff b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Light.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Light.woff
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Light.woff
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Light.woff2 b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Light.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Light.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Light.woff2
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Medium.woff b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Medium.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Medium.woff
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Medium.woff
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Medium.woff2 b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Medium.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Medium.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Medium.woff2
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Regular.woff b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Regular.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Regular.woff
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Regular.woff
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_Regular.woff2 b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_Regular.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_Regular.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_Regular.woff2
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_SemiBold.woff b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_SemiBold.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_SemiBold.woff
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_SemiBold.woff
diff --git a/WebServers/SignallingWebServer/fonts/Gilroy_SemiBold.woff2 b/SignallingWebServer/SignallingWebServer/fonts/Gilroy_SemiBold.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/Gilroy_SemiBold.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/Gilroy_SemiBold.woff2
diff --git a/WebServers/SignallingWebServer/fonts/fonts.css b/SignallingWebServer/SignallingWebServer/fonts/fonts.css
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/fonts.css
rename to SignallingWebServer/SignallingWebServer/fonts/fonts.css
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff2 b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-300.woff2
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff2 b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-500.woff2
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff2 b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-600.woff2
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff2 b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-700.woff2
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff
diff --git a/WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff2 b/SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff2
similarity index 100%
rename from WebServers/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff2
rename to SignallingWebServer/SignallingWebServer/fonts/inter-v12-latin_cyrillic-regular.woff2
diff --git a/WebServers/SignallingWebServer/images/Info.svg b/SignallingWebServer/SignallingWebServer/images/Info.svg
similarity index 100%
rename from WebServers/SignallingWebServer/images/Info.svg
rename to SignallingWebServer/SignallingWebServer/images/Info.svg
diff --git a/WebServers/SignallingWebServer/images/Maximize.svg b/SignallingWebServer/SignallingWebServer/images/Maximize.svg
similarity index 100%
rename from WebServers/SignallingWebServer/images/Maximize.svg
rename to SignallingWebServer/SignallingWebServer/images/Maximize.svg
diff --git a/WebServers/SignallingWebServer/images/Minimize.svg b/SignallingWebServer/SignallingWebServer/images/Minimize.svg
similarity index 100%
rename from WebServers/SignallingWebServer/images/Minimize.svg
rename to SignallingWebServer/SignallingWebServer/images/Minimize.svg
diff --git a/WebServers/SignallingWebServer/images/Play.png b/SignallingWebServer/SignallingWebServer/images/Play.png
similarity index 100%
rename from WebServers/SignallingWebServer/images/Play.png
rename to SignallingWebServer/SignallingWebServer/images/Play.png
diff --git a/WebServers/SignallingWebServer/images/Settings.svg b/SignallingWebServer/SignallingWebServer/images/Settings.svg
similarity index 100%
rename from WebServers/SignallingWebServer/images/Settings.svg
rename to SignallingWebServer/SignallingWebServer/images/Settings.svg
diff --git a/WebServers/SignallingWebServer/images/favicon-16x16.png b/SignallingWebServer/SignallingWebServer/images/favicon-16x16.png
similarity index 100%
rename from WebServers/SignallingWebServer/images/favicon-16x16.png
rename to SignallingWebServer/SignallingWebServer/images/favicon-16x16.png
diff --git a/WebServers/SignallingWebServer/images/favicon-32x32.png b/SignallingWebServer/SignallingWebServer/images/favicon-32x32.png
similarity index 100%
rename from WebServers/SignallingWebServer/images/favicon-32x32.png
rename to SignallingWebServer/SignallingWebServer/images/favicon-32x32.png
diff --git a/WebServers/SignallingWebServer/images/favicon-96x96.png b/SignallingWebServer/SignallingWebServer/images/favicon-96x96.png
similarity index 100%
rename from WebServers/SignallingWebServer/images/favicon-96x96.png
rename to SignallingWebServer/SignallingWebServer/images/favicon-96x96.png
diff --git a/WebServers/SignallingWebServer/images/favicon.ico b/SignallingWebServer/SignallingWebServer/images/favicon.ico
similarity index 100%
rename from WebServers/SignallingWebServer/images/favicon.ico
rename to SignallingWebServer/SignallingWebServer/images/favicon.ico
diff --git a/WebServers/SignallingWebServer/modules/authentication/db/index.js b/SignallingWebServer/SignallingWebServer/modules/authentication/db/index.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/authentication/db/index.js
rename to SignallingWebServer/SignallingWebServer/modules/authentication/db/index.js
diff --git a/WebServers/SignallingWebServer/modules/authentication/db/store_password.js b/SignallingWebServer/SignallingWebServer/modules/authentication/db/store_password.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/authentication/db/store_password.js
rename to SignallingWebServer/SignallingWebServer/modules/authentication/db/store_password.js
diff --git a/WebServers/SignallingWebServer/modules/authentication/db/users.js b/SignallingWebServer/SignallingWebServer/modules/authentication/db/users.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/authentication/db/users.js
rename to SignallingWebServer/SignallingWebServer/modules/authentication/db/users.js
diff --git a/WebServers/SignallingWebServer/modules/authentication/index.js b/SignallingWebServer/SignallingWebServer/modules/authentication/index.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/authentication/index.js
rename to SignallingWebServer/SignallingWebServer/modules/authentication/index.js
diff --git a/WebServers/SignallingWebServer/modules/authentication/init.js b/SignallingWebServer/SignallingWebServer/modules/authentication/init.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/authentication/init.js
rename to SignallingWebServer/SignallingWebServer/modules/authentication/init.js
diff --git a/WebServers/SignallingWebServer/modules/config.js b/SignallingWebServer/SignallingWebServer/modules/config.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/config.js
rename to SignallingWebServer/SignallingWebServer/modules/config.js
diff --git a/WebServers/SignallingWebServer/modules/httpsClient.js b/SignallingWebServer/SignallingWebServer/modules/httpsClient.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/httpsClient.js
rename to SignallingWebServer/SignallingWebServer/modules/httpsClient.js
diff --git a/WebServers/SignallingWebServer/modules/logging.js b/SignallingWebServer/SignallingWebServer/modules/logging.js
similarity index 100%
rename from WebServers/SignallingWebServer/modules/logging.js
rename to SignallingWebServer/SignallingWebServer/modules/logging.js
diff --git a/WebServers/SignallingWebServer/package-lock.json b/SignallingWebServer/SignallingWebServer/package-lock.json
similarity index 100%
rename from WebServers/SignallingWebServer/package-lock.json
rename to SignallingWebServer/SignallingWebServer/package-lock.json
diff --git a/WebServers/SignallingWebServer/package.json b/SignallingWebServer/SignallingWebServer/package.json
similarity index 100%
rename from WebServers/SignallingWebServer/package.json
rename to SignallingWebServer/SignallingWebServer/package.json
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/Dockerfile b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/Dockerfile
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/Dockerfile
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/Dockerfile
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/README.txt b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/README.txt
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/README.txt
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/README.txt
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/Start_SignallingServer.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/Start_TURNServer.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/Start_WithTURN_SignallingServer.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/common_utils.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/common_utils.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/common_utils.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/common_utils.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-build-cirrus.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-local.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-local.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-local.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-local.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-with-turn.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-with-turn.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-with-turn.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-cirrus-with-turn.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-start-cirrus.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-cirrus.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-start-cirrus.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-cirrus.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-start-turn.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-turn.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-start-turn.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-start-turn.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-stop-all.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-stop-all.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-stop-all.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-stop-all.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-stop-cirrus.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-stop-cirrus.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-stop-cirrus.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-stop-cirrus.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/docker-stop-turn.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-stop-turn.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/docker-stop-turn.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/docker-stop-turn.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/run_local.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/run_local.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/run_local.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/run_local.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/setup.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/setup.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/setup.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/setup.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/bash/turn_user_pwd.sh b/SignallingWebServer/SignallingWebServer/platform_scripts/bash/turn_user_pwd.sh
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/bash/turn_user_pwd.sh
rename to SignallingWebServer/SignallingWebServer/platform_scripts/bash/turn_user_pwd.sh
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/README.txt b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/README.txt
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/README.txt
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/README.txt
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/Start_Common.ps1 b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_Common.ps1
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/Start_Common.ps1
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_Common.ps1
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/Start_SignallingServer.ps1 b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_SignallingServer.ps1
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/Start_SignallingServer.ps1
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_SignallingServer.ps1
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/Start_TURNServer.ps1 b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_TURNServer.ps1
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/Start_TURNServer.ps1
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_TURNServer.ps1
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/Start_WithTURN_SignallingServer.ps1 b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_WithTURN_SignallingServer.ps1
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/Start_WithTURN_SignallingServer.ps1
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/Start_WithTURN_SignallingServer.ps1
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/build.bat b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/build.bat
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/build.bat
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/build.bat
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/run_local.bat b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/run_local.bat
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/run_local.bat
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/run_local.bat
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/setup.bat b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/setup.bat
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/setup.bat
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/setup.bat
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/setup_coturn.bat b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/setup_coturn.bat
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/setup_coturn.bat
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/setup_coturn.bat
diff --git a/WebServers/SignallingWebServer/platform_scripts/cmd/setup_node.bat b/SignallingWebServer/SignallingWebServer/platform_scripts/cmd/setup_node.bat
similarity index 100%
rename from WebServers/SignallingWebServer/platform_scripts/cmd/setup_node.bat
rename to SignallingWebServer/SignallingWebServer/platform_scripts/cmd/setup_node.bat
diff --git a/WebServers/SignallingWebServer/scripts/app.js b/SignallingWebServer/SignallingWebServer/scripts/app.js
similarity index 100%
rename from WebServers/SignallingWebServer/scripts/app.js
rename to SignallingWebServer/SignallingWebServer/scripts/app.js
diff --git a/WebServers/SignallingWebServer/scripts/stressTest.js b/SignallingWebServer/SignallingWebServer/scripts/stressTest.js
similarity index 100%
rename from WebServers/SignallingWebServer/scripts/stressTest.js
rename to SignallingWebServer/SignallingWebServer/scripts/stressTest.js
diff --git a/WebServers/SignallingWebServer/scripts/webRtcPlayer.js b/SignallingWebServer/SignallingWebServer/scripts/webRtcPlayer.js
similarity index 100%
rename from WebServers/SignallingWebServer/scripts/webRtcPlayer.js
rename to SignallingWebServer/SignallingWebServer/scripts/webRtcPlayer.js
diff --git a/WebServers/SignallingWebServer/tps/Bootstrap.tps b/SignallingWebServer/SignallingWebServer/tps/Bootstrap.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/Bootstrap.tps
rename to SignallingWebServer/SignallingWebServer/tps/Bootstrap.tps
diff --git a/WebServers/SignallingWebServer/tps/Express.tps b/SignallingWebServer/SignallingWebServer/tps/Express.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/Express.tps
rename to SignallingWebServer/SignallingWebServer/tps/Express.tps
diff --git a/WebServers/SignallingWebServer/tps/FontAwesome.tps b/SignallingWebServer/SignallingWebServer/tps/FontAwesome.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/FontAwesome.tps
rename to SignallingWebServer/SignallingWebServer/tps/FontAwesome.tps
diff --git a/WebServers/SignallingWebServer/tps/Helmet.tps b/SignallingWebServer/SignallingWebServer/tps/Helmet.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/Helmet.tps
rename to SignallingWebServer/SignallingWebServer/tps/Helmet.tps
diff --git a/WebServers/SignallingWebServer/tps/JQuery.tps b/SignallingWebServer/SignallingWebServer/tps/JQuery.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/JQuery.tps
rename to SignallingWebServer/SignallingWebServer/tps/JQuery.tps
diff --git a/WebServers/SignallingWebServer/tps/Popper.tps b/SignallingWebServer/SignallingWebServer/tps/Popper.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/Popper.tps
rename to SignallingWebServer/SignallingWebServer/tps/Popper.tps
diff --git a/WebServers/SignallingWebServer/tps/Socket.io.tps b/SignallingWebServer/SignallingWebServer/tps/Socket.io.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/Socket.io.tps
rename to SignallingWebServer/SignallingWebServer/tps/Socket.io.tps
diff --git a/WebServers/SignallingWebServer/tps/WS.tps b/SignallingWebServer/SignallingWebServer/tps/WS.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/WS.tps
rename to SignallingWebServer/SignallingWebServer/tps/WS.tps
diff --git a/WebServers/SignallingWebServer/tps/WebRTCadapter.tps b/SignallingWebServer/SignallingWebServer/tps/WebRTCadapter.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/WebRTCadapter.tps
rename to SignallingWebServer/SignallingWebServer/tps/WebRTCadapter.tps
diff --git a/WebServers/SignallingWebServer/tps/Yargs.tps b/SignallingWebServer/SignallingWebServer/tps/Yargs.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/Yargs.tps
rename to SignallingWebServer/SignallingWebServer/tps/Yargs.tps
diff --git a/WebServers/SignallingWebServer/tps/bcrypt-js.tps b/SignallingWebServer/SignallingWebServer/tps/bcrypt-js.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/bcrypt-js.tps
rename to SignallingWebServer/SignallingWebServer/tps/bcrypt-js.tps
diff --git a/WebServers/SignallingWebServer/tps/expression-session.tps b/SignallingWebServer/SignallingWebServer/tps/expression-session.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/expression-session.tps
rename to SignallingWebServer/SignallingWebServer/tps/expression-session.tps
diff --git a/WebServers/SignallingWebServer/tps/passport-local.tps b/SignallingWebServer/SignallingWebServer/tps/passport-local.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/passport-local.tps
rename to SignallingWebServer/SignallingWebServer/tps/passport-local.tps
diff --git a/WebServers/SignallingWebServer/tps/passport.tps b/SignallingWebServer/SignallingWebServer/tps/passport.tps
similarity index 100%
rename from WebServers/SignallingWebServer/tps/passport.tps
rename to SignallingWebServer/SignallingWebServer/tps/passport.tps
diff --git a/WebServers/.gitignore b/WebServers/.gitignore
deleted file mode 100644
index 81a34ed..0000000
--- a/WebServers/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-logs/
-node_modules/
-**/platform_scripts/cmd/*/
-**/platform_scripts/bash/*/
-node.zip
\ No newline at end of file
diff --git a/WebServers/LICENSE.md b/WebServers/LICENSE.md
deleted file mode 100644
index 688fa9e..0000000
--- a/WebServers/LICENSE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright 2004-2022, Epic Games, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/WebServers/README.md b/WebServers/README.md
deleted file mode 100644
index cc701d4..0000000
--- a/WebServers/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# The new home for the Pixel Streaming servers!
-The Pixel Streaming servers and web frontend that was in `Samples/PixelStreaming/WebServers` is now here. 
-
-## Goals
-
-The goals of this repository are to:
-
-- Increase the release cadence for the Pixel Streaming servers (to mitigate browser breaking changes sooner).
-- Encourage easier contribution of these components by Unreal Engine licensees.
-- Facilitate a more standard web release mechanism (e.g. NPM packages or similar... coming soon).
-- Grant a permissive license to distribute and modify this code wherever you see fit (MIT licensed).
-
-## Repository contents
-
-Reference implementations for the various pieces needed to support a PixelStreaming application:
-- SignallingWebServer (Cirrus)
-- SFU (Selective Forwarding Unit)
-- Matchmaker
-
-## Container images
-
-The following container images are built from this repository:
-
-- [ghcr.io/epicgames/pixel-streaming-signalling-server](https://github.com/orgs/EpicGames/packages/container/package/pixel-streaming-signalling-server) (since Unreal Engine 5.1)
-
-## Versions
-
-We maintain versions of the servers and frontend that are compatible with existing and in-development version of Unreal Engine. 
-
-:warning: **There are breaking changes between UE versions - so make sure you get the right version**. :warning:
-
-We maintain the following in branches right now:
-
-[Master](https://github.com/EpicGames/PixelStreamingInfrastructure/tree/master) (This is our dev branch.)
-
-[UE5.1](https://github.com/EpicGames/PixelStreamingInfrastructure/tree/UE5.1)
-
-[UE5.0](https://github.com/EpicGames/PixelStreamingInfrastructure/tree/UE5.0)
-
-[UE4.27](https://github.com/EpicGames/PixelStreamingInfrastructure/tree/UE4.27)
-
-[UE4.26](https://github.com/EpicGames/PixelStreamingInfrastructure/tree/UE4.26)
-
-## Legal
-© 2004-2022, Epic Games, Inc. Unreal and its logo are Epic’s trademarks or registered trademarks in the US and elsewhere. 
diff --git a/WebServers/get_ps_servers.bat b/get_ps_servers.bat
similarity index 100%
rename from WebServers/get_ps_servers.bat
rename to get_ps_servers.bat
diff --git a/WebServers/get_ps_servers.sh b/get_ps_servers.sh
similarity index 100%
rename from WebServers/get_ps_servers.sh
rename to get_ps_servers.sh
diff --git a/WebServers/package-lock.json b/package-lock.json
similarity index 100%
rename from WebServers/package-lock.json
rename to package-lock.json
diff --git a/WebServers/package.json b/package.json
similarity index 100%
rename from WebServers/package.json
rename to package.json