diff --git a/molecules/sabayon-amd64-mcs.spec b/molecules/3rdparty/sabayon-amd64-mcs.spec
similarity index 91%
rename from molecules/sabayon-amd64-mcs.spec
rename to molecules/3rdparty/sabayon-amd64-mcs.spec
index 9e5bd6b..9d871b4 100644
--- a/molecules/sabayon-amd64-mcs.spec
+++ b/molecules/3rdparty/sabayon-amd64-mcs.spec
@@ -27,14 +27,14 @@ iso_title: Sabayon MCS
 
 # Outer chroot script command, to be executed outside destination chroot before
 # before entering it (and before inner_chroot_script)
-outer_chroot_script: /sabayon/scripts/remaster_mcs_pre.sh
+outer_chroot_script: /sabayon/scripts/3rdparty/remaster_mcs_pre.sh
 
 # Execute repositories update here, in a more fault-tolerant flavor
-inner_chroot_script: /sabayon/scripts/remaster_mcs_inner_chroot_script.sh
+inner_chroot_script: /sabayon/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
 
 # Inner chroot script command, to be executed inside destination chroot after
 # packages installation and removal
-inner_chroot_script_after: /sabayon/scripts/remaster_mcs_inner_chroot_script_after.sh
+inner_chroot_script_after: /sabayon/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
 
 # Outer chroot script command, to be executed outside destination chroot before
 # before entering it (and AFTER inner_chroot_script)
diff --git a/remaster/mcs/mmt_scripts/config.sh b/remaster/mcs/mmt_scripts/config.sh
index 75ad61b..681622c 100755
--- a/remaster/mcs/mmt_scripts/config.sh
+++ b/remaster/mcs/mmt_scripts/config.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 
-EMAILPUSH_HOSTNAME="mmt-l-fl13-prv.mymessagingtop.it,mmt-l-fl14-prv.mymessagingtop.it"
+EMAILPUSH_HOSTNAME=""
 EMAILPUSH_PORTNO="4242"
 EMAILPUSH_PREFIX="PREFIX"
 
 INSPECT_DIR="/var/spool/filter"
 DELIVER="/usr/libexec/dovecot/deliver"
-#DELIVER="/opt/dovecot-1.2.8/libexec/dovecot/deliver"
 EMAILPUSH="/usr/local/mmt_scripts/emailpush.pl"
 SCHEDULEBE="/usr/local/mmt_scripts/schedulebe.py"
 LOGGER_FACILITY="mail"
diff --git a/remaster/mcs/mmt_scripts/emailpush.pl b/remaster/mcs/mmt_scripts/emailpush.pl
index b99369e..9c728bb 100755
--- a/remaster/mcs/mmt_scripts/emailpush.pl
+++ b/remaster/mcs/mmt_scripts/emailpush.pl
@@ -3,7 +3,7 @@
 use Getopt::Std;
 use Socket;
 
-#my @HOSTNAME = ("mmt-l-fl13-prv.mymessagingtop.it", "mmt-l-fl14-prv.mymessagingtop.it");
+#my @HOSTNAME = ("host", "host");
 #my @HOSTNAME = ("localhost", "localhost");
 #my $PORTNO = "4242";
 #my $PREFIX = "PREFIX";
diff --git a/remaster/mcs/mmt_scripts/schedulebe.py b/remaster/mcs/mmt_scripts/schedulebe.py
index 6d538f4..e8e907c 100755
--- a/remaster/mcs/mmt_scripts/schedulebe.py
+++ b/remaster/mcs/mmt_scripts/schedulebe.py
@@ -23,14 +23,14 @@ from xml.dom import minidom
 from xml.parsers.expat import ExpatError
 
 _debug = False
-#rtsvcUrl = "http://caladmin:caladmin@velvet:28080/ucaldav/rtsvc"
-#rtsvcUrl = "http://mmt-l-al20:8080/pubcaldav/rtsvc"
+#rtsvcUrl = "http://caladminurl"
+#rtsvcUrl = "http://pubcaladminurl"
 rtsvcUrl = None
 conf_request_enabled = True
 conf_mail_enabled = True
 
-# rtsvcUser = "pippo"
-# rtsvcPass = "pluto"
+# rtsvcUser = "user1"
+# rtsvcPass = "user2"
 
 class Meeting:
 
diff --git a/scripts/remaster_mcs_inner_chroot_script.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
similarity index 73%
rename from scripts/remaster_mcs_inner_chroot_script.sh
rename to scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
index 589a3ee..68b0e5b 100755
--- a/scripts/remaster_mcs_inner_chroot_script.sh
+++ b/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
@@ -4,3 +4,5 @@ equo update || ( sleep 1200 && equo update ) || exit 1
 
 # unmask apache with worker MPM
 equo unmask www-servers/apache[threads]
+# mask regular one
+equo mask www-servers/apache[-threads]
diff --git a/scripts/remaster_mcs_inner_chroot_script_after.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
similarity index 100%
rename from scripts/remaster_mcs_inner_chroot_script_after.sh
rename to scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
diff --git a/scripts/remaster_mcs_pre.sh b/scripts/3rdparty/remaster_mcs_pre.sh
similarity index 100%
rename from scripts/remaster_mcs_pre.sh
rename to scripts/3rdparty/remaster_mcs_pre.sh