diff --git a/deploy/dev-deploy-all b/deploy/dev-deploy-all
index bce5771..20f637c 100755
--- a/deploy/dev-deploy-all
+++ b/deploy/dev-deploy-all
@@ -3,4 +3,5 @@
 ./dev-server-deploy mail-user
 ./dev-server-deploy mail-key
 ./dev-server-deploy tools
-
+./dev-server-deploy web
+./dev-tomcat-restart
diff --git a/deploy/james/apache-james-conf/domainlist.conf b/deploy/james/apache-james-conf/domainlist.conf
index 83c9ac9..9175e86 100644
--- a/deploy/james/apache-james-conf/domainlist.conf
+++ b/deploy/james/apache-james-conf/domainlist.conf
@@ -54,7 +54,7 @@
 <!-- 
 <domainlist class="org.apache.james.domainlist.xml.XMLDomainList">
    <domainnames>
-#       <domainname>mailiverse.com</domainname>
+       <domainname>mailiverse.com</domainname> 
    </domainnames>
    <autodetect>false</autodetect>
    <autodetectIP>false</autodetectIP>
diff --git a/deploy/james/apache-james-conf/james-database-mysql.properties b/deploy/james/apache-james-conf/james-database-mysql.properties
index f21abf2..94b7d08 100644
--- a/deploy/james/apache-james-conf/james-database-mysql.properties
+++ b/deploy/james/apache-james-conf/james-database-mysql.properties
@@ -24,7 +24,7 @@
 database.driverClassName=com.mysql.jdbc.Driver
 database.url=jdbc:mysql://localhost/james
 database.username=james
-database.password=JAMES_DB_PASSWORD
+database.password=bHPw8MLzd2N%
 
 # Supported adapters are:
 # DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE 
diff --git a/deploy/james/resources/hosts b/deploy/james/resources/hosts
new file mode 120000
index 0000000..8f2bc2e
--- /dev/null
+++ b/deploy/james/resources/hosts
@@ -0,0 +1 @@
+../../../config/hosts
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/auth_dev b/deploy/james/resources/hosts/auth_dev
deleted file mode 120000
index 66fc587..0000000
--- a/deploy/james/resources/hosts/auth_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/auth_prod b/deploy/james/resources/hosts/auth_prod
deleted file mode 120000
index ec6e042..0000000
--- a/deploy/james/resources/hosts/auth_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_db_dev b/deploy/james/resources/hosts/local_db_dev
deleted file mode 120000
index ef5bd81..0000000
--- a/deploy/james/resources/hosts/local_db_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_db_prod b/deploy/james/resources/hosts/local_db_prod
deleted file mode 120000
index 58d3085..0000000
--- a/deploy/james/resources/hosts/local_db_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_key_dev b/deploy/james/resources/hosts/local_key_dev
deleted file mode 120000
index 942989b..0000000
--- a/deploy/james/resources/hosts/local_key_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_key_prod b/deploy/james/resources/hosts/local_key_prod
deleted file mode 120000
index 78ceb66..0000000
--- a/deploy/james/resources/hosts/local_key_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_mail_dev b/deploy/james/resources/hosts/local_mail_dev
deleted file mode 120000
index 75f1282..0000000
--- a/deploy/james/resources/hosts/local_mail_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_mail_prod b/deploy/james/resources/hosts/local_mail_prod
deleted file mode 120000
index 445ec54..0000000
--- a/deploy/james/resources/hosts/local_mail_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_smtp_dev b/deploy/james/resources/hosts/local_smtp_dev
deleted file mode 120000
index 6efcea5..0000000
--- a/deploy/james/resources/hosts/local_smtp_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/local_smtp_prod b/deploy/james/resources/hosts/local_smtp_prod
deleted file mode 120000
index e87faad..0000000
--- a/deploy/james/resources/hosts/local_smtp_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/primary_dev b/deploy/james/resources/hosts/primary_dev
deleted file mode 120000
index 9a97052..0000000
--- a/deploy/james/resources/hosts/primary_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/primary_prod b/deploy/james/resources/hosts/primary_prod
deleted file mode 120000
index c033d47..0000000
--- a/deploy/james/resources/hosts/primary_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/tomcat_dev b/deploy/james/resources/hosts/tomcat_dev
deleted file mode 120000
index 7dd1f55..0000000
--- a/deploy/james/resources/hosts/tomcat_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/tomcat_prod b/deploy/james/resources/hosts/tomcat_prod
deleted file mode 120000
index 0b9acd9..0000000
--- a/deploy/james/resources/hosts/tomcat_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_prod
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/web_dev b/deploy/james/resources/hosts/web_dev
deleted file mode 120000
index 60eb301..0000000
--- a/deploy/james/resources/hosts/web_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_dev
\ No newline at end of file
diff --git a/deploy/james/resources/hosts/web_prod b/deploy/james/resources/hosts/web_prod
deleted file mode 120000
index d9aed43..0000000
--- a/deploy/james/resources/hosts/web_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_prod
\ No newline at end of file
diff --git a/deploy/james/setup b/deploy/james/setup
index b8aba4e..bd5eac7 100755
--- a/deploy/james/setup
+++ b/deploy/james/setup
@@ -4,3 +4,6 @@ ln -fs deploy/apache-james-conf
 ln -fs deploy/apache-james-mailbox-memory.jar
 ln -fs deploy/apache-james-server-mailets.jar
 
+M_PRIMARY=`cat resources/hosts/prod`
+cd apache-james/bin
+./james-cli.sh adddomain $M_PRIMARY -h localhost
diff --git a/deploy/mail-key/resources/hosts b/deploy/mail-key/resources/hosts
new file mode 120000
index 0000000..8f2bc2e
--- /dev/null
+++ b/deploy/mail-key/resources/hosts
@@ -0,0 +1 @@
+../../../config/hosts
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/auth_dev b/deploy/mail-key/resources/hosts/auth_dev
deleted file mode 120000
index 66fc587..0000000
--- a/deploy/mail-key/resources/hosts/auth_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/auth_prod b/deploy/mail-key/resources/hosts/auth_prod
deleted file mode 120000
index ec6e042..0000000
--- a/deploy/mail-key/resources/hosts/auth_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_db_dev b/deploy/mail-key/resources/hosts/local_db_dev
deleted file mode 120000
index ef5bd81..0000000
--- a/deploy/mail-key/resources/hosts/local_db_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_db_prod b/deploy/mail-key/resources/hosts/local_db_prod
deleted file mode 120000
index 58d3085..0000000
--- a/deploy/mail-key/resources/hosts/local_db_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_key_dev b/deploy/mail-key/resources/hosts/local_key_dev
deleted file mode 120000
index 942989b..0000000
--- a/deploy/mail-key/resources/hosts/local_key_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_key_prod b/deploy/mail-key/resources/hosts/local_key_prod
deleted file mode 120000
index 78ceb66..0000000
--- a/deploy/mail-key/resources/hosts/local_key_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_mail_dev b/deploy/mail-key/resources/hosts/local_mail_dev
deleted file mode 120000
index 75f1282..0000000
--- a/deploy/mail-key/resources/hosts/local_mail_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_mail_prod b/deploy/mail-key/resources/hosts/local_mail_prod
deleted file mode 120000
index 445ec54..0000000
--- a/deploy/mail-key/resources/hosts/local_mail_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_smtp_dev b/deploy/mail-key/resources/hosts/local_smtp_dev
deleted file mode 120000
index 6efcea5..0000000
--- a/deploy/mail-key/resources/hosts/local_smtp_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/local_smtp_prod b/deploy/mail-key/resources/hosts/local_smtp_prod
deleted file mode 120000
index e87faad..0000000
--- a/deploy/mail-key/resources/hosts/local_smtp_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/primary_dev b/deploy/mail-key/resources/hosts/primary_dev
deleted file mode 120000
index 9a97052..0000000
--- a/deploy/mail-key/resources/hosts/primary_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/primary_prod b/deploy/mail-key/resources/hosts/primary_prod
deleted file mode 120000
index c033d47..0000000
--- a/deploy/mail-key/resources/hosts/primary_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/tomcat_dev b/deploy/mail-key/resources/hosts/tomcat_dev
deleted file mode 120000
index 7dd1f55..0000000
--- a/deploy/mail-key/resources/hosts/tomcat_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/tomcat_prod b/deploy/mail-key/resources/hosts/tomcat_prod
deleted file mode 120000
index 0b9acd9..0000000
--- a/deploy/mail-key/resources/hosts/tomcat_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_prod
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/web_dev b/deploy/mail-key/resources/hosts/web_dev
deleted file mode 120000
index 60eb301..0000000
--- a/deploy/mail-key/resources/hosts/web_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_dev
\ No newline at end of file
diff --git a/deploy/mail-key/resources/hosts/web_prod b/deploy/mail-key/resources/hosts/web_prod
deleted file mode 120000
index d9aed43..0000000
--- a/deploy/mail-key/resources/hosts/web_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts b/deploy/mail-user/resources/hosts
new file mode 120000
index 0000000..8f2bc2e
--- /dev/null
+++ b/deploy/mail-user/resources/hosts
@@ -0,0 +1 @@
+../../../config/hosts
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/auth_dev b/deploy/mail-user/resources/hosts/auth_dev
deleted file mode 120000
index 66fc587..0000000
--- a/deploy/mail-user/resources/hosts/auth_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/auth_prod b/deploy/mail-user/resources/hosts/auth_prod
deleted file mode 120000
index ec6e042..0000000
--- a/deploy/mail-user/resources/hosts/auth_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_db_dev b/deploy/mail-user/resources/hosts/local_db_dev
deleted file mode 120000
index ef5bd81..0000000
--- a/deploy/mail-user/resources/hosts/local_db_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_db_prod b/deploy/mail-user/resources/hosts/local_db_prod
deleted file mode 120000
index 58d3085..0000000
--- a/deploy/mail-user/resources/hosts/local_db_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_key_dev b/deploy/mail-user/resources/hosts/local_key_dev
deleted file mode 120000
index 942989b..0000000
--- a/deploy/mail-user/resources/hosts/local_key_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_key_prod b/deploy/mail-user/resources/hosts/local_key_prod
deleted file mode 120000
index 78ceb66..0000000
--- a/deploy/mail-user/resources/hosts/local_key_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_mail_dev b/deploy/mail-user/resources/hosts/local_mail_dev
deleted file mode 120000
index 75f1282..0000000
--- a/deploy/mail-user/resources/hosts/local_mail_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_mail_prod b/deploy/mail-user/resources/hosts/local_mail_prod
deleted file mode 120000
index 445ec54..0000000
--- a/deploy/mail-user/resources/hosts/local_mail_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_smtp_dev b/deploy/mail-user/resources/hosts/local_smtp_dev
deleted file mode 120000
index 6efcea5..0000000
--- a/deploy/mail-user/resources/hosts/local_smtp_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/local_smtp_prod b/deploy/mail-user/resources/hosts/local_smtp_prod
deleted file mode 120000
index e87faad..0000000
--- a/deploy/mail-user/resources/hosts/local_smtp_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/primary_dev b/deploy/mail-user/resources/hosts/primary_dev
deleted file mode 120000
index 9a97052..0000000
--- a/deploy/mail-user/resources/hosts/primary_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/primary_prod b/deploy/mail-user/resources/hosts/primary_prod
deleted file mode 120000
index c033d47..0000000
--- a/deploy/mail-user/resources/hosts/primary_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/tomcat_dev b/deploy/mail-user/resources/hosts/tomcat_dev
deleted file mode 120000
index 7dd1f55..0000000
--- a/deploy/mail-user/resources/hosts/tomcat_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/tomcat_prod b/deploy/mail-user/resources/hosts/tomcat_prod
deleted file mode 120000
index 0b9acd9..0000000
--- a/deploy/mail-user/resources/hosts/tomcat_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_prod
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/web_dev b/deploy/mail-user/resources/hosts/web_dev
deleted file mode 120000
index 60eb301..0000000
--- a/deploy/mail-user/resources/hosts/web_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_dev
\ No newline at end of file
diff --git a/deploy/mail-user/resources/hosts/web_prod b/deploy/mail-user/resources/hosts/web_prod
deleted file mode 120000
index d9aed43..0000000
--- a/deploy/mail-user/resources/hosts/web_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/captcha_private_key b/deploy/tomcat/resources/captcha_private_key
new file mode 120000
index 0000000..948d898
--- /dev/null
+++ b/deploy/tomcat/resources/captcha_private_key
@@ -0,0 +1 @@
+../../../passwords/captcha_private_key
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts b/deploy/tomcat/resources/hosts
new file mode 120000
index 0000000..8f2bc2e
--- /dev/null
+++ b/deploy/tomcat/resources/hosts
@@ -0,0 +1 @@
+../../../config/hosts
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/auth_dev b/deploy/tomcat/resources/hosts/auth_dev
deleted file mode 120000
index 66fc587..0000000
--- a/deploy/tomcat/resources/hosts/auth_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/auth_prod b/deploy/tomcat/resources/hosts/auth_prod
deleted file mode 120000
index ec6e042..0000000
--- a/deploy/tomcat/resources/hosts/auth_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_db_dev b/deploy/tomcat/resources/hosts/local_db_dev
deleted file mode 120000
index ef5bd81..0000000
--- a/deploy/tomcat/resources/hosts/local_db_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_db_prod b/deploy/tomcat/resources/hosts/local_db_prod
deleted file mode 120000
index 58d3085..0000000
--- a/deploy/tomcat/resources/hosts/local_db_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_key_dev b/deploy/tomcat/resources/hosts/local_key_dev
deleted file mode 120000
index 942989b..0000000
--- a/deploy/tomcat/resources/hosts/local_key_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_key_prod b/deploy/tomcat/resources/hosts/local_key_prod
deleted file mode 120000
index 78ceb66..0000000
--- a/deploy/tomcat/resources/hosts/local_key_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_mail_dev b/deploy/tomcat/resources/hosts/local_mail_dev
deleted file mode 120000
index 75f1282..0000000
--- a/deploy/tomcat/resources/hosts/local_mail_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_mail_prod b/deploy/tomcat/resources/hosts/local_mail_prod
deleted file mode 120000
index 445ec54..0000000
--- a/deploy/tomcat/resources/hosts/local_mail_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_smtp_dev b/deploy/tomcat/resources/hosts/local_smtp_dev
deleted file mode 120000
index 6efcea5..0000000
--- a/deploy/tomcat/resources/hosts/local_smtp_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/local_smtp_prod b/deploy/tomcat/resources/hosts/local_smtp_prod
deleted file mode 120000
index e87faad..0000000
--- a/deploy/tomcat/resources/hosts/local_smtp_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/primary_dev b/deploy/tomcat/resources/hosts/primary_dev
deleted file mode 120000
index 9a97052..0000000
--- a/deploy/tomcat/resources/hosts/primary_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/primary_prod b/deploy/tomcat/resources/hosts/primary_prod
deleted file mode 120000
index c033d47..0000000
--- a/deploy/tomcat/resources/hosts/primary_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/tomcat_dev b/deploy/tomcat/resources/hosts/tomcat_dev
deleted file mode 120000
index 7dd1f55..0000000
--- a/deploy/tomcat/resources/hosts/tomcat_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/tomcat_prod b/deploy/tomcat/resources/hosts/tomcat_prod
deleted file mode 120000
index 0b9acd9..0000000
--- a/deploy/tomcat/resources/hosts/tomcat_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_prod
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/web_dev b/deploy/tomcat/resources/hosts/web_dev
deleted file mode 120000
index 60eb301..0000000
--- a/deploy/tomcat/resources/hosts/web_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_dev
\ No newline at end of file
diff --git a/deploy/tomcat/resources/hosts/web_prod b/deploy/tomcat/resources/hosts/web_prod
deleted file mode 120000
index d9aed43..0000000
--- a/deploy/tomcat/resources/hosts/web_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts b/deploy/tools/resources/hosts
new file mode 120000
index 0000000..8f2bc2e
--- /dev/null
+++ b/deploy/tools/resources/hosts
@@ -0,0 +1 @@
+../../../config/hosts
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/auth_dev b/deploy/tools/resources/hosts/auth_dev
deleted file mode 120000
index 66fc587..0000000
--- a/deploy/tools/resources/hosts/auth_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/auth_prod b/deploy/tools/resources/hosts/auth_prod
deleted file mode 120000
index ec6e042..0000000
--- a/deploy/tools/resources/hosts/auth_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/auth_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_db_dev b/deploy/tools/resources/hosts/local_db_dev
deleted file mode 120000
index ef5bd81..0000000
--- a/deploy/tools/resources/hosts/local_db_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_db_prod b/deploy/tools/resources/hosts/local_db_prod
deleted file mode 120000
index 58d3085..0000000
--- a/deploy/tools/resources/hosts/local_db_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_db_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_key_dev b/deploy/tools/resources/hosts/local_key_dev
deleted file mode 120000
index 942989b..0000000
--- a/deploy/tools/resources/hosts/local_key_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_key_prod b/deploy/tools/resources/hosts/local_key_prod
deleted file mode 120000
index 78ceb66..0000000
--- a/deploy/tools/resources/hosts/local_key_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_key_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_mail_dev b/deploy/tools/resources/hosts/local_mail_dev
deleted file mode 120000
index 75f1282..0000000
--- a/deploy/tools/resources/hosts/local_mail_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_mail_prod b/deploy/tools/resources/hosts/local_mail_prod
deleted file mode 120000
index 445ec54..0000000
--- a/deploy/tools/resources/hosts/local_mail_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_mail_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_smtp_dev b/deploy/tools/resources/hosts/local_smtp_dev
deleted file mode 120000
index 6efcea5..0000000
--- a/deploy/tools/resources/hosts/local_smtp_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/local_smtp_prod b/deploy/tools/resources/hosts/local_smtp_prod
deleted file mode 120000
index e87faad..0000000
--- a/deploy/tools/resources/hosts/local_smtp_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/local_smtp_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/primary_dev b/deploy/tools/resources/hosts/primary_dev
deleted file mode 120000
index 9a97052..0000000
--- a/deploy/tools/resources/hosts/primary_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/primary_prod b/deploy/tools/resources/hosts/primary_prod
deleted file mode 120000
index c033d47..0000000
--- a/deploy/tools/resources/hosts/primary_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/primary_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/tomcat_dev b/deploy/tools/resources/hosts/tomcat_dev
deleted file mode 120000
index 7dd1f55..0000000
--- a/deploy/tools/resources/hosts/tomcat_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/tomcat_prod b/deploy/tools/resources/hosts/tomcat_prod
deleted file mode 120000
index 0b9acd9..0000000
--- a/deploy/tools/resources/hosts/tomcat_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/tomcat_prod
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/web_dev b/deploy/tools/resources/hosts/web_dev
deleted file mode 120000
index 60eb301..0000000
--- a/deploy/tools/resources/hosts/web_dev
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_dev
\ No newline at end of file
diff --git a/deploy/tools/resources/hosts/web_prod b/deploy/tools/resources/hosts/web_prod
deleted file mode 120000
index d9aed43..0000000
--- a/deploy/tools/resources/hosts/web_prod
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/hosts/web_prod
\ No newline at end of file
diff --git a/deploy/watch b/deploy/watch
index 9565a5c..465c6ad 100755
--- a/deploy/watch
+++ b/deploy/watch
@@ -1,6 +1,6 @@
 if [ -z "$1" ]; then echo "Must supply name"; exit 0; fi
 
-source ./hosts.config
+source ./config.hosts
 server=$M_HOST_PROD
 
 ssh $1@$server "tail -n 100 -f run.log"
diff --git a/install/setup-james b/install/setup-james
index 74cf22a..1452667 100755
--- a/install/setup-james
+++ b/install/setup-james
@@ -2,6 +2,7 @@ set -x
 
 M_HOST=$1
 
+scp apache-james-3.0*.tar.gz james@$M_HOST:
 scp setup-james.remote james@$M_HOST:
 ssh james@$M_HOST ./setup-james.remote
 
diff --git a/install/setup-james.remote b/install/setup-james.remote
index a5133f6..7704792 100755
--- a/install/setup-james.remote
+++ b/install/setup-james.remote
@@ -1,11 +1,23 @@
 set -x
 
-wget http://apache.mirrors.pair.com//james/apache-james/3.0beta4/apache-james-3.0-beta4-app.tar.gz
-tar xzvf apache-james-3.0-beta4-app.tar.gz
 
-ln -s apache-james-3.0-beta4 apache-james
+#mkdir build
+#cd build
+#svn checkout http://svn.apache.org/repos/asf/james/current/ james
+#cd james
+#mvn clean
+#mvn package -Pwith-assembly -DskipTests=true
+
+
+
+tar xzf apache-james-3.0-beta5*.tar.gz
+ln -fs apache-james-3.0-beta5*/ apache-james
 cd apache-james
+
 mv conf conf-original
 ln -s ../apache-james-conf conf
 
+cd lib
+ln -fs ~/deploy/apache-james-mailbox-memory.jar apache-james-mailbox-memory*.jar
+
 echo The final pieces will be installed during deploy
diff --git a/install/setup-java.remote b/install/setup-java.remote
index 0e7b540..a35e423 100755
--- a/install/setup-java.remote
+++ b/install/setup-java.remote
@@ -4,7 +4,8 @@
 
 sudo add-apt-repository ppa:webupd8team/java --yes
 sudo apt-get update
-sudo apt-get install oracle-java7-installer --yes
+#sudo apt-get install oracle-java7-installer --yes
+sudo apt-get install oracle-java6-installer --yes
 
 echo "Check the version after running this script, if it is not sun java then"
 echo "read this: http://www.webupd8.org/2012/01/install-oracle-java-jdk-7-in-ubuntu-via.html"
diff --git a/install/setup-server b/install/setup-server
index c09c89f..50671a3 100755
--- a/install/setup-server
+++ b/install/setup-server
@@ -5,6 +5,8 @@ set -x
 M_HOST=$1
 
 ./create-server-accounts $M_HOST
+
+./setup-utils $M_HOST
 ./setup-james $M_HOST
 ./setup-java $M_HOST
 ./setup-mysql $M_HOST
diff --git a/install/setup-utils b/install/setup-utils
new file mode 100644
index 0000000..1e03741
--- /dev/null
+++ b/install/setup-utils
@@ -0,0 +1,8 @@
+
+M_ROOT=`cat requirements/server_root_account`
+M_HOST=$1
+
+scp setup-utils.remote $M_ROOT@$M_HOST:
+ssh $M_ROOT@$M_HOST ./setup-utils.remote
+
+
diff --git a/install/setup-utils.remote b/install/setup-utils.remote
new file mode 100755
index 0000000..d022aef
--- /dev/null
+++ b/install/setup-utils.remote
@@ -0,0 +1,5 @@
+sudo apt-get install subversion
+
+sudo apt-get install maven
+sudo dpkg -i --force-all /var/cache/apt/archives/libwagon2-java_2.2-3+nmu1_all.deb
+sudo apt-get install maven
diff --git a/java/core/src/mail/server/push/PushDb.java b/java/core/src/mail/server/push/PushDb.java
index bd54b70..bee93ca 100644
--- a/java/core/src/mail/server/push/PushDb.java
+++ b/java/core/src/mail/server/push/PushDb.java
@@ -30,6 +30,7 @@ public class PushDb
 		{
 			cryptor = new CryptorRSAAES(new CryptorRSAJCE(ExternalResource.getResourceAsStream(getClass(), "keystore.jks"), null));
 			mailExtra = new MailExtraDb();
+			mailExtra.ensureTables();
 		}
 		catch (Exception e)
 		{
diff --git a/java/core/src/mail/streamserver/MailServerSessionDb.java b/java/core/src/mail/streamserver/MailServerSessionDb.java
index 57a0974..5818c72 100644
--- a/java/core/src/mail/streamserver/MailServerSessionDb.java
+++ b/java/core/src/mail/streamserver/MailServerSessionDb.java
@@ -4,7 +4,9 @@
  */
 package mail.streamserver;
 
+import java.io.IOException;
 import java.math.BigInteger;
+import java.sql.SQLException;
 import java.util.Random;
 
 import mail.server.db.MailUserDb;
@@ -35,11 +37,12 @@ public class MailServerSessionDb implements SRPServerUserSessionDb
 	MailExtraDb payment;
 	Captcha captcha;
 	
-	public MailServerSessionDb (MailUserDb db)
+	public MailServerSessionDb (MailUserDb db) throws SQLException, IOException
 	{
 		this.db = db;
 		this.captcha = new Captcha();
 		this.payment = new MailExtraDb();
+		payment.ensureTables();
 	}
 
 	public void setBlock (String userName, byte[] block) throws Exception
diff --git a/java/webserver/src/mail/web/CaptchaResponse.java b/java/webserver/src/mail/web/CaptchaResponse.java
index 2e6d1e1..f76d98c 100644
--- a/java/webserver/src/mail/web/CaptchaResponse.java
+++ b/java/webserver/src/mail/web/CaptchaResponse.java
@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import core.constants.ConstantsServer;
 import core.server.captcha.Captcha;
+import core.util.ExternalResource;
 import core.util.LogNull;
 import core.util.LogOut;
 
@@ -68,30 +69,37 @@ public class CaptchaResponse extends HttpServlet {
 		doCors(response);
 		response.setContentType("application/json");
         
-        String remoteAddr = request.getRemoteAddr();
-        ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
-        reCaptcha.setPrivateKey("YOUR_PRIVATE_KEY");
-
-        String challenge = request.getParameter("recaptcha_challenge_field");
-        String uresponse = request.getParameter("recaptcha_response_field");
-        ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer(remoteAddr, challenge, uresponse);
-
-        if (reCaptchaResponse.isValid()) 
-        {
-        	try
-        	{
-	        	String token = captcha.captchaSucceeded();
-	        	response.getWriter().write(("{'succeeded':true,'token':'" + token + "'}").replaceAll("'", "\""));
-        	}
-        	catch (Exception e)
-        	{
-        		response.getWriter().write("{'succeeded':false,'reason':'System error'}".replaceAll("'", "\""));
-        	}
-        } 
-        else 
-        {
-        	response.getWriter().write("{'succeeded':false,'reason':'User error'}".replaceAll("'", "\""));
-        }
+		try
+		{
+	        String remoteAddr = request.getRemoteAddr();
+	        ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
+	        reCaptcha.setPrivateKey(ExternalResource.getTrimmedString("captcha_private_key"));
+	
+	        String challenge = request.getParameter("recaptcha_challenge_field");
+	        String uresponse = request.getParameter("recaptcha_response_field");
+	        ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer(remoteAddr, challenge, uresponse);
+	
+	        if (reCaptchaResponse.isValid()) 
+	        {
+	        	try
+	        	{
+		        	String token = captcha.captchaSucceeded();
+		        	response.getWriter().write(("{'succeeded':true,'token':'" + token + "'}").replaceAll("'", "\""));
+	        	}
+	        	catch (Exception e)
+	        	{
+	        		response.getWriter().write("{'succeeded':false,'reason':'System error'}".replaceAll("'", "\""));
+	        	}
+	        } 
+	        else 
+	        {
+	        	response.getWriter().write("{'succeeded':false,'reason':'User error'}".replaceAll("'", "\""));
+	        }
+		}
+		catch (Exception e)
+		{
+    		response.getWriter().write("{'succeeded':false,'reason':'System error, captcha private key not set'}".replaceAll("'", "\""));
+		}
 	}
 	
 	@Override
diff --git a/passwords/captcha_private_key b/passwords/captcha_private_key
new file mode 100644
index 0000000..b292271
--- /dev/null
+++ b/passwords/captcha_private_key
@@ -0,0 +1 @@
+THIS IS THE PRIVATE KEY PROVIDED BY GOOGLE RECAPTCHA