diff --git a/orga/yakform_call_trainer_r.txt b/orga/form/yakform_call_trainer_r.txt
similarity index 100%
rename from orga/yakform_call_trainer_r.txt
rename to orga/form/yakform_call_trainer_r.txt
diff --git a/orga/yakform_registration_r.txt b/orga/form/yakform_registration_r.txt
similarity index 100%
rename from orga/yakform_registration_r.txt
rename to orga/form/yakform_registration_r.txt
diff --git a/orga/1_mail.txt b/orga/mail/deprecated/1_mail.txt
similarity index 100%
rename from orga/1_mail.txt
rename to orga/mail/deprecated/1_mail.txt
diff --git a/orga/2_mail.txt b/orga/mail/deprecated/2_mail.txt
similarity index 100%
rename from orga/2_mail.txt
rename to orga/mail/deprecated/2_mail.txt
diff --git a/orga/3_mail.txt b/orga/mail/deprecated/3_mail.txt
similarity index 100%
rename from orga/3_mail.txt
rename to orga/mail/deprecated/3_mail.txt
diff --git a/orga/mail_call_trainer.txt b/orga/mail/mail_call_trainer.txt
similarity index 100%
rename from orga/mail_call_trainer.txt
rename to orga/mail/mail_call_trainer.txt
diff --git a/orga/mail_registration.txt b/orga/mail/mail_registration.txt
similarity index 100%
rename from orga/mail_registration.txt
rename to orga/mail/mail_registration.txt