diff --git a/20.Client_configuration/2.Dump_config_by_email/0_setup.sh b/20.Client_configuration/2.Dump_config_by_email/0_setup.sh
deleted file mode 100755
index f6c17e964302cf57e2e69ca3d7ca6663afdd4367..0000000000000000000000000000000000000000
--- a/20.Client_configuration/2.Dump_config_by_email/0_setup.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-source /root/envsetup/global-conf.sh
-
-# generate post-deployment conf file
-echo "SOURCES.LIST" > /root/deployment.results
-cat /etc/apt/sources.list | grep ^deb >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-echo "SOURCES.LIST - SKYREACH_HOST" >> /root/deployment.results
-cat /etc/apt/sources.list.d/skyreach.list >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-echo "NETWORK" >> /root/deployment.results
-cat /etc/network/interfaces | grep -v '#' >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-echo "RUNNING NETWORK" >> /root/deployment.results
-ifconfig >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-echo "DNS" >> /root/deployment.results
-cat /etc/resolv.conf >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-echo "NGINX" >> /root/deployment.results
-grep server_name /etc/nginx/sites-enabled/* | uniq >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-echo "SERVICES" >> /root/deployment.results
-echo "mediaserver $(service mediaserver status | grep Active)" >> /root/deployment.results
-echo "WowzaStreamingEngine $(service WowzaStreamingEngine status | grep Active)" >> /root/deployment.results
-echo "apt-cacher-ng $(service apt-cacher-ng status | grep Active)" >> /root/deployment.results
-echo "campus-manager $(service campus-manager status | grep Active)" >> /root/deployment.results
-echo "celerity-server $(service celerity-server status | grep Active)" >> /root/deployment.results
-echo "msmonitor $(service msmonitor status | grep Active)" >> /root/deployment.results
-echo "munin-node $(service munin-node status | grep Active)" >> /root/deployment.results
-echo "mysql $(service mysql status | grep Active)" >> /root/deployment.results
-echo "nginx $(service nginx status | grep Active)" >> /root/deployment.results
-echo "postfix $(service postfix status | grep Active)" >> /root/deployment.results
-echo "ssh $(service ssh status | grep Active)" >> /root/deployment.results
-echo "uwsgi $(service uwsgi status | grep Active)" >> /root/deployment.results
-echo "" >> /root/deployment.results
-
-cat /root/deployment.results | mail -aFrom:${EMAIL_SENDER} -s "$(hostname) deployed configuration" deployment@ubicast.eu
-echo -e "${CYAN}A mail has been sent to deployment@ubicast.eu${NC}"
diff --git a/5.MediaServer/3.Install_MS_deploy/0_setup.sh b/30.Deprecated/5.Install_MS_deploy/0_setup.sh
similarity index 100%
rename from 5.MediaServer/3.Install_MS_deploy/0_setup.sh
rename to 30.Deprecated/5.Install_MS_deploy/0_setup.sh
diff --git a/5.MediaServer/3.Install_MS_deploy/MS_deploy.sh b/30.Deprecated/5.Install_MS_deploy/MS_deploy.sh
similarity index 100%
rename from 5.MediaServer/3.Install_MS_deploy/MS_deploy.sh
rename to 30.Deprecated/5.Install_MS_deploy/MS_deploy.sh
diff --git a/20.Client_configuration/1.Apply_client_configuration/0_setup.sh b/30.Deprecated/6.Apply_client_configuration/0_setup.sh
similarity index 100%
rename from 20.Client_configuration/1.Apply_client_configuration/0_setup.sh
rename to 30.Deprecated/6.Apply_client_configuration/0_setup.sh
diff --git a/20.Client_configuration/3.Configure_client_smtp/0_setup.sh b/30.Deprecated/7.Configure_client_smtp/0_setup.sh
similarity index 100%
rename from 20.Client_configuration/3.Configure_client_smtp/0_setup.sh
rename to 30.Deprecated/7.Configure_client_smtp/0_setup.sh
diff --git a/20.Client_configuration/4.Apply_default_configuration/0_setup.sh b/30.Deprecated/8.Apply_default_configuration/0_setup.sh
similarity index 100%
rename from 20.Client_configuration/4.Apply_default_configuration/0_setup.sh
rename to 30.Deprecated/8.Apply_default_configuration/0_setup.sh
diff --git a/20.Client_configuration/5.Insert_wowza_license/0_setup.sh b/30.Deprecated/9.Insert_wowza_license/0_setup.sh
similarity index 100%
rename from 20.Client_configuration/5.Insert_wowza_license/0_setup.sh
rename to 30.Deprecated/9.Insert_wowza_license/0_setup.sh