diff --git a/5.MediaServer/1.Install_MediaServer/0_setup.sh b/5.MediaServer/1.Install_MediaServer/0_setup.sh
index c87fb5da09098167c5f083738e132ac8acde13d8..169cf8b0f66dd61050038a0a4833c8760c6a6eb8 100755
--- a/5.MediaServer/1.Install_MediaServer/0_setup.sh
+++ b/5.MediaServer/1.Install_MediaServer/0_setup.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 source /root/envsetup/conf.sh
 
-# installation mediaserver
+# Ms package install
 DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
 
-# session ms
+# MS instance
 msinstaller.py msuser
-
-# copy MS_deploy.sh to /var/tmp
-cp MS_deploy.sh /var/tmp/MS_deploy.sh
diff --git a/5.MediaServer/2.Startup check script for NFS/0_setup.py b/5.MediaServer/2.Startup_check_script_for_NFS/0_setup.py
similarity index 100%
rename from 5.MediaServer/2.Startup check script for NFS/0_setup.py
rename to 5.MediaServer/2.Startup_check_script_for_NFS/0_setup.py
diff --git a/5.MediaServer/2.Startup check script for NFS/check_services.py b/5.MediaServer/2.Startup_check_script_for_NFS/check_services.py
similarity index 100%
rename from 5.MediaServer/2.Startup check script for NFS/check_services.py
rename to 5.MediaServer/2.Startup_check_script_for_NFS/check_services.py
diff --git a/5.MediaServer/3.Install_MS_deploy/0_setup.sh b/5.MediaServer/3.Install_MS_deploy/0_setup.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b41af8a450eef6f54cceddaf3300f130eacf1be0
--- /dev/null
+++ b/5.MediaServer/3.Install_MS_deploy/0_setup.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+source /root/envsetup/conf.sh
+
+echo "Copying MS_deploy.sh"
+cp -v MS_deploy.sh /var/tmp/MS_deploy.sh
diff --git a/5.MediaServer/1.Install_MediaServer/MS_deploy.sh b/5.MediaServer/3.Install_MS_deploy/MS_deploy.sh
similarity index 100%
rename from 5.MediaServer/1.Install_MediaServer/MS_deploy.sh
rename to 5.MediaServer/3.Install_MS_deploy/MS_deploy.sh
diff --git a/launcher.sh b/launcher.sh
index f25832690930e3d124b8058ae3dac6f513673abc..14491bb654faf0ac8c8e9d36aeac6e00b891e3eb 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -1,22 +1,20 @@
 #!/bin/bash
-
 set -e
-
-# This script installs a MS/worker/campus-manager/cache/MV through envsetup on a machine
+# This script installs a MS/worker/campus-manager/cache/MV using envsetup on a system
 
 # Prerequisites
 # 1. create DNS entries
-#	alpha-auto.ubicast.net
-#	cm-alpha-auto.ubicast.net
-#	monitor-alpha-auto.ubicast.net
-# 2. create machine in panel
-# 3. envsetup-launcher.sh
+#	alpha.ubicast.net
+#	alpha-cm.ubicast.net
+#	alpha-mon.ubicast.net
+# 2. create system in panel
+# 3. launcher.sh
 
 # log
 LOGFILE=/root/$(date +%F)_envsetup.log
 exec > >(tee -i ${LOGFILE})
 
-## envsetup integration
+## envsetup action calls
 init() {
     python3 /root/envsetup/envsetup.py 11
     python3 /root/envsetup/envsetup.py 12
@@ -45,6 +43,7 @@ mediaserver() {
     python3 /root/envsetup/envsetup.py 25
     python3 /root/envsetup/envsetup.py 51
     python3 /root/envsetup/envsetup.py 52
+    python3 /root/envsetup/envsetup.py 53
     python3 /root/envsetup/envsetup.py 25
 }
 
@@ -89,7 +88,7 @@ reconf_default() {
     python3 /root/envsetup/envsetup.py 204
 }
 
-WOWZA_LICENSE() {
+wowza_license() {
     python3 /root/envsetup/envsetup.py 205
 }
 
@@ -148,7 +147,7 @@ case "$1" in
     ;;
 
     "wrecette")
-        WOWZA_LICENSE
+        wowza_license
         reconf_dump_config
     ;;