diff --git a/templates/config_admin.cs b/template/config_admin.cs
similarity index 100%
rename from templates/config_admin.cs
rename to template/config_admin.cs
diff --git a/templates/config_all.cs b/template/config_all.cs
similarity index 100%
rename from templates/config_all.cs
rename to template/config_all.cs
diff --git a/templates/config_archive.cs b/template/config_archive.cs
similarity index 100%
rename from templates/config_archive.cs
rename to template/config_archive.cs
diff --git a/templates/config_main.cs b/template/config_main.cs
similarity index 100%
rename from templates/config_main.cs
rename to template/config_main.cs
diff --git a/templates/config_options/admin_edit_text.cs b/template/config_options/admin_edit_text.cs
similarity index 100%
rename from templates/config_options/admin_edit_text.cs
rename to template/config_options/admin_edit_text.cs
diff --git a/templates/config_options/admin_enabled.cs b/template/config_options/admin_enabled.cs
similarity index 100%
rename from templates/config_options/admin_enabled.cs
rename to template/config_options/admin_enabled.cs
diff --git a/templates/config_options/admin_get_subscribers.cs b/template/config_options/admin_get_subscribers.cs
similarity index 100%
rename from templates/config_options/admin_get_subscribers.cs
rename to template/config_options/admin_get_subscribers.cs
diff --git a/templates/config_options/admin_path.cs b/template/config_options/admin_path.cs
similarity index 100%
rename from templates/config_options/admin_path.cs
rename to template/config_options/admin_path.cs
diff --git a/templates/config_options/archive_deny_unknown.cs b/template/config_options/archive_deny_unknown.cs
similarity index 100%
rename from templates/config_options/archive_deny_unknown.cs
rename to template/config_options/archive_deny_unknown.cs
diff --git a/templates/config_options/archive_enabled.cs b/template/config_options/archive_enabled.cs
similarity index 100%
rename from templates/config_options/archive_enabled.cs
rename to template/config_options/archive_enabled.cs
diff --git a/templates/config_options/archive_mod_only.cs b/template/config_options/archive_mod_only.cs
similarity index 100%
rename from templates/config_options/archive_mod_only.cs
rename to template/config_options/archive_mod_only.cs
diff --git a/templates/config_options/archive_remove_private_header.cs b/template/config_options/archive_remove_private_header.cs
similarity index 100%
rename from templates/config_options/archive_remove_private_header.cs
rename to template/config_options/archive_remove_private_header.cs
diff --git a/templates/config_options/block_deny.cs b/template/config_options/block_deny.cs
similarity index 100%
rename from templates/config_options/block_deny.cs
rename to template/config_options/block_deny.cs
diff --git a/templates/config_options/block_nonmod_post.cs b/template/config_options/block_nonmod_post.cs
similarity index 100%
rename from templates/config_options/block_nonmod_post.cs
rename to template/config_options/block_nonmod_post.cs
diff --git a/templates/config_options/block_others_archive.cs b/template/config_options/block_others_archive.cs
similarity index 100%
rename from templates/config_options/block_others_archive.cs
rename to template/config_options/block_others_archive.cs
diff --git a/templates/config_options/block_others_post.cs b/template/config_options/block_others_post.cs
similarity index 100%
rename from templates/config_options/block_others_post.cs
rename to template/config_options/block_others_post.cs
diff --git a/templates/config_options/charset_select.cs b/template/config_options/charset_select.cs
similarity index 100%
rename from templates/config_options/charset_select.cs
rename to template/config_options/charset_select.cs
diff --git a/templates/config_options/confirm_post.cs b/template/config_options/confirm_post.cs
similarity index 100%
rename from templates/config_options/confirm_post.cs
rename to template/config_options/confirm_post.cs
diff --git a/templates/config_options/confirm_sub.cs b/template/config_options/confirm_sub.cs
similarity index 100%
rename from templates/config_options/confirm_sub.cs
rename to template/config_options/confirm_sub.cs
diff --git a/templates/config_options/confirm_unsub.cs b/template/config_options/confirm_unsub.cs
similarity index 100%
rename from templates/config_options/confirm_unsub.cs
rename to template/config_options/confirm_unsub.cs
diff --git a/templates/config_options/create_listaddress.cs b/template/config_options/create_listaddress.cs
similarity index 100%
rename from templates/config_options/create_listaddress.cs
rename to template/config_options/create_listaddress.cs
diff --git a/templates/config_options/create_listname.cs b/template/config_options/create_listname.cs
similarity index 100%
rename from templates/config_options/create_listname.cs
rename to template/config_options/create_listname.cs
diff --git a/templates/config_options/digest_enabled.cs b/template/config_options/digest_enabled.cs
similarity index 100%
rename from templates/config_options/digest_enabled.cs
rename to template/config_options/digest_enabled.cs
diff --git a/templates/config_options/digest_settings.cs b/template/config_options/digest_settings.cs
similarity index 100%
rename from templates/config_options/digest_settings.cs
rename to template/config_options/digest_settings.cs
diff --git a/templates/config_options/from_address.cs b/template/config_options/from_address.cs
similarity index 100%
rename from templates/config_options/from_address.cs
rename to template/config_options/from_address.cs
diff --git a/templates/config_options/gnupg_allow_key_submission.cs b/template/config_options/gnupg_allow_key_submission.cs
similarity index 100%
rename from templates/config_options/gnupg_allow_key_submission.cs
rename to template/config_options/gnupg_allow_key_submission.cs
diff --git a/templates/config_options/gnupg_encrypt_to_all.cs b/template/config_options/gnupg_encrypt_to_all.cs
similarity index 100%
rename from templates/config_options/gnupg_encrypt_to_all.cs
rename to template/config_options/gnupg_encrypt_to_all.cs
diff --git a/templates/config_options/gnupg_keycomment.cs b/template/config_options/gnupg_keycomment.cs
similarity index 100%
rename from templates/config_options/gnupg_keycomment.cs
rename to template/config_options/gnupg_keycomment.cs
diff --git a/templates/config_options/gnupg_keyexpires.cs b/template/config_options/gnupg_keyexpires.cs
similarity index 100%
rename from templates/config_options/gnupg_keyexpires.cs
rename to template/config_options/gnupg_keyexpires.cs
diff --git a/templates/config_options/gnupg_keyname.cs b/template/config_options/gnupg_keyname.cs
similarity index 100%
rename from templates/config_options/gnupg_keyname.cs
rename to template/config_options/gnupg_keyname.cs
diff --git a/templates/config_options/gnupg_keysize.cs b/template/config_options/gnupg_keysize.cs
similarity index 100%
rename from templates/config_options/gnupg_keysize.cs
rename to template/config_options/gnupg_keysize.cs
diff --git a/templates/config_options/gnupg_nokey_nocrypt.cs b/template/config_options/gnupg_nokey_nocrypt.cs
similarity index 100%
rename from templates/config_options/gnupg_nokey_nocrypt.cs
rename to template/config_options/gnupg_nokey_nocrypt.cs
diff --git a/templates/config_options/gnupg_require_sigs.cs b/template/config_options/gnupg_require_sigs.cs
similarity index 100%
rename from templates/config_options/gnupg_require_sigs.cs
rename to template/config_options/gnupg_require_sigs.cs
diff --git a/templates/config_options/gnupg_require_subscriber.cs b/template/config_options/gnupg_require_subscriber.cs
similarity index 100%
rename from templates/config_options/gnupg_require_subscriber.cs
rename to template/config_options/gnupg_require_subscriber.cs
diff --git a/templates/config_options/gnupg_sign_messages.cs b/template/config_options/gnupg_sign_messages.cs
similarity index 100%
rename from templates/config_options/gnupg_sign_messages.cs
rename to template/config_options/gnupg_sign_messages.cs
diff --git a/templates/config_options/gnupg_verified_key_required.cs b/template/config_options/gnupg_verified_key_required.cs
similarity index 100%
rename from templates/config_options/gnupg_verified_key_required.cs
rename to template/config_options/gnupg_verified_key_required.cs
diff --git a/templates/config_options/headeradd.cs b/template/config_options/headeradd.cs
similarity index 100%
rename from templates/config_options/headeradd.cs
rename to template/config_options/headeradd.cs
diff --git a/templates/config_options/headerremove.cs b/template/config_options/headerremove.cs
similarity index 100%
rename from templates/config_options/headerremove.cs
rename to template/config_options/headerremove.cs
diff --git a/templates/config_options/lang_select.cs b/template/config_options/lang_select.cs
similarity index 100%
rename from templates/config_options/lang_select.cs
rename to template/config_options/lang_select.cs
diff --git a/templates/config_options/mailman_requests.cs b/template/config_options/mailman_requests.cs
similarity index 100%
rename from templates/config_options/mailman_requests.cs
rename to template/config_options/mailman_requests.cs
diff --git a/templates/config_options/mainlist.cs b/template/config_options/mainlist.cs
similarity index 100%
rename from templates/config_options/mainlist.cs
rename to template/config_options/mainlist.cs
diff --git a/templates/config_options/mime_both.cs b/template/config_options/mime_both.cs
similarity index 100%
rename from templates/config_options/mime_both.cs
rename to template/config_options/mime_both.cs
diff --git a/templates/config_options/mimecheck.cs b/template/config_options/mimecheck.cs
similarity index 100%
rename from templates/config_options/mimecheck.cs
rename to template/config_options/mimecheck.cs
diff --git a/templates/config_options/mimereject.cs b/template/config_options/mimereject.cs
similarity index 100%
rename from templates/config_options/mimereject.cs
rename to template/config_options/mimereject.cs
diff --git a/templates/config_options/mimeremove.cs b/template/config_options/mimeremove.cs
similarity index 100%
rename from templates/config_options/mimeremove.cs
rename to template/config_options/mimeremove.cs
diff --git a/templates/config_options/mod_post.cs b/template/config_options/mod_post.cs
similarity index 100%
rename from templates/config_options/mod_post.cs
rename to template/config_options/mod_post.cs
diff --git a/templates/config_options/mod_post_path.cs b/template/config_options/mod_post_path.cs
similarity index 100%
rename from templates/config_options/mod_post_path.cs
rename to template/config_options/mod_post_path.cs
diff --git a/templates/config_options/mod_sub.cs b/template/config_options/mod_sub.cs
similarity index 100%
rename from templates/config_options/mod_sub.cs
rename to template/config_options/mod_sub.cs
diff --git a/templates/config_options/mod_sub_path.cs b/template/config_options/mod_sub_path.cs
similarity index 100%
rename from templates/config_options/mod_sub_path.cs
rename to template/config_options/mod_sub_path.cs
diff --git a/templates/config_options/msgsize_max.cs b/template/config_options/msgsize_max.cs
similarity index 100%
rename from templates/config_options/msgsize_max.cs
rename to template/config_options/msgsize_max.cs
diff --git a/templates/config_options/msgsize_min.cs b/template/config_options/msgsize_min.cs
similarity index 100%
rename from templates/config_options/msgsize_min.cs
rename to template/config_options/msgsize_min.cs
diff --git a/templates/config_options/mysql.cs b/template/config_options/mysql.cs
similarity index 100%
rename from templates/config_options/mysql.cs
rename to template/config_options/mysql.cs
diff --git a/templates/config_options/owner_address.cs b/template/config_options/owner_address.cs
similarity index 100%
rename from templates/config_options/owner_address.cs
rename to template/config_options/owner_address.cs
diff --git a/templates/config_options/prefix.cs b/template/config_options/prefix.cs
similarity index 100%
rename from templates/config_options/prefix.cs
rename to template/config_options/prefix.cs
diff --git a/templates/config_options/public.cs b/template/config_options/public.cs
similarity index 100%
rename from templates/config_options/public.cs
rename to template/config_options/public.cs
diff --git a/templates/config_options/trailer.cs b/template/config_options/trailer.cs
similarity index 100%
rename from templates/config_options/trailer.cs
rename to template/config_options/trailer.cs
diff --git a/templates/config_options/warn_remove.cs b/template/config_options/warn_remove.cs
similarity index 100%
rename from templates/config_options/warn_remove.cs
rename to template/config_options/warn_remove.cs
diff --git a/templates/config_options/webusers.cs b/template/config_options/webusers.cs
similarity index 100%
rename from templates/config_options/webusers.cs
rename to template/config_options/webusers.cs
diff --git a/templates/config_posting.cs b/template/config_posting.cs
similarity index 100%
rename from templates/config_posting.cs
rename to template/config_posting.cs
diff --git a/templates/config_processing.cs b/template/config_processing.cs
similarity index 100%
rename from templates/config_processing.cs
rename to template/config_processing.cs
diff --git a/templates/config_subscription.cs b/template/config_subscription.cs
similarity index 100%
rename from templates/config_subscription.cs
rename to template/config_subscription.cs
diff --git a/templates/footer.cs b/template/footer.cs
similarity index 100%
rename from templates/footer.cs
rename to template/footer.cs
diff --git a/templates/form_common.cs b/template/form_common.cs
similarity index 100%
rename from templates/form_common.cs
rename to template/form_common.cs
diff --git a/templates/gnupg_convert.cs b/template/gnupg_convert.cs
similarity index 100%
rename from templates/gnupg_convert.cs
rename to template/gnupg_convert.cs
diff --git a/templates/gnupg_generate_key.cs b/template/gnupg_generate_key.cs
similarity index 100%
rename from templates/gnupg_generate_key.cs
rename to template/gnupg_generate_key.cs
diff --git a/templates/gnupg_import.cs b/template/gnupg_import.cs
similarity index 100%
rename from templates/gnupg_import.cs
rename to template/gnupg_import.cs
diff --git a/templates/gnupg_public.cs b/template/gnupg_public.cs
similarity index 100%
rename from templates/gnupg_public.cs
rename to template/gnupg_public.cs
diff --git a/templates/gnupg_secret.cs b/template/gnupg_secret.cs
similarity index 100%
rename from templates/gnupg_secret.cs
rename to template/gnupg_secret.cs
diff --git a/templates/header.cs b/template/header.cs
similarity index 100%
rename from templates/header.cs
rename to template/header.cs
diff --git a/templates/help_tag_substitution.cs b/template/help_tag_substitution.cs
similarity index 100%
rename from templates/help_tag_substitution.cs
rename to template/help_tag_substitution.cs
diff --git a/templates/language.hdf b/template/language.hdf
similarity index 100%
rename from templates/language.hdf
rename to template/language.hdf
diff --git a/templates/language_select.cs b/template/language_select.cs
similarity index 100%
rename from templates/language_select.cs
rename to template/language_select.cs
diff --git a/templates/list_create.cs b/template/list_create.cs
similarity index 100%
rename from templates/list_create.cs
rename to template/list_create.cs
diff --git a/templates/list_delete.cs b/template/list_delete.cs
similarity index 100%
rename from templates/list_delete.cs
rename to template/list_delete.cs
diff --git a/templates/list_select.cs b/template/list_select.cs
similarity index 100%
rename from templates/list_select.cs
rename to template/list_select.cs
diff --git a/templates/macros.cs b/template/macros.cs
similarity index 100%
rename from templates/macros.cs
rename to template/macros.cs
diff --git a/templates/main.cs b/template/main.cs
similarity index 100%
rename from templates/main.cs
rename to template/main.cs
diff --git a/templates/modpath_info.cs b/template/modpath_info.cs
similarity index 100%
rename from templates/modpath_info.cs
rename to template/modpath_info.cs
diff --git a/templates/nav.cs b/template/nav.cs
similarity index 100%
rename from templates/nav.cs
rename to template/nav.cs
diff --git a/templates/subscribers.cs b/template/subscribers.cs
similarity index 100%
rename from templates/subscribers.cs
rename to template/subscribers.cs
diff --git a/templates/textfile_edit.cs b/template/textfile_edit.cs
similarity index 100%
rename from templates/textfile_edit.cs
rename to template/textfile_edit.cs
diff --git a/templates/textfiles.cs b/template/textfiles.cs
similarity index 100%
rename from templates/textfiles.cs
rename to template/textfiles.cs
diff --git a/templates/ui/default/normal.hdf b/template/ui/default/normal.hdf
similarity index 100%
rename from templates/ui/default/normal.hdf
rename to template/ui/default/normal.hdf
diff --git a/templates/ui/gnupg/normal.hdf b/template/ui/gnupg/normal.hdf
similarity index 100%
rename from templates/ui/gnupg/normal.hdf
rename to template/ui/gnupg/normal.hdf