diff --git a/templates/activity/activity_detail.html b/apps/activity/templates/activity/activity_detail.html
similarity index 100%
rename from templates/activity/activity_detail.html
rename to apps/activity/templates/activity/activity_detail.html
diff --git a/templates/activity/activity_entry.html b/apps/activity/templates/activity/activity_entry.html
similarity index 100%
rename from templates/activity/activity_entry.html
rename to apps/activity/templates/activity/activity_entry.html
diff --git a/templates/activity/activity_form.html b/apps/activity/templates/activity/activity_form.html
similarity index 100%
rename from templates/activity/activity_form.html
rename to apps/activity/templates/activity/activity_form.html
diff --git a/templates/activity/activity_info.html b/apps/activity/templates/activity/activity_info.html
similarity index 100%
rename from templates/activity/activity_info.html
rename to apps/activity/templates/activity/activity_info.html
diff --git a/templates/activity/activity_invite.html b/apps/activity/templates/activity/activity_invite.html
similarity index 100%
rename from templates/activity/activity_invite.html
rename to apps/activity/templates/activity/activity_invite.html
diff --git a/templates/activity/activity_list.html b/apps/activity/templates/activity/activity_list.html
similarity index 100%
rename from templates/activity/activity_list.html
rename to apps/activity/templates/activity/activity_list.html
diff --git a/templates/member/add_members.html b/apps/member/templates/member/add_members.html
similarity index 100%
rename from templates/member/add_members.html
rename to apps/member/templates/member/add_members.html
diff --git a/templates/member/alias_update.html b/apps/member/templates/member/alias_update.html
similarity index 100%
rename from templates/member/alias_update.html
rename to apps/member/templates/member/alias_update.html
diff --git a/templates/member/autocomplete_model.html b/apps/member/templates/member/autocomplete_model.html
similarity index 100%
rename from templates/member/autocomplete_model.html
rename to apps/member/templates/member/autocomplete_model.html
diff --git a/templates/member/club_alias.html b/apps/member/templates/member/club_alias.html
similarity index 100%
rename from templates/member/club_alias.html
rename to apps/member/templates/member/club_alias.html
diff --git a/templates/member/club_detail.html b/apps/member/templates/member/club_detail.html
similarity index 100%
rename from templates/member/club_detail.html
rename to apps/member/templates/member/club_detail.html
diff --git a/templates/member/club_form.html b/apps/member/templates/member/club_form.html
similarity index 100%
rename from templates/member/club_form.html
rename to apps/member/templates/member/club_form.html
diff --git a/templates/member/club_info.html b/apps/member/templates/member/club_info.html
similarity index 100%
rename from templates/member/club_info.html
rename to apps/member/templates/member/club_info.html
diff --git a/templates/member/club_list.html b/apps/member/templates/member/club_list.html
similarity index 100%
rename from templates/member/club_list.html
rename to apps/member/templates/member/club_list.html
diff --git a/templates/member/club_members.html b/apps/member/templates/member/club_members.html
similarity index 100%
rename from templates/member/club_members.html
rename to apps/member/templates/member/club_members.html
diff --git a/templates/member/club_picture_update.html b/apps/member/templates/member/club_picture_update.html
similarity index 100%
rename from templates/member/club_picture_update.html
rename to apps/member/templates/member/club_picture_update.html
diff --git a/templates/member/club_tables.html b/apps/member/templates/member/club_tables.html
similarity index 100%
rename from templates/member/club_tables.html
rename to apps/member/templates/member/club_tables.html
diff --git a/templates/member/manage_auth_tokens.html b/apps/member/templates/member/manage_auth_tokens.html
similarity index 100%
rename from templates/member/manage_auth_tokens.html
rename to apps/member/templates/member/manage_auth_tokens.html
diff --git a/templates/member/noteowner_detail.html b/apps/member/templates/member/noteowner_detail.html
similarity index 100%
rename from templates/member/noteowner_detail.html
rename to apps/member/templates/member/noteowner_detail.html
diff --git a/templates/member/picture_update.html b/apps/member/templates/member/picture_update.html
similarity index 100%
rename from templates/member/picture_update.html
rename to apps/member/templates/member/picture_update.html
diff --git a/templates/member/profile_alias.html b/apps/member/templates/member/profile_alias.html
similarity index 100%
rename from templates/member/profile_alias.html
rename to apps/member/templates/member/profile_alias.html
diff --git a/templates/member/profile_detail.html b/apps/member/templates/member/profile_detail.html
similarity index 100%
rename from templates/member/profile_detail.html
rename to apps/member/templates/member/profile_detail.html
diff --git a/templates/member/profile_info.html b/apps/member/templates/member/profile_info.html
similarity index 100%
rename from templates/member/profile_info.html
rename to apps/member/templates/member/profile_info.html
diff --git a/templates/member/profile_picture_update.html b/apps/member/templates/member/profile_picture_update.html
similarity index 100%
rename from templates/member/profile_picture_update.html
rename to apps/member/templates/member/profile_picture_update.html
diff --git a/templates/member/profile_tables.html b/apps/member/templates/member/profile_tables.html
similarity index 100%
rename from templates/member/profile_tables.html
rename to apps/member/templates/member/profile_tables.html
diff --git a/templates/member/profile_update.html b/apps/member/templates/member/profile_update.html
similarity index 100%
rename from templates/member/profile_update.html
rename to apps/member/templates/member/profile_update.html
diff --git a/templates/member/user_list.html b/apps/member/templates/member/user_list.html
similarity index 100%
rename from templates/member/user_list.html
rename to apps/member/templates/member/user_list.html
diff --git a/templates/note/amount_input.html b/apps/note/templates/note/amount_input.html
similarity index 100%
rename from templates/note/amount_input.html
rename to apps/note/templates/note/amount_input.html
diff --git a/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html
similarity index 100%
rename from templates/note/conso_form.html
rename to apps/note/templates/note/conso_form.html
diff --git a/templates/note/mails/negative_balance.html b/apps/note/templates/note/mails/negative_balance.html
similarity index 100%
rename from templates/note/mails/negative_balance.html
rename to apps/note/templates/note/mails/negative_balance.html
diff --git a/templates/note/mails/negative_balance.txt b/apps/note/templates/note/mails/negative_balance.txt
similarity index 100%
rename from templates/note/mails/negative_balance.txt
rename to apps/note/templates/note/mails/negative_balance.txt
diff --git a/templates/note/mails/negative_notes_report.html b/apps/note/templates/note/mails/negative_notes_report.html
similarity index 100%
rename from templates/note/mails/negative_notes_report.html
rename to apps/note/templates/note/mails/negative_notes_report.html
diff --git a/templates/note/mails/negative_notes_report.txt b/apps/note/templates/note/mails/negative_notes_report.txt
similarity index 100%
rename from templates/note/mails/negative_notes_report.txt
rename to apps/note/templates/note/mails/negative_notes_report.txt
diff --git a/templates/note/mails/weekly_report.html b/apps/note/templates/note/mails/weekly_report.html
similarity index 100%
rename from templates/note/mails/weekly_report.html
rename to apps/note/templates/note/mails/weekly_report.html
diff --git a/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html
similarity index 100%
rename from templates/note/search_transactions.html
rename to apps/note/templates/note/search_transactions.html
diff --git a/templates/note/transaction_form.html b/apps/note/templates/note/transaction_form.html
similarity index 100%
rename from templates/note/transaction_form.html
rename to apps/note/templates/note/transaction_form.html
diff --git a/templates/note/transactiontemplate_form.html b/apps/note/templates/note/transactiontemplate_form.html
similarity index 100%
rename from templates/note/transactiontemplate_form.html
rename to apps/note/templates/note/transactiontemplate_form.html
diff --git a/templates/note/transactiontemplate_list.html b/apps/note/templates/note/transactiontemplate_list.html
similarity index 100%
rename from templates/note/transactiontemplate_list.html
rename to apps/note/templates/note/transactiontemplate_list.html
diff --git a/templates/permission/all_rights.html b/apps/permission/templates/permission/all_rights.html
similarity index 100%
rename from templates/permission/all_rights.html
rename to apps/permission/templates/permission/all_rights.html
diff --git a/templates/registration/email_validation_complete.html b/apps/registration/templates/registration/email_validation_complete.html
similarity index 100%
rename from templates/registration/email_validation_complete.html
rename to apps/registration/templates/registration/email_validation_complete.html
diff --git a/templates/registration/email_validation_email_sent.html b/apps/registration/templates/registration/email_validation_email_sent.html
similarity index 100%
rename from templates/registration/email_validation_email_sent.html
rename to apps/registration/templates/registration/email_validation_email_sent.html
diff --git a/templates/registration/future_profile_detail.html b/apps/registration/templates/registration/future_profile_detail.html
similarity index 100%
rename from templates/registration/future_profile_detail.html
rename to apps/registration/templates/registration/future_profile_detail.html
diff --git a/templates/registration/future_user_list.html b/apps/registration/templates/registration/future_user_list.html
similarity index 100%
rename from templates/registration/future_user_list.html
rename to apps/registration/templates/registration/future_user_list.html
diff --git a/templates/registration/logged_out.html b/apps/registration/templates/registration/logged_out.html
similarity index 100%
rename from templates/registration/logged_out.html
rename to apps/registration/templates/registration/logged_out.html
diff --git a/templates/registration/login.html b/apps/registration/templates/registration/login.html
similarity index 100%
rename from templates/registration/login.html
rename to apps/registration/templates/registration/login.html
diff --git a/templates/registration/mails/email_validation_email.html b/apps/registration/templates/registration/mails/email_validation_email.html
similarity index 100%
rename from templates/registration/mails/email_validation_email.html
rename to apps/registration/templates/registration/mails/email_validation_email.html
diff --git a/templates/registration/mails/email_validation_email.txt b/apps/registration/templates/registration/mails/email_validation_email.txt
similarity index 100%
rename from templates/registration/mails/email_validation_email.txt
rename to apps/registration/templates/registration/mails/email_validation_email.txt
diff --git a/templates/registration/password_change_done.html b/apps/registration/templates/registration/password_change_done.html
similarity index 100%
rename from templates/registration/password_change_done.html
rename to apps/registration/templates/registration/password_change_done.html
diff --git a/templates/registration/password_change_form.html b/apps/registration/templates/registration/password_change_form.html
similarity index 100%
rename from templates/registration/password_change_form.html
rename to apps/registration/templates/registration/password_change_form.html
diff --git a/templates/registration/password_reset_complete.html b/apps/registration/templates/registration/password_reset_complete.html
similarity index 100%
rename from templates/registration/password_reset_complete.html
rename to apps/registration/templates/registration/password_reset_complete.html
diff --git a/templates/registration/password_reset_confirm.html b/apps/registration/templates/registration/password_reset_confirm.html
similarity index 100%
rename from templates/registration/password_reset_confirm.html
rename to apps/registration/templates/registration/password_reset_confirm.html
diff --git a/templates/registration/password_reset_done.html b/apps/registration/templates/registration/password_reset_done.html
similarity index 100%
rename from templates/registration/password_reset_done.html
rename to apps/registration/templates/registration/password_reset_done.html
diff --git a/templates/registration/password_reset_form.html b/apps/registration/templates/registration/password_reset_form.html
similarity index 100%
rename from templates/registration/password_reset_form.html
rename to apps/registration/templates/registration/password_reset_form.html
diff --git a/templates/registration/signup.html b/apps/registration/templates/registration/signup.html
similarity index 100%
rename from templates/registration/signup.html
rename to apps/registration/templates/registration/signup.html
diff --git a/templates/treasury/invoice_confirm_delete.html b/apps/treasury/templates/treasury/invoice_confirm_delete.html
similarity index 100%
rename from templates/treasury/invoice_confirm_delete.html
rename to apps/treasury/templates/treasury/invoice_confirm_delete.html
diff --git a/templates/treasury/invoice_form.html b/apps/treasury/templates/treasury/invoice_form.html
similarity index 100%
rename from templates/treasury/invoice_form.html
rename to apps/treasury/templates/treasury/invoice_form.html
diff --git a/templates/treasury/invoice_list.html b/apps/treasury/templates/treasury/invoice_list.html
similarity index 100%
rename from templates/treasury/invoice_list.html
rename to apps/treasury/templates/treasury/invoice_list.html
diff --git a/templates/treasury/invoice_sample.tex b/apps/treasury/templates/treasury/invoice_sample.tex
similarity index 100%
rename from templates/treasury/invoice_sample.tex
rename to apps/treasury/templates/treasury/invoice_sample.tex
diff --git a/templates/treasury/remittance_form.html b/apps/treasury/templates/treasury/remittance_form.html
similarity index 100%
rename from templates/treasury/remittance_form.html
rename to apps/treasury/templates/treasury/remittance_form.html
diff --git a/templates/treasury/remittance_list.html b/apps/treasury/templates/treasury/remittance_list.html
similarity index 100%
rename from templates/treasury/remittance_list.html
rename to apps/treasury/templates/treasury/remittance_list.html
diff --git a/templates/treasury/sogecredit_detail.html b/apps/treasury/templates/treasury/sogecredit_detail.html
similarity index 100%
rename from templates/treasury/sogecredit_detail.html
rename to apps/treasury/templates/treasury/sogecredit_detail.html
diff --git a/templates/treasury/sogecredit_list.html b/apps/treasury/templates/treasury/sogecredit_list.html
similarity index 100%
rename from templates/treasury/sogecredit_list.html
rename to apps/treasury/templates/treasury/sogecredit_list.html
diff --git a/templates/treasury/specialtransactionproxy_form.html b/apps/treasury/templates/treasury/specialtransactionproxy_form.html
similarity index 100%
rename from templates/treasury/specialtransactionproxy_form.html
rename to apps/treasury/templates/treasury/specialtransactionproxy_form.html
diff --git a/templates/wei/bus_detail.html b/apps/wei/templates/wei/bus_detail.html
similarity index 100%
rename from templates/wei/bus_detail.html
rename to apps/wei/templates/wei/bus_detail.html
diff --git a/templates/wei/bus_form.html b/apps/wei/templates/wei/bus_form.html
similarity index 100%
rename from templates/wei/bus_form.html
rename to apps/wei/templates/wei/bus_form.html
diff --git a/templates/wei/bus_tables.html b/apps/wei/templates/wei/bus_tables.html
similarity index 100%
rename from templates/wei/bus_tables.html
rename to apps/wei/templates/wei/bus_tables.html
diff --git a/templates/wei/busteam_detail.html b/apps/wei/templates/wei/busteam_detail.html
similarity index 100%
rename from templates/wei/busteam_detail.html
rename to apps/wei/templates/wei/busteam_detail.html
diff --git a/templates/wei/busteam_form.html b/apps/wei/templates/wei/busteam_form.html
similarity index 100%
rename from templates/wei/busteam_form.html
rename to apps/wei/templates/wei/busteam_form.html
diff --git a/templates/wei/busteam_tables.html b/apps/wei/templates/wei/busteam_tables.html
similarity index 100%
rename from templates/wei/busteam_tables.html
rename to apps/wei/templates/wei/busteam_tables.html
diff --git a/templates/wei/survey.html b/apps/wei/templates/wei/survey.html
similarity index 100%
rename from templates/wei/survey.html
rename to apps/wei/templates/wei/survey.html
diff --git a/templates/wei/survey_closed.html b/apps/wei/templates/wei/survey_closed.html
similarity index 100%
rename from templates/wei/survey_closed.html
rename to apps/wei/templates/wei/survey_closed.html
diff --git a/templates/wei/survey_end.html b/apps/wei/templates/wei/survey_end.html
similarity index 100%
rename from templates/wei/survey_end.html
rename to apps/wei/templates/wei/survey_end.html
diff --git a/templates/wei/weiclub_detail.html b/apps/wei/templates/wei/weiclub_detail.html
similarity index 100%
rename from templates/wei/weiclub_detail.html
rename to apps/wei/templates/wei/weiclub_detail.html
diff --git a/templates/wei/weiclub_form.html b/apps/wei/templates/wei/weiclub_form.html
similarity index 100%
rename from templates/wei/weiclub_form.html
rename to apps/wei/templates/wei/weiclub_form.html
diff --git a/templates/wei/weiclub_info.html b/apps/wei/templates/wei/weiclub_info.html
similarity index 100%
rename from templates/wei/weiclub_info.html
rename to apps/wei/templates/wei/weiclub_info.html
diff --git a/templates/wei/weiclub_list.html b/apps/wei/templates/wei/weiclub_list.html
similarity index 100%
rename from templates/wei/weiclub_list.html
rename to apps/wei/templates/wei/weiclub_list.html
diff --git a/templates/wei/weiclub_tables.html b/apps/wei/templates/wei/weiclub_tables.html
similarity index 100%
rename from templates/wei/weiclub_tables.html
rename to apps/wei/templates/wei/weiclub_tables.html
diff --git a/templates/wei/weilist_sample.tex b/apps/wei/templates/wei/weilist_sample.tex
similarity index 100%
rename from templates/wei/weilist_sample.tex
rename to apps/wei/templates/wei/weilist_sample.tex
diff --git a/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html
similarity index 100%
rename from templates/wei/weimembership_form.html
rename to apps/wei/templates/wei/weimembership_form.html
diff --git a/templates/wei/weimembership_list.html b/apps/wei/templates/wei/weimembership_list.html
similarity index 100%
rename from templates/wei/weimembership_list.html
rename to apps/wei/templates/wei/weimembership_list.html
diff --git a/templates/wei/weiregistration_confirm_delete.html b/apps/wei/templates/wei/weiregistration_confirm_delete.html
similarity index 100%
rename from templates/wei/weiregistration_confirm_delete.html
rename to apps/wei/templates/wei/weiregistration_confirm_delete.html
diff --git a/templates/wei/weiregistration_form.html b/apps/wei/templates/wei/weiregistration_form.html
similarity index 100%
rename from templates/wei/weiregistration_form.html
rename to apps/wei/templates/wei/weiregistration_form.html
diff --git a/templates/wei/weiregistration_list.html b/apps/wei/templates/wei/weiregistration_list.html
similarity index 100%
rename from templates/wei/weiregistration_list.html
rename to apps/wei/templates/wei/weiregistration_list.html
diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py
index 809cd91c..79c4f9ef 100644
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@@ -82,7 +82,7 @@ ROOT_URLCONF = 'note_kfet.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join(BASE_DIR, 'templates')],
+ 'DIRS': [os.path.join(BASE_DIR, 'note_kfet/templates')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
diff --git a/templates/400.html b/note_kfet/templates/400.html
similarity index 100%
rename from templates/400.html
rename to note_kfet/templates/400.html
diff --git a/templates/403.html b/note_kfet/templates/403.html
similarity index 100%
rename from templates/403.html
rename to note_kfet/templates/403.html
diff --git a/templates/404.html b/note_kfet/templates/404.html
similarity index 100%
rename from templates/404.html
rename to note_kfet/templates/404.html
diff --git a/templates/500.html b/note_kfet/templates/500.html
similarity index 100%
rename from templates/500.html
rename to note_kfet/templates/500.html
diff --git a/templates/base.html b/note_kfet/templates/base.html
similarity index 100%
rename from templates/base.html
rename to note_kfet/templates/base.html
diff --git a/templates/cas_server/base.html b/note_kfet/templates/cas_server/base.html
similarity index 100%
rename from templates/cas_server/base.html
rename to note_kfet/templates/cas_server/base.html
diff --git a/templates/scripts/mail-error500.html b/note_kfet/templates/scripts/mail-error500.html
similarity index 100%
rename from templates/scripts/mail-error500.html
rename to note_kfet/templates/scripts/mail-error500.html
diff --git a/templates/scripts/mail-error500.txt b/note_kfet/templates/scripts/mail-error500.txt
similarity index 100%
rename from templates/scripts/mail-error500.txt
rename to note_kfet/templates/scripts/mail-error500.txt
diff --git a/templates/bootstrap_datepicker_plus/date_picker.html b/templates/bootstrap_datepicker_plus/date_picker.html
deleted file mode 100644
index 67a11df1..00000000
--- a/templates/bootstrap_datepicker_plus/date_picker.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- {% include "bootstrap_datepicker_plus/input.html" %}
-
-
-
-
diff --git a/templates/bootstrap_datepicker_plus/input.html b/templates/bootstrap_datepicker_plus/input.html
deleted file mode 100644
index b2f8c403..00000000
--- a/templates/bootstrap_datepicker_plus/input.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/templates/bootstrap_datepicker_plus/time_picker.html b/templates/bootstrap_datepicker_plus/time_picker.html
deleted file mode 100644
index 2bd509a3..00000000
--- a/templates/bootstrap_datepicker_plus/time_picker.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- {% include "bootstrap_datepicker_plus/input.html" %}
-