diff --git a/tmpl/dbemail.tmpl b/include/dbemail.tmpl
similarity index 100%
rename from tmpl/dbemail.tmpl
rename to include/dbemail.tmpl
diff --git a/tmpl/email.tmpl b/include/email.tmpl
similarity index 100%
rename from tmpl/email.tmpl
rename to include/email.tmpl
diff --git a/makedb b/makedb
index b08ee4f..7a97b55 100755
--- a/makedb
+++ b/makedb
@@ -11,6 +11,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" 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
+sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $USER@thunix.net
+sed -e "s/_username_/$USER/g" -e "s/_password_/$PASSWORD/g" include/dbemail.tmpl | sudo mail -s "Your database has been provisioned" $ADMIN_EMAIL
 
diff --git a/makeuser b/makeuser
index 8beaad3..ef31b74 100755
--- a/makeuser
+++ b/makeuser
@@ -45,8 +45,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" 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 
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
     sub_to_list $1
 
 #		We don't need this for thunix, since ansible will do it
diff --git a/makeuser_no_ansible b/makeuser_no_ansible
index 3ca3348..262ed80 100755
--- a/makeuser_no_ansible
+++ b/makeuser_no_ansible
@@ -44,8 +44,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" 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 
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $2
+		sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/g" include/email.tmpl | sudo mail -s "Welcome to Thunix!" $ADMIN_EMAIL 
     sub_to_list $1
 
 #		We don't need this for thunix, since ansible will do it
diff --git a/setenv b/setenv
index 7b3b236..a464ce5 100644
--- a/setenv
+++ b/setenv
@@ -8,6 +8,6 @@ export ADMIN_EMAIL="root@thunix.net"
 export SIGNUP_URL="https://thunix.net/signup"
 export DESCRIPTION="Thunix is a community, centered around access to a public *nix system.  Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration."
 export LIST_NAME="thunix-join@lists.tildeverse.org"
-export EMAIL_TEMPLATE="tmpl/email.tmpl"
+export EMAIL_TEMPLATE="include/email.tmpl"
 export TILDE_JSON="/var/www/thunix.cf/tilde.json"
 export YAML_FILE="$1.yml"