38 files changed, 345 insertions, 391 deletions
diff --git a/extras/AllLangZip_accessoriessamples.mk b/extras/AllLangPackage_accessoriessamples.mk
index 077c25c8b74d..29a89ce2d2b6 100644
--- a/extras/AllLangZip_accessoriessamples.mk
+++ b/extras/AllLangPackage_accessoriessamples.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamples,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamples,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamples,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamples,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamples,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriessamples,share/samples,\
 	cs/.nametranslation.table \
 	de/.nametranslation.table \
 	en-US/JacketPotato.odb \
diff --git a/extras/AllLangZip_accessoriessamplesadvertisement.mk b/extras/AllLangPackage_accessoriessamplesadvertisement.mk
index eaea20507f35..363f15498313 100644
--- a/extras/AllLangZip_accessoriessamplesadvertisement.mk
+++ b/extras/AllLangPackage_accessoriessamplesadvertisement.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/advertisement/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/advertisement/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesadvertisement,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesadvertisement,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesadvertisement,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesadvertisement,share/samples,Advertisement,\
 	cs/dummy_samples.txt \
 	de/dummy_samples.txt \
 	en-US/ooo2prodflyera3en.odt \
diff --git a/extras/AllLangZip_accessoriessamplesdocumentation.mk b/extras/AllLangPackage_accessoriessamplesdocumentation.mk
index 540ab170dc47..fb903daced15 100644
--- a/extras/AllLangZip_accessoriessamplesdocumentation.mk
+++ b/extras/AllLangPackage_accessoriessamplesdocumentation.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesdocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/documentation/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesdocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/documentation/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesdocumentation,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesdocumentation,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesdocumentation,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesdocumentation,share/samples,Documentations,\
 	cs/dummy_samples.txt \
 	de/dummy_samples.txt \
 	en-US/Connect_to_Postgres.odt \
diff --git a/extras/AllLangZip_accessoriessamplesnonfree.mk b/extras/AllLangPackage_accessoriessamplesnonfree.mk
index 6d1f2d451392..9fcfa2d5b9e1 100644
--- a/extras/AllLangZip_accessoriessamplesnonfree.mk
+++ b/extras/AllLangPackage_accessoriessamplesnonfree.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfree,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfree,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfree,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfree,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfree,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriessamplesnonfree,share/samples,\
 	cs/dummy_samples-nonfree.txt \
 	de/dummy_samples-nonfree.txt \
 	en-US/dummy_samples-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriessamplesnonfreedocumentation.mk b/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
index c5761a56763c..b33ec0082296 100644
--- a/extras/AllLangZip_accessoriessamplesnonfreedocumentation.mk
+++ b/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfreedocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/documentation/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfreeadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/advertisement/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfreedocumentation,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfreeadvertisement,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfreedocumentation,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesnonfreeadvertisement,share/samples,Advertisement,\
 	cs/dummy_samples-nonfree.txt \
 	de/dummy_samples-nonfree.txt \
 	en-US/dummy_samples-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk b/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
index 448b42bb92c4..0b44b09f2ea6 100644
--- a/extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk
+++ b/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfreeadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/advertisement/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfreedocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/documentation/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfreeadvertisement,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfreedocumentation,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfreeadvertisement,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesnonfreedocumentation,share/samples,Documentations,\
 	cs/dummy_samples-nonfree.txt \
 	de/dummy_samples-nonfree.txt \
 	en-US/dummy_samples-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplates.mk b/extras/AllLangPackage_accessoriestemplates.mk
index 4d36d4db4740..b544838ab231 100644
--- a/extras/AllLangZip_accessoriestemplates.mk
+++ b/extras/AllLangPackage_accessoriestemplates.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplates,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplates,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplates,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplates,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplates,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,share/template,\
 	cs/dummy_templates.txt \
 	de/dummy_templates.txt \
 	en-US/dummy_templates.txt \
diff --git a/extras/AllLangZip_accessoriestemplateseducate.mk b/extras/AllLangPackage_accessoriestemplateseducate.mk
index 31571da0e54a..ac6ed6031af7 100644
--- a/extras/AllLangZip_accessoriestemplateseducate.mk
+++ b/extras/AllLangPackage_accessoriestemplateseducate.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplateseducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/educate/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateseducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/educate/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplateseducate,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateseducate,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplateseducate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,share/template,educate,\
 	cs/dummy_templates.txt \
 	de/Jahres_Schulnoten.ots \
 	de/Klassen-Schulnoten-Verwaltung_Noten_1-6.ots \
diff --git a/extras/AllLangZip_accessoriestemplatesfinance.mk b/extras/AllLangPackage_accessoriestemplatesfinance.mk
index 30a39d8ff889..7a41b74c903c 100644
--- a/extras/AllLangZip_accessoriestemplatesfinance.mk
+++ b/extras/AllLangPackage_accessoriestemplatesfinance.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesfinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/finance/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesfinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/finance/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesfinance,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesfinance,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesfinance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,share/template,finance,\
 	cs/podaci_kniha.ots \
 	de/arbeitszeiterfassung.ots \
 	de/az.ots \
diff --git a/extras/AllLangZip_accessoriestemplatesforms.mk b/extras/AllLangPackage_accessoriestemplatesforms.mk
index 3e6534dfa84e..0ca6da98e5a4 100644
--- a/extras/AllLangZip_accessoriestemplatesforms.mk
+++ b/extras/AllLangPackage_accessoriestemplatesforms.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/forms/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/forms/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesforms,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesforms,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesforms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,share/template,forms,\
 	cs/seznam_pohledavek.ots \
 	de/Ausbildungsnachweis2.ott \
 	de/Ausbildungsnachweis.ott \
diff --git a/extras/AllLangZip_accessoriestemplateslabels.mk b/extras/AllLangPackage_accessoriestemplateslabels.mk
index 882ddafdc9e2..5f761c3c1a32 100644
--- a/extras/AllLangZip_accessoriestemplateslabels.mk
+++ b/extras/AllLangPackage_accessoriestemplateslabels.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplateslabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/labels/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/labels/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplateslabels,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslabels,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplateslabels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,share/template,labels,\
 	cs/dummy_templates.txt \
 	de/dummy_templates.txt \
 	en-US/address12-WL-OL875.ott \
diff --git a/extras/AllLangZip_accessoriestemplateslayout.mk b/extras/AllLangPackage_accessoriestemplateslayout.mk
index 602c220ef800..c83013897b48 100644
--- a/extras/AllLangZip_accessoriestemplateslayout.mk
+++ b/extras/AllLangPackage_accessoriestemplateslayout.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplateslayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/layout/lang,$(true)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/layout/lang,$(true)))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplateslayout,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslayout,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplateslayout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,share/template,layout,\
 	cs/dummy_templates.txt \
 	de/A4-kariert.otp \
 	de/BlueBoxes.otp \
diff --git a/extras/AllLangZip_accessoriestemplatesmisc.mk b/extras/AllLangPackage_accessoriestemplatesmisc.mk
index 26bfe48cb598..905b5b30ab3f 100644
--- a/extras/AllLangZip_accessoriestemplatesmisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesmisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesmisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/misc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesmisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/misc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesmisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesmisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesmisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesmisc,share/template,misc,\
 	cs/dummy_templates.txt \
 	de/01_event_poster.otg \
 	de/02_event_poster.otg \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfree.mk b/extras/AllLangPackage_accessoriestemplatesnonfree.mk
index 5b1203140950..23641ebb0bcc 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfree.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfree.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfree,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfree,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfree,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfree,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfree,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplatesnonfree,share/template,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeeducate.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
index e2a62a2f7545..1a7134f97886 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeeducate.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeeducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/educate/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeeducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/educate/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeeducate,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeeducate,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeeducate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeeducate,share/template,educate,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/attendance_sheet.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreefinance.mk b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
index 671c1b866925..7b848d4a0a4e 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreefinance.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreefinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/finance/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreefinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/finance/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreefinance,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreefinance,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreefinance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreefinance,share/template,finance,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/24_Month_Sales_Forecast.ots \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeforms.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
index 67c88054d264..673b0281e80a 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeforms.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/forms/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/forms/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeforms,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeforms,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeforms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeforms,share/template,forms,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreelabels.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
index 9eeeb5a72888..1242cc8dbf94 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreelabels.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreelabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/labels/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/labels/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreelabels,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelabels,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreelabels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelabels,share/template,labels,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
new file mode 100644
index 000000000000..2aaa5047a026
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/layout/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelayout,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelayout,share/template,layout,\
+	cs/dummy_templates-nonfree.txt \
+	de/dummy_templates-nonfree.txt \
+	en-US/dummy_templates-nonfree.txt \
+	es/dummy_templates-nonfree.txt \
+	fi/dummy_templates-nonfree.txt \
+	fr/dummy_templates-nonfree.txt \
+	hu/dummy_templates-nonfree.txt \
+	it/dummy_templates-nonfree.txt \
+	ja/dummy_templates-nonfree.txt \
+	ka/dummy_templates-nonfree.txt \
+	nl/dummy_templates-nonfree.txt \
+	pl/dummy_templates-nonfree.txt \
+	pt-BR/dummy_templates-nonfree.txt \
+	sv/dummy_templates-nonfree.txt \
+	tr/dummy_templates-nonfree.txt \
+	zh-CN/dummy_templates-nonfree.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreemisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
index 17c7677caf6b..e2dd51d051d0 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreemisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreemisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/misc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreemisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/misc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreemisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreemisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreemisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreemisc,share/template,misc,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/achievement_1.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeofficorr.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
index be9d48b68638..184d515f5333 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeofficorr.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/officorr/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/officorr/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeofficorr,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeofficorr,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeofficorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeofficorr,share/template,officorr,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
index 1e9f1228f67b..8a78d3c7a023 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeoffimisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/offimisc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/offimisc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeoffimisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeoffimisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeoffimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeoffimisc,share/template,offimisc,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/report_1.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreepersonal.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
index 058b5c63b5e4..4b16caadb92d 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreepersonal.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreepersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/personal/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreepersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/personal/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreepersonal,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepersonal,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreepersonal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepersonal,share/template,personal,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/resume_1.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreelayout.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
index d85fc515d3cb..b7404ffd6419 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreelayout.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreelayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/layout/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreepresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/presnt/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreelayout,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepresent,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreelayout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepresent,share/template,presnt,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesofficorr.mk b/extras/AllLangPackage_accessoriestemplatesofficorr.mk
index 249ad9a92a11..7dba3554df52 100644
--- a/extras/AllLangZip_accessoriestemplatesofficorr.mk
+++ b/extras/AllLangPackage_accessoriestemplatesofficorr.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/officorr/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/officorr/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesofficorr,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesofficorr,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesofficorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesofficorr,share/template,officorr,\
 	cs/dummy_templates.txt \
 	de/01_business_fax.ott \
 	de/01_business_letter.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
index b3f31a32d225..ee36ecdeed68 100644
--- a/extras/AllLangZip_accessoriestemplatesoffimisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/offimisc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/offimisc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesoffimisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesoffimisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesoffimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesoffimisc,share/template,offimisc,\
 	cs/dummy_templates.txt \
 	de/01_graph_paper.ott \
 	de/01_invoice.ott \
diff --git a/extras/AllLangZip_accessoriestemplatespersonal.mk b/extras/AllLangPackage_accessoriestemplatespersonal.mk
index 600901401ade..ce20cc824ac2 100644
--- a/extras/AllLangZip_accessoriestemplatespersonal.mk
+++ b/extras/AllLangPackage_accessoriestemplatespersonal.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatespersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/personal/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/personal/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatespersonal,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespersonal,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatespersonal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespersonal,share/template,personal,\
 	cs/dummy_templates.txt \
 	de/faltkarte.otg \
 	de/formalletteraquarius.ott \
diff --git a/extras/AllLangZip_accessoriestemplatespresent.mk b/extras/AllLangPackage_accessoriestemplatespresent.mk
index f6659f75b2cc..c4e2648681ce 100644
--- a/extras/AllLangZip_accessoriestemplatespresent.mk
+++ b/extras/AllLangPackage_accessoriestemplatespresent.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatespresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/presnt/lang,$(true)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/presnt/lang,$(true)))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatespresent,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespresent,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatespresent,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespresent,share/template,presnt,\
 	cs/dummy_templates.txt \
 	de/compladients.otp \
 	de/praktikumsbericht.otp \
diff --git a/extras/AllLangZip_autotextshare.mk b/extras/AllLangPackage_autotextshare.mk
index ce50a1cb7d12..3c249fe7b173 100644
--- a/extras/AllLangZip_autotextshare.mk
+++ b/extras/AllLangPackage_autotextshare.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,autotextshare,$(SRCDIR)/extras/source/autotext/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(SRCDIR)/extras/source/autotext/lang))
 
-$(eval $(call gb_AllLangZip_add_files,autotextshare,\
+$(eval $(call gb_AllLangPackage_add_files,autotextshare,share/autotext,\
 	bg/crdbus50.bau \
 	bg/standard.bau \
 	bg/template.bau \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreepresent.mk b/extras/AllLangZip_accessoriestemplatesnonfreepresent.mk
deleted file mode 100644
index 3093b3d9f91f..000000000000
--- a/extras/AllLangZip_accessoriestemplatesnonfreepresent.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreepresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/presnt/lang))
-
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreepresent,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
-
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreepresent,\
-	cs/dummy_templates-nonfree.txt \
-	de/dummy_templates-nonfree.txt \
-	en-US/dummy_templates-nonfree.txt \
-	es/dummy_templates-nonfree.txt \
-	fi/dummy_templates-nonfree.txt \
-	fr/dummy_templates-nonfree.txt \
-	hu/dummy_templates-nonfree.txt \
-	it/dummy_templates-nonfree.txt \
-	ja/dummy_templates-nonfree.txt \
-	ka/dummy_templates-nonfree.txt \
-	nl/dummy_templates-nonfree.txt \
-	pl/dummy_templates-nonfree.txt \
-	pt-BR/dummy_templates-nonfree.txt \
-	sv/dummy_templates-nonfree.txt \
-	tr/dummy_templates-nonfree.txt \
-	zh-CN/dummy_templates-nonfree.txt \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index cd07e662e009..6597afd1eaf6 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,extras))
 
 $(eval $(call gb_Module_add_targets,extras,\
-	AllLangZip_autotextshare \
+	AllLangPackage_autotextshare \
 	CustomTarget_autocorr \
 	CustomTarget_glade \
 	Package_autocorr \
@@ -82,40 +82,40 @@ endif
 
 ifeq ($(WITH_EXTRA_SAMPLE),YES)
 $(eval $(call gb_Module_add_targets,extras,\
-	AllLangZip_accessoriessamples \
-	AllLangZip_accessoriessamplesadvertisement \
-	AllLangZip_accessoriessamplesdocumentation \
-	AllLangZip_accessoriessamplesnonfree \
-	AllLangZip_accessoriessamplesnonfreeadvertisement \
-	AllLangZip_accessoriessamplesnonfreedocumentation \
+	AllLangPackage_accessoriessamples \
+	AllLangPackage_accessoriessamplesadvertisement \
+	AllLangPackage_accessoriessamplesdocumentation \
+	AllLangPackage_accessoriessamplesnonfree \
+	AllLangPackage_accessoriessamplesnonfreeadvertisement \
+	AllLangPackage_accessoriessamplesnonfreedocumentation \
 	UnpackedTarball_samples_pack \
 ))
 endif
 
 ifeq ($(WITH_EXTRA_TEMPLATE),YES)
 $(eval $(call gb_Module_add_targets,extras,\
-	AllLangZip_accessoriestemplates \
-	AllLangZip_accessoriestemplateseducate \
-	AllLangZip_accessoriestemplatesfinance \
-	AllLangZip_accessoriestemplatesforms \
-	AllLangZip_accessoriestemplateslabels \
-	AllLangZip_accessoriestemplateslayout \
-	AllLangZip_accessoriestemplatesmisc \
-	AllLangZip_accessoriestemplatesnonfree \
-	AllLangZip_accessoriestemplatesnonfreeeducate \
-	AllLangZip_accessoriestemplatesnonfreefinance \
-	AllLangZip_accessoriestemplatesnonfreeforms \
-	AllLangZip_accessoriestemplatesnonfreelabels \
-	AllLangZip_accessoriestemplatesnonfreelayout \
-	AllLangZip_accessoriestemplatesnonfreemisc \
-	AllLangZip_accessoriestemplatesnonfreeofficorr \
-	AllLangZip_accessoriestemplatesnonfreeoffimisc \
-	AllLangZip_accessoriestemplatesnonfreepersonal \
-	AllLangZip_accessoriestemplatesnonfreepresent \
-	AllLangZip_accessoriestemplatesofficorr \
-	AllLangZip_accessoriestemplatesoffimisc \
-	AllLangZip_accessoriestemplatespersonal \
-	AllLangZip_accessoriestemplatespresent \
+	AllLangPackage_accessoriestemplates \
+	AllLangPackage_accessoriestemplateseducate \
+	AllLangPackage_accessoriestemplatesfinance \
+	AllLangPackage_accessoriestemplatesforms \
+	AllLangPackage_accessoriestemplateslabels \
+	AllLangPackage_accessoriestemplateslayout \
+	AllLangPackage_accessoriestemplatesmisc \
+	AllLangPackage_accessoriestemplatesnonfree \
+	AllLangPackage_accessoriestemplatesnonfreeeducate \
+	AllLangPackage_accessoriestemplatesnonfreefinance \
+	AllLangPackage_accessoriestemplatesnonfreeforms \
+	AllLangPackage_accessoriestemplatesnonfreelabels \
+	AllLangPackage_accessoriestemplatesnonfreelayout \
+	AllLangPackage_accessoriestemplatesnonfreemisc \
+	AllLangPackage_accessoriestemplatesnonfreeofficorr \
+	AllLangPackage_accessoriestemplatesnonfreeoffimisc \
+	AllLangPackage_accessoriestemplatesnonfreepersonal \
+	AllLangPackage_accessoriestemplatesnonfreepresent \
+	AllLangPackage_accessoriestemplatesofficorr \
+	AllLangPackage_accessoriestemplatesoffimisc \
+	AllLangPackage_accessoriestemplatespersonal \
+	AllLangPackage_accessoriestemplatespresent \
 	UnpackedTarball_templates_pack \
 	Zip_accessoriestemplatescommon \
 	Zip_accessoriestemplatescommoneducate \
diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp
index 7b4486fee8e0..0b8232634eca 100644
--- a/scp2/source/accessories/file_samples_accessories.scp
+++ b/scp2/source/accessories/file_samples_accessories.scp
@@ -35,47 +35,47 @@
 #ifdef WITH_EXTRA_SAMPLE
 
 File gid_File_Extra_Samples_Accessories
-    Dir = gid_Dir_Samples_Language;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamples,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamples,filelist);
 End
 
 File gid_File_Extra_Samples_Documentations_Accessories
-    Dir = gid_Dir_Samples_Documentations;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesdocumentation,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesdocumentation,filelist);
 End
 
 File gid_File_Extra_Samples_Advertisement_Accessories
-    Dir = gid_Dir_Samples_Advertisement;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesadvertisement,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesadvertisement,filelist);
 End
 
 /* ** Samples - NON FREE** */
 
 File gid_File_Extra_Samples_NONFREE_Accessories
-    Dir = gid_Dir_Samples_Language;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesnonfree,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfree,filelist);
 End
 
 File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
-    Dir = gid_Dir_Samples_Documentations;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,filelist);
 End
 
 File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
-    Dir = gid_Dir_Samples_Advertisement;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,filelist);
 End
 
 #endif
diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp
index 55689d907123..22278dbce969 100644
--- a/scp2/source/accessories/file_templates_accessories.scp
+++ b/scp2/source/accessories/file_templates_accessories.scp
@@ -35,80 +35,80 @@
 #ifdef WITH_EXTRA_TEMPLATE
 
 File gid_File_Extra_Templates_Accessories
-    Dir = gid_Dir_Template_Language;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplates,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplates,filelist);
 End
 
 File gid_File_Extra_Templates_Layout_Accessories
-    Dir = gid_Dir_Template_Layout;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplateslayout,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslayout,filelist);
 End
 
 File gid_File_Extra_Templates_Present_Accessories
-    Dir = gid_Dir_Template_Presnt;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatespresent,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespresent,filelist);
 End
 
 File gid_File_Extra_Templates_Educate_Accessories
-    Dir = gid_Dir_Template_Educate;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplateseducate,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateseducate,filelist);
 End
 
 File gid_File_Extra_Templates_Finance_Accessories
-    Dir = gid_Dir_Template_Finance;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesfinance,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesfinance,filelist);
 End
 
 File gid_File_Extra_Templates_Forms_Accessories
-    Dir = gid_Dir_Template_Forms;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesforms,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesforms,filelist);
 End
 
 File gid_File_Extra_Templates_Labels_Accessories
-    Dir = gid_Dir_Template_Labels;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplateslabels,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslabels,filelist);
 End
 
 File gid_File_Extra_Templates_Misc_Accessories
-    Dir = gid_Dir_Template_Misc;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesmisc,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesmisc,filelist);
 End
 
 File gid_File_Extra_Templates_Officorr_Accessories
-    Dir = gid_Dir_Template_Officorr;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesofficorr,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesofficorr,filelist);
 End
 
 File gid_File_Extra_Templates_Offimisc_Accessories
-    Dir = gid_Dir_Template_Offimisc;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,filelist);
 End
 
 File gid_File_Extra_Templates_Personal_Accessories
-    Dir = gid_Dir_Template_Personal;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatespersonal,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespersonal,filelist);
 End
 
 /* ** Templates - Common ** */
@@ -193,80 +193,80 @@ End
 /* ** Templates - NON FREE ** */
 
 File gid_File_Extra_Templates_NONFREE_Accessories
-    Dir = gid_Dir_Template_Language;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfree,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfree,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Layout_Accessories
-    Dir = gid_Dir_Template_Layout;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Present_Accessories
-    Dir = gid_Dir_Template_Presnt;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Educate_Accessories
-    Dir = gid_Dir_Template_Educate;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Finance_Accessories
-    Dir = gid_Dir_Template_Finance;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Forms_Accessories
-    Dir = gid_Dir_Template_Forms;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Labels_Accessories
-    Dir = gid_Dir_Template_Labels;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Misc_Accessories
-    Dir = gid_Dir_Template_Misc;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Officorr_Accessories
-    Dir = gid_Dir_Template_Officorr;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories
-    Dir = gid_Dir_Template_Offimisc;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,filelist);
 End
 
 File gid_File_Extra_Templates_NONFREE_Personal_Accessories
-    Dir = gid_Dir_Template_Personal;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,filelist);
 End
 
 #endif
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index bb15b33fce10..3f965a6cc7c4 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -35,10 +35,10 @@ File gid_File_Extra_Autocorr
 End
 
 File gid_File_Extra_Autotextshare_Lang
-    Dir = gid_Dir_Autotext_Language;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(autotextshare,zip);
+    Styles = (FILELIST, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(autotextshare,filelist);
 End
 
 File gid_File_Extra_Autotextuser
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
new file mode 100644
index 000000000000..531b1bb835ca
--- /dev/null
+++ b/solenv/gbuild/AllLangPackage.mk
@@ -0,0 +1,110 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# AllLangPackage class
+
+# Handles creation of a bunch of packages with content dependent on
+# language. The package files are placed into $(INSTDIR).
+
+gb_AllLangPackage_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
+
+$(dir $(call gb_AllLangPackage_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_AllLangPackage_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),ALP,3)
+	touch $@
+
+.PHONY : $(call gb_AllLangPackage_get_clean_target,%)
+$(call gb_AllLangPackage_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(true),ALP,3)
+	rm -f $(call gb_AllLangPackage_get_target,$*)
+
+# Define a new package group.
+#
+# gb_AllLangPackage_AllLangPackage group srcdir
+define gb_AllLangPackage_AllLangPackage
+$(foreach lang,$(gb_AllLangPackage_LANGS),$(call gb_AllLangPackage__AllLangPackage_onelang,$(1),$(1)_$(lang),$(2)))
+
+$(call gb_AllLangPackage_get_target,$(1)) :| $(dir $(call gb_AllLangPackage_get_target,$(1))).dir
+
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangPackage_get_target,$(1)),$(call gb_AllLangPackage_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),AllLangPackage)
+
+endef
+
+# Define a package for one lang.
+#
+# gb_AllLangPackage__AllLangPackage_lang group package srcdir
+define gb_AllLangPackage__AllLangPackage_onelang
+$(call gb_Package_Package_internal,$(2),$(3))
+$(call gb_Package_set_outdir,$(2),$(INSTDIR))
+
+endef
+
+# gb_AllLangPackage__add_to_package target package destination source
+define gb_AllLangPackage__add_to_package
+$(call gb_Package_add_file,$(2),$(3),$(4))
+$(call gb_AllLangPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2))
+$(call gb_AllLangPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
+
+endef
+
+# gb_AllLangPackage__add_file target destination source lang
+define gb_AllLangPackage__add_file
+$(if $(filter $(4),$(gb_AllLangPackage_LANGS)),$(call gb_AllLangPackage__add_to_package,$(1),$(1)_$(4),$(2),$(3)))
+
+endef
+
+# Add a file to one of the child packages.
+#
+# The language is taken from the first component of the file name. The
+# file is only added if there is a package defined for the language
+# (i.e., if we are building with the language).
+#
+# gb_AllLangPackage_add_file target destination source
+define gb_AllLangPackage_add_file
+$(call gb_AllLangPackage__add_file,$(1),$(2),$(3),$(firstword $(subst /, ,$(3))))
+
+endef
+
+# Add several files to the child packages at once.
+#
+# gb_AllLangPackage_add_files target destination-dir file(s)
+define gb_AllLangPackage_add_files
+$(if $(strip $(2)),,$(call gb_Output_error,gb_AllLangPackage_add_files: destination dir cannot be empty))
+$(foreach file,$(3),$(call gb_AllLangPackage_add_file,$(1),$(2)/$(file),$(file)))
+
+endef
+
+# Add several files to the child packages at once.
+#
+# The files are placed into subdir under the language-dependent path.
+#
+# Example:
+# $(eval $(call # gb_AllLangPackage_add_files_with_subdir,foo,destdir,subdir,cs/file.ext))
+# # -> destdir/cs/subdir/file.ext
+#
+# gb_AllLangPackage_add_files_with_subdir target destination-dir subdir file(s)
+define gb_AllLangPackage_add_files_with_subdir
+$(if $(strip $(2)),,$(call gb_Output_error,gb_AllLangPackage_add_files_with_subdir: destination dir cannot be empty))
+$(if $(strip $(3)),,$(call gb_Output_error,gb_AllLangPackage_add_files_with_subdir: there is no subdir, just use gb_AllLangPackage_add_files))
+$(foreach file,$(4),$(call gb_AllLangPackage_add_file,$(1),$(2)/$(dir $(file))$(3)/$(notdir $(file)),$(file)))
+
+endef
+
+# Use unpacked tarball.
+#
+# gb_AllLangPackage_add_dependency target unpacked
+define gb_AllLangPackage_use_unpacked
+$(foreach lang,$(gb_AllLangPackage_LANGS),$(call gb_Package_use_unpacked,$(1)_$(lang),$(2)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
deleted file mode 100644
index c02ddf18e500..000000000000
--- a/solenv/gbuild/AllLangZip.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# AllLangZip class
-
-# Handles creation of a bunch of zip files with content dependent on
-# language
-
-gb_AllLangZip_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
-
-$(dir $(call gb_AllLangZip_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_AllLangZip_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),ALZ,4)
-	touch $@
-
-.PHONY : $(call gb_AllLangZip_get_clean_target,%)
-$(call gb_AllLangZip_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(true),ALZ,4)
-	rm -f $(call gb_AllLangZip_get_target,$*)
-
-# Define a new zip group
-#
-# NOTE: we cannot add dependencies on the child zips here: Zip fails if
-# the source directory does not exist and we cannot test its existence
-# because the directory might be generated. So we postpone the
-# dependency creation to gb_AllLangZip_add_file.
-#
-# gb_AllLangZip_AllLangZip group srcdir
-define gb_AllLangZip_AllLangZip
-$(foreach lang,$(gb_AllLangZip_LANGS),$(call gb_Zip_Zip_internal,$(1)_$(lang),$(2)/$(lang)))
-
-$(call gb_AllLangZip_get_target,$(1)) :| $(dir $(call gb_AllLangZip_get_target,$(1))).dir
-
-$$(eval $$(call gb_Module_register_target,$(call gb_AllLangZip_get_target,$(1)),$(call gb_AllLangZip_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),AllLangZip)
-
-endef
-
-define gb_AllLangZip__add_to_zip
-$(call gb_Zip_add_file,$(2),$(3))
-$(call gb_AllLangZip_get_target,$(1)) : $(call gb_Zip_get_outdir_target,$(2))
-$(call gb_AllLangZip_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(2))
-
-endef
-
-define gb_AllLangZip__add_file_impl
-$(if $(filter $(2),$(gb_AllLangZip_LANGS)),$(call gb_AllLangZip__add_to_zip,$(1),$(1)_$(2),$(3)))
-
-endef
-
-define gb_AllLangZip__add_file
-$(call gb_AllLangZip__add_file_impl,$(1),$(firstword $(2)),$(subst $() $(),/,$(wordlist 2,$(words $(2)),$(2))))
-
-endef
-
-# Add a file to one of the child zips
-#
-# The language is taken from the first component of the file name. The
-# file is only added if there is a zip defined for the language (i.e.,
-# if we are building with the language).
-#
-# gb_AllLangZip_add_file target file
-define gb_AllLangZip_add_file
-$(call gb_AllLangZip__add_file,$(1),$(subst /, ,$(2)))
-
-endef
-
-# Add several files to the child zips at once
-#
-# gb_AllLangZip_add_files target file(s)
-define gb_AllLangZip_add_files
-$(foreach file,$(2),$(call gb_AllLangZip_add_file,$(1),$(file)))
-
-endef
-
-# Add extra dependency that must exist before the archives can be created
-#
-# gb_AllLangZip_add_dependency target dep
-define gb_AllLangZip_add_dependency
-$(foreach lang,$(gb_AllLangZip_LANGS),$(call gb_Zip_add_dependency,$(1)_$(lang),$(2)))
-
-endef
-
-# Add extra dependencies that must exist before the archives can be created
-#
-# gb_AllLangZip_add_dependencies target dep(s)
-define gb_AllLangZip_add_dependencies
-$(foreach dependency,$(2),$(call gb_AllLangZip_add_dependency,$(1),$(dependency)))
-
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 50d2d91d5b44..ffc5a93c0eb0 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -85,8 +85,8 @@ endef
 
 gb_AutoInstallLibs_get_target = $(WORKDIR)/AutoInstallLibs/$(1)
 gb_AllLangHelp_get_target = $(WORKDIR)/AllLangHelp/$(1)
+gb_AllLangPackage_get_target = $(WORKDIR)/AllLangPackage/$(1)
 gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
-gb_AllLangZip_get_target = $(WORKDIR)/AllLangZip/$(1)
 gb_AsmObject_get_target = $(WORKDIR)/AsmObject/$(1).o
 gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
 gb_GenCObject_get_target = $(WORKDIR)/GenCObject/$(1).o
@@ -260,8 +260,8 @@ endef
 $(eval $(call gb_Helper_make_clean_targets,\
 	AutoInstallLibs \
 	AllLangHelp \
+	AllLangPackage \
 	AllLangResTarget \
-	AllLangZip \
 	CliAssembly \
 	CliAssemblyTarget \
 	CliConfigTarget \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1fa46350279a..3853618fc119 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -332,7 +332,7 @@ include $(foreach class, \
 	CliUnoApi \
 	Zip \
 	ZipPackage \
-	AllLangZip \
+	AllLangPackage \
 	Configuration \
 	HelpTarget \
 	AllLangHelp \