diff --git a/translationfiles/dav/de@informal.po b/apps/dav/translationfiles/de@informal/dav.po
similarity index 100%
rename from translationfiles/dav/de@informal.po
rename to apps/dav/translationfiles/de@informal/dav.po
diff --git a/translationfiles/dav/de_DE.po b/apps/dav/translationfiles/de_DE/dav.po
similarity index 100%
rename from translationfiles/dav/de_DE.po
rename to apps/dav/translationfiles/de_DE/dav.po
diff --git a/translationfiles/dav/en.po b/apps/dav/translationfiles/en/dav.po
similarity index 100%
rename from translationfiles/dav/en.po
rename to apps/dav/translationfiles/en/dav.po
diff --git a/translationfiles/dav/es.po b/apps/dav/translationfiles/es/dav.po
similarity index 100%
rename from translationfiles/dav/es.po
rename to apps/dav/translationfiles/es/dav.po
diff --git a/translationfiles/dav/fr.po b/apps/dav/translationfiles/fr/dav.po
similarity index 100%
rename from translationfiles/dav/fr.po
rename to apps/dav/translationfiles/fr/dav.po
diff --git a/translationfiles/dav/it.po b/apps/dav/translationfiles/it/dav.po
similarity index 100%
rename from translationfiles/dav/it.po
rename to apps/dav/translationfiles/it/dav.po
diff --git a/translationfiles/dav/en.pot b/apps/dav/translationfiles/templates/dav.pot
similarity index 100%
rename from translationfiles/dav/en.pot
rename to apps/dav/translationfiles/templates/dav.pot
diff --git a/translationfiles/files/de.po b/apps/files/translationfiles/de/files.po
similarity index 100%
rename from translationfiles/files/de.po
rename to apps/files/translationfiles/de/files.po
diff --git a/translationfiles/files/en.po b/apps/files/translationfiles/en/files.po
similarity index 100%
rename from translationfiles/files/en.po
rename to apps/files/translationfiles/en/files.po
diff --git a/translationfiles/files/es.po b/apps/files/translationfiles/es/files.po
similarity index 100%
rename from translationfiles/files/es.po
rename to apps/files/translationfiles/es/files.po
diff --git a/translationfiles/files/fr.po b/apps/files/translationfiles/fr/files.po
similarity index 100%
rename from translationfiles/files/fr.po
rename to apps/files/translationfiles/fr/files.po
diff --git a/translationfiles/files/it.po b/apps/files/translationfiles/it/files.po
similarity index 100%
rename from translationfiles/files/it.po
rename to apps/files/translationfiles/it/files.po
diff --git a/translationfiles/files/en.pot b/apps/files/translationfiles/templates/files.pot
similarity index 100%
rename from translationfiles/files/en.pot
rename to apps/files/translationfiles/templates/files.pot
diff --git a/translationfiles/files_trashbin/de.po b/apps/files_trashbin/translationfiles/de/files_trashbin.po
similarity index 100%
rename from translationfiles/files_trashbin/de.po
rename to apps/files_trashbin/translationfiles/de/files_trashbin.po
diff --git a/translationfiles/files_trashbin/en.po b/apps/files_trashbin/translationfiles/en/files_trashbin.po
similarity index 100%
rename from translationfiles/files_trashbin/en.po
rename to apps/files_trashbin/translationfiles/en/files_trashbin.po
diff --git a/translationfiles/files_trashbin/es.po b/apps/files_trashbin/translationfiles/es/files_trashbin.po
similarity index 100%
rename from translationfiles/files_trashbin/es.po
rename to apps/files_trashbin/translationfiles/es/files_trashbin.po
diff --git a/translationfiles/files_trashbin/fr.po b/apps/files_trashbin/translationfiles/fr/files_trashbin.po
similarity index 100%
rename from translationfiles/files_trashbin/fr.po
rename to apps/files_trashbin/translationfiles/fr/files_trashbin.po
diff --git a/translationfiles/files_trashbin/it.po b/apps/files_trashbin/translationfiles/it/files_trashbin.po
similarity index 100%
rename from translationfiles/files_trashbin/it.po
rename to apps/files_trashbin/translationfiles/it/files_trashbin.po
diff --git a/translationfiles/files_trashbin/en.pot b/apps/files_trashbin/translationfiles/templates/files_trashbin.pot
similarity index 100%
rename from translationfiles/files_trashbin/en.pot
rename to apps/files_trashbin/translationfiles/templates/files_trashbin.pot
diff --git a/translationfiles/privacy/de@informal.po b/apps/privacy/translationfiles/de@informal/privacy.po
similarity index 100%
rename from translationfiles/privacy/de@informal.po
rename to apps/privacy/translationfiles/de@informal/privacy.po
diff --git a/translationfiles/privacy/de_DE.po b/apps/privacy/translationfiles/de_DE/privacy.po
similarity index 100%
rename from translationfiles/privacy/de_DE.po
rename to apps/privacy/translationfiles/de_DE/privacy.po
diff --git a/translationfiles/privacy/en.po b/apps/privacy/translationfiles/en/privacy.po
similarity index 100%
rename from translationfiles/privacy/en.po
rename to apps/privacy/translationfiles/en/privacy.po
diff --git a/translationfiles/privacy/es.po b/apps/privacy/translationfiles/es/privacy.po
similarity index 100%
rename from translationfiles/privacy/es.po
rename to apps/privacy/translationfiles/es/privacy.po
diff --git a/translationfiles/privacy/fr.po b/apps/privacy/translationfiles/fr/privacy.po
similarity index 100%
rename from translationfiles/privacy/fr.po
rename to apps/privacy/translationfiles/fr/privacy.po
diff --git a/translationfiles/privacy/it.po b/apps/privacy/translationfiles/it/privacy.po
similarity index 100%
rename from translationfiles/privacy/it.po
rename to apps/privacy/translationfiles/it/privacy.po
diff --git a/translationfiles/privacy/en.pot b/apps/privacy/translationfiles/templates/privacy.pot
similarity index 100%
rename from translationfiles/privacy/en.pot
rename to apps/privacy/translationfiles/templates/privacy.pot
diff --git a/translationfiles/settings/de@informal.po b/apps/settings/translationfiles/de@informal/settings.po
similarity index 100%
rename from translationfiles/settings/de@informal.po
rename to apps/settings/translationfiles/de@informal/settings.po
diff --git a/translationfiles/settings/de_DE.po b/apps/settings/translationfiles/de_DE/settings.po
similarity index 100%
rename from translationfiles/settings/de_DE.po
rename to apps/settings/translationfiles/de_DE/settings.po
diff --git a/translationfiles/settings/en.po b/apps/settings/translationfiles/en/settings.po
similarity index 100%
rename from translationfiles/settings/en.po
rename to apps/settings/translationfiles/en/settings.po
diff --git a/translationfiles/settings/es.po b/apps/settings/translationfiles/es/settings.po
similarity index 100%
rename from translationfiles/settings/es.po
rename to apps/settings/translationfiles/es/settings.po
diff --git a/translationfiles/settings/fr.po b/apps/settings/translationfiles/fr/settings.po
similarity index 100%
rename from translationfiles/settings/fr.po
rename to apps/settings/translationfiles/fr/settings.po
diff --git a/translationfiles/settings/it.po b/apps/settings/translationfiles/it/settings.po
similarity index 100%
rename from translationfiles/settings/it.po
rename to apps/settings/translationfiles/it/settings.po
diff --git a/translationfiles/settings/en.pot b/apps/settings/translationfiles/templates/settings.pot
similarity index 100%
rename from translationfiles/settings/en.pot
rename to apps/settings/translationfiles/templates/settings.pot
diff --git a/translationfiles/user_ldap/de.po b/apps/user_ldap/translationfiles/de/user_ldap.po
similarity index 100%
rename from translationfiles/user_ldap/de.po
rename to apps/user_ldap/translationfiles/de/user_ldap.po
diff --git a/translationfiles/user_ldap/en.po b/apps/user_ldap/translationfiles/en/user_ldap.po
similarity index 100%
rename from translationfiles/user_ldap/en.po
rename to apps/user_ldap/translationfiles/en/user_ldap.po
diff --git a/translationfiles/user_ldap/es.po b/apps/user_ldap/translationfiles/es/user_ldap.po
similarity index 100%
rename from translationfiles/user_ldap/es.po
rename to apps/user_ldap/translationfiles/es/user_ldap.po
diff --git a/translationfiles/user_ldap/fr.po b/apps/user_ldap/translationfiles/fr/user_ldap.po
similarity index 100%
rename from translationfiles/user_ldap/fr.po
rename to apps/user_ldap/translationfiles/fr/user_ldap.po
diff --git a/translationfiles/user_ldap/it.po b/apps/user_ldap/translationfiles/it/user_ldap.po
similarity index 100%
rename from translationfiles/user_ldap/it.po
rename to apps/user_ldap/translationfiles/it/user_ldap.po
diff --git a/translationfiles/user_ldap/en.pot b/apps/user_ldap/translationfiles/templates/user_ldap.pot
similarity index 100%
rename from translationfiles/user_ldap/en.pot
rename to apps/user_ldap/translationfiles/templates/user_ldap.pot
diff --git a/translationfiles/core/de.po b/core/translationfiles/de/core.po
similarity index 100%
rename from translationfiles/core/de.po
rename to core/translationfiles/de/core.po
diff --git a/translationfiles/core/en.po b/core/translationfiles/en/core.po
similarity index 100%
rename from translationfiles/core/en.po
rename to core/translationfiles/en/core.po
diff --git a/translationfiles/core/es.po b/core/translationfiles/es/core.po
similarity index 100%
rename from translationfiles/core/es.po
rename to core/translationfiles/es/core.po
diff --git a/translationfiles/core/fr.po b/core/translationfiles/fr/core.po
similarity index 100%
rename from translationfiles/core/fr.po
rename to core/translationfiles/fr/core.po
diff --git a/translationfiles/core/it.po b/core/translationfiles/it/core.po
similarity index 100%
rename from translationfiles/core/it.po
rename to core/translationfiles/it/core.po
diff --git a/translationfiles/core/en.pot b/core/translationfiles/templates/core.pot
similarity index 100%
rename from translationfiles/core/en.pot
rename to core/translationfiles/templates/core.pot