diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql b/installer/data/mysql/de-DE/mandatory/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql
rename to installer/data/mysql/de-DE/mandatory/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.txt b/installer/data/mysql/de-DE/mandatory/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/de-DE/optional/sample_notices_message_attributes.txt
rename to installer/data/mysql/de-DE/mandatory/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql b/installer/data/mysql/de-DE/mandatory/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql
rename to installer/data/mysql/de-DE/mandatory/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_transports.txt b/installer/data/mysql/de-DE/mandatory/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/de-DE/optional/sample_notices_message_transports.txt
rename to installer/data/mysql/de-DE/mandatory/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql b/installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/en/optional/sample_notices_message_attributes.sql
rename to installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.txt b/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/en/optional/sample_notices_message_attributes.txt
rename to installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/en/optional/sample_notices_message_transports.sql b/installer/data/mysql/en/mandatory/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/en/optional/sample_notices_message_transports.sql
rename to installer/data/mysql/en/mandatory/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/en/optional/sample_notices_message_transports.txt b/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/en/optional/sample_notices_message_transports.txt
rename to installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/es-ES/optional/sample_notices_message_attributes.sql b/installer/data/mysql/es-ES/mandatory/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/es-ES/optional/sample_notices_message_attributes.sql
rename to installer/data/mysql/es-ES/mandatory/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/es-ES/optional/sample_notices_message_attributes.txt b/installer/data/mysql/es-ES/mandatory/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/es-ES/optional/sample_notices_message_attributes.txt
rename to installer/data/mysql/es-ES/mandatory/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/es-ES/optional/sample_notices_message_transports.sql b/installer/data/mysql/es-ES/mandatory/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/es-ES/optional/sample_notices_message_transports.sql
rename to installer/data/mysql/es-ES/mandatory/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/es-ES/optional/sample_notices_message_transports.txt b/installer/data/mysql/es-ES/mandatory/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/es-ES/optional/sample_notices_message_transports.txt
rename to installer/data/mysql/es-ES/mandatory/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
rename to installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.txt b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.txt
rename to installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql
rename to installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.txt b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.txt
rename to installer/data/mysql/fr-FR/1-Obligatoire/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_attributes.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_attributes.sql
rename to installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_attributes.txt b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_attributes.txt
rename to installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_transports.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_transports.sql
rename to installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_transports.txt b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_transports.txt
rename to installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql
rename to installer/data/mysql/pl-PL/mandatory/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.txt b/installer/data/mysql/pl-PL/mandatory/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.txt
rename to installer/data/mysql/pl-PL/mandatory/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql
rename to installer/data/mysql/pl-PL/mandatory/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.txt b/installer/data/mysql/pl-PL/mandatory/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/pl-PL/optional/sample_notices_message_transports.txt
rename to installer/data/mysql/pl-PL/mandatory/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql
rename to installer/data/mysql/ru-RU/mandatory/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.txt b/installer/data/mysql/ru-RU/mandatory/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.txt
rename to installer/data/mysql/ru-RU/mandatory/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql
rename to installer/data/mysql/ru-RU/mandatory/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.txt b/installer/data/mysql/ru-RU/mandatory/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/ru-RU/optional/sample_notices_message_transports.txt
rename to installer/data/mysql/ru-RU/mandatory/sample_notices_message_transports.txt
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices_message_attributes.sql
similarity index 100%
rename from installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql
rename to installer/data/mysql/uk-UA/mandatory/sample_notices_message_attributes.sql
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.txt b/installer/data/mysql/uk-UA/mandatory/sample_notices_message_attributes.txt
similarity index 100%
rename from installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.txt
rename to installer/data/mysql/uk-UA/mandatory/sample_notices_message_attributes.txt
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices_message_transports.sql
similarity index 100%
rename from installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql
rename to installer/data/mysql/uk-UA/mandatory/sample_notices_message_transports.sql
diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.txt b/installer/data/mysql/uk-UA/mandatory/sample_notices_message_transports.txt
similarity index 100%
rename from installer/data/mysql/uk-UA/optional/sample_notices_message_transports.txt
rename to installer/data/mysql/uk-UA/mandatory/sample_notices_message_transports.txt