diff --git a/makedb b/makedb
index de9661e..b36f9cc 100755
--- a/makedb
+++ b/makedb
@@ -10,6 +10,6 @@ GRANT ALL PRIVILEGES ON $USER.* TO '$USER'@'localhost' 	IDENTIFIED BY '$PASSWORD
 FLUSH PRIVILEGES;
 _EOF
 
-sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
-sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL
+sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" tmpl/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
+sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" tmpl/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL
 
diff --git a/makeuser b/makeuser
index 94c23f4..19627fd 100755
--- a/makeuser
+++ b/makeuser
@@ -9,7 +9,7 @@ PROGNAME=${0##*/}
 VERSION="0.4"
 LIST_NAME="thunix-join@lists.tildeverse.org"
 ADMIN_EMAIL="root@thunix.net"
-EMAIL_TEMPLATE="email.tmpl"
+EMAIL_TEMPLATE="tmpl/email.tmpl"
 YAML_FILE="$1.yml"
 GEN_TDP="./gen_tdp"
 TILDE_JSON="/var/www/thunix.cf/tilde.json"
@@ -55,8 +55,8 @@ case $1 in
 #    sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL 
 
 #		This is the welcome email for thunix
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $2
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
     sub_to_list $1
 
 #    This line is for team
diff --git a/makeuser_no_ansible b/makeuser_no_ansible
index ae69a3f..5a75b79 100755
--- a/makeuser_no_ansible
+++ b/makeuser_no_ansible
@@ -9,7 +9,7 @@ PROGNAME=${0##*/}
 VERSION="0.4"
 LIST_NAME="thunix-join@lists.tildeverse.org"
 ADMIN_EMAIL="root@thunix.net"
-EMAIL_TEMPLATE="email.tmpl"
+EMAIL_TEMPLATE="tmpl/email.tmpl"
 YAML_FILE="$1.yml"
 # This one for team
 # ZNC_USER="/home/znc/add_znc_user.sh"
@@ -54,8 +54,8 @@ case $1 in
 #    sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" $EMAIL_TEMPLATE | sudo mail $1 $2 $ADMIN_EMAIL 
 
 #		This is the welcome email for thunix
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $2
-		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" tmpl/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
     sub_to_list $1
 
 #    This line is for team
diff --git a/dbemail.tmpl b/tmpl/dbemail.tmpl
similarity index 100%
rename from dbemail.tmpl
rename to tmpl/dbemail.tmpl
diff --git a/email.tmpl b/tmpl/email.tmpl
similarity index 100%
rename from email.tmpl
rename to tmpl/email.tmpl