diff --git a/branding/templates/locales/html/de/faq.html b/branding/templates/locales/html/general/de/faq.html
similarity index 100%
rename from branding/templates/locales/html/de/faq.html
rename to branding/templates/locales/html/general/de/faq.html
diff --git a/branding/templates/locales/html/en/faq.html b/branding/templates/locales/html/general/en/faq.html
similarity index 100%
rename from branding/templates/locales/html/en/faq.html
rename to branding/templates/locales/html/general/en/faq.html
diff --git a/branding/templates/locales/html/de/code-of-conduct.html b/branding/templates/locales/html/hc-y2020/de/code-of-conduct.html
similarity index 100%
rename from branding/templates/locales/html/de/code-of-conduct.html
rename to branding/templates/locales/html/hc-y2020/de/code-of-conduct.html
diff --git a/branding/templates/locales/html/de/terms-and-conditions.html b/branding/templates/locales/html/hc-y2020/de/terms-and-conditions.html
similarity index 100%
rename from branding/templates/locales/html/de/terms-and-conditions.html
rename to branding/templates/locales/html/hc-y2020/de/terms-and-conditions.html
diff --git a/branding/templates/locales/html/en/code-of-conduct.html b/branding/templates/locales/html/hc-y2020/en/code-of-conduct.html
similarity index 100%
rename from branding/templates/locales/html/en/code-of-conduct.html
rename to branding/templates/locales/html/hc-y2020/en/code-of-conduct.html
diff --git a/branding/templates/locales/html/en/terms-and-conditions.html b/branding/templates/locales/html/hc-y2020/en/terms-and-conditions.html
similarity index 100%
rename from branding/templates/locales/html/en/terms-and-conditions.html
rename to branding/templates/locales/html/hc-y2020/en/terms-and-conditions.html