65 files changed, 161 insertions, 141 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index a7a553d04c5f..d2225dde7e99 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
+	accessories \
 	libxmlsec \
 	np_sdk \
 	$(call gb_Helper_optional,AFMS,afms) \
diff --git a/extras/AllLangPackage_accessoriessamples.mk b/external/accessories/AllLangPackage_accessoriessamples.mk
index 29a89ce2d2b6..29a89ce2d2b6 100644
--- a/extras/AllLangPackage_accessoriessamples.mk
+++ b/external/accessories/AllLangPackage_accessoriessamples.mk
diff --git a/extras/AllLangPackage_accessoriessamplesadvertisement.mk b/external/accessories/AllLangPackage_accessoriessamplesadvertisement.mk
index 363f15498313..363f15498313 100644
--- a/extras/AllLangPackage_accessoriessamplesadvertisement.mk
+++ b/external/accessories/AllLangPackage_accessoriessamplesadvertisement.mk
diff --git a/extras/AllLangPackage_accessoriessamplesdocumentation.mk b/external/accessories/AllLangPackage_accessoriessamplesdocumentation.mk
index fb903daced15..fb903daced15 100644
--- a/extras/AllLangPackage_accessoriessamplesdocumentation.mk
+++ b/external/accessories/AllLangPackage_accessoriessamplesdocumentation.mk
diff --git a/extras/AllLangPackage_accessoriessamplesnonfree.mk b/external/accessories/AllLangPackage_accessoriessamplesnonfree.mk
index 9fcfa2d5b9e1..9fcfa2d5b9e1 100644
--- a/extras/AllLangPackage_accessoriessamplesnonfree.mk
+++ b/external/accessories/AllLangPackage_accessoriessamplesnonfree.mk
diff --git a/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk b/external/accessories/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
index b33ec0082296..b33ec0082296 100644
--- a/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
+++ b/external/accessories/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
diff --git a/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk b/external/accessories/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
index 0b44b09f2ea6..0b44b09f2ea6 100644
--- a/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
+++ b/external/accessories/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
diff --git a/extras/AllLangPackage_accessoriestemplates.mk b/external/accessories/AllLangPackage_accessoriestemplates.mk
index 8fa3e8908e35..8fa3e8908e35 100644
--- a/extras/AllLangPackage_accessoriestemplates.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplates.mk
diff --git a/extras/AllLangPackage_accessoriestemplateseducate.mk b/external/accessories/AllLangPackage_accessoriestemplateseducate.mk
index f95b2ef0604e..f95b2ef0604e 100644
--- a/extras/AllLangPackage_accessoriestemplateseducate.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplateseducate.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesfinance.mk b/external/accessories/AllLangPackage_accessoriestemplatesfinance.mk
index 88a8e491af5c..88a8e491af5c 100644
--- a/extras/AllLangPackage_accessoriestemplatesfinance.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesfinance.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesforms.mk b/external/accessories/AllLangPackage_accessoriestemplatesforms.mk
index 1f450bf8ec6b..1f450bf8ec6b 100644
--- a/extras/AllLangPackage_accessoriestemplatesforms.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesforms.mk
diff --git a/extras/AllLangPackage_accessoriestemplateslabels.mk b/external/accessories/AllLangPackage_accessoriestemplateslabels.mk
index 10cc9005a8af..10cc9005a8af 100644
--- a/extras/AllLangPackage_accessoriestemplateslabels.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplateslabels.mk
diff --git a/extras/AllLangPackage_accessoriestemplateslayout.mk b/external/accessories/AllLangPackage_accessoriestemplateslayout.mk
index 366bbb0404ba..366bbb0404ba 100644
--- a/extras/AllLangPackage_accessoriestemplateslayout.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplateslayout.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesmisc.mk b/external/accessories/AllLangPackage_accessoriestemplatesmisc.mk
index 09f6436bd7b0..09f6436bd7b0 100644
--- a/extras/AllLangPackage_accessoriestemplatesmisc.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesmisc.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfree.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfree.mk
index b72373778072..b72373778072 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfree.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfree.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
index 6d38379febc3..6d38379febc3 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreefinance.mk
index 30ecf49e23ff..30ecf49e23ff 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreefinance.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeforms.mk
index d1e3dac568cc..d1e3dac568cc 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeforms.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreelabels.mk
index 16539cfd8600..16539cfd8600 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreelabels.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreelayout.mk
index e36931ed5de6..e36931ed5de6 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreelayout.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreemisc.mk
index 59f9375595cd..59f9375595cd 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreemisc.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
index df87a49c55fd..df87a49c55fd 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
index 4f1f070c3bf7..4f1f070c3bf7 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
index 997dff05b0e1..997dff05b0e1 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk b/external/accessories/AllLangPackage_accessoriestemplatesnonfreepresent.mk
index 818c7c735d5f..818c7c735d5f 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesnonfreepresent.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesofficorr.mk b/external/accessories/AllLangPackage_accessoriestemplatesofficorr.mk
index 27f716764083..27f716764083 100644
--- a/extras/AllLangPackage_accessoriestemplatesofficorr.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesofficorr.mk
diff --git a/extras/AllLangPackage_accessoriestemplatesoffimisc.mk b/external/accessories/AllLangPackage_accessoriestemplatesoffimisc.mk
index 8525a8ef303e..8525a8ef303e 100644
--- a/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatesoffimisc.mk
diff --git a/extras/AllLangPackage_accessoriestemplatespersonal.mk b/external/accessories/AllLangPackage_accessoriestemplatespersonal.mk
index 251ad52e5d2f..251ad52e5d2f 100644
--- a/extras/AllLangPackage_accessoriestemplatespersonal.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatespersonal.mk
diff --git a/extras/AllLangPackage_accessoriestemplatespresent.mk b/external/accessories/AllLangPackage_accessoriestemplatespresent.mk
index 8cf486d2a893..8cf486d2a893 100644
--- a/extras/AllLangPackage_accessoriestemplatespresent.mk
+++ b/external/accessories/AllLangPackage_accessoriestemplatespresent.mk
diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/external/accessories/ExternalPackage_accessoriesgallery.mk
index 253661c67fde..e2b4fe10209a 100644
--- a/extras/ExternalPackage_accessoriesgallery.mk
+++ b/external/accessories/ExternalPackage_accessoriesgallery.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgallery,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories/sg1010.sdg \
 	accessories/sg1010.sdv \
 	accessories/sg1010.thm \
diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/external/accessories/ExternalPackage_accessoriesgallerydrawspeople.mk
index fda7c760e52b..19be29552b05 100644
--- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
+++ b/external/accessories/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-#$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack))
+#$(eval $(call gb_Package_Package,accessories_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgallerydrawspeople,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
 	accessories/Draws/People/Baboo1.png \
 	accessories/Draws/People/Jac1.png \
 	accessories/Draws/People/Jac2.png \
diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/external/accessories/ExternalPackage_accessoriesgalleryelementsbullets2.mk
index 8e5e49d32e98..25795e740869 100644
--- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryelementsbullets2,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
 	accessories/Elements/Bullets2/amethyst.arrow.png \
 	accessories/Elements/Bullets2/amethyst.asterisk.png \
 	accessories/Elements/Bullets2/amethyst.circle-light.png \
diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/external/accessories/ExternalPackage_accessoriesgallerynonfree.mk
index 3a7e37b571d1..4edefb3e146e 100644
--- a/extras/ExternalPackage_accessoriesgallerynonfree.mk
+++ b/external/accessories/ExternalPackage_accessoriesgallerynonfree.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgallerynonfree,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories-nonfree/sg600.sdg \
 	accessories-nonfree/sg600.sdv \
 	accessories-nonfree/sg600.thm \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosbuildings.mk
index 01f405f92449..180a85cba02b 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosbuildings.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosbuildings,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
 	accessories/Photos/Buildings/ArkSoft0408010009.jpg \
 	accessories/Photos/Buildings/ArkSoft0408010023.jpg \
 	accessories/Photos/Buildings/ArkSoft0408010026.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotoscelebration.mk
index 41e0eed18630..35557ee2c96e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotoscelebration.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoscelebration,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
 	accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
 	accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \
 ))
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotoscities.mk
index a7f5cd73096e..e2277fc3b324 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotoscities.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoscities,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
 	accessories/Photos/Cities/ArkSoft0507170040.jpg \
 	accessories/Photos/Cities/ArkSoft0507170041.jpg \
 	accessories/Photos/Cities/ArkSoft0508100003.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosfauna.mk
index cad78c355ef3..21d8764d0b86 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosfauna.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfauna,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosfauna,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
 	accessories/Photos/Fauna/ArkSoft0407030001.jpg \
 	accessories/Photos/Fauna/bee_on_citrus.jpg \
 	accessories/Photos/Fauna/dog01.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosflowers.mk
index 19da06390797..b15d967d8f05 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosflowers.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosflowers,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosflowers,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
 	accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
 	accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \
 	accessories/Photos/Flowers/ArkSoft0405010001.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
index fc0bc22e72de..08fbde403d1d 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_lasagna.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotoshumans.mk
index 32ad66e55cc8..41213b5b826d 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotoshumans.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoshumans,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoshumans,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
 	accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
 	accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \
 	accessories/Photos/Humans/1473308070_30ac88194b_o.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
index 4fe487a5aeed..710ae71c3185 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoslandscapes,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoslandscapes,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
 	accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
 	accessories/Photos/Landscapes/ArkSoft0405010019.jpg \
 	accessories/Photos/Landscapes/ArkSoft0405010050.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosobjects.mk
index fbb73469739c..4cb3ba07d39e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosobjects.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosobjects,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosobjects,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
 	accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
 	accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \
 	accessories/Photos/Objects/morguefiles_com_pindiyath100_122931551.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosplants.mk
index 8b2cd6ba3aa1..01be2a75ac39 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosplants.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosplants,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosplants,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
 	accessories/Photos/Plants/ArkSoft0405020018.jpg \
 	accessories/Photos/Plants/ArkSoft0405020019.jpg \
 	accessories/Photos/Plants/ArkSoft0508100018.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosspace.mk
index 2162831d0110..1d262202ab47 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosspace.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosspace,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosspace,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
 	accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
 	accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \
 	accessories/Photos/Space/Wikimedia_Space_2005-06-b-large_web.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotosstatues.mk
index d100d1d71bcc..72be0336df01 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotosstatues.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosstatues,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosstatues,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
 	accessories/Photos/Statues/ArkSoft0507170027.jpg \
 	accessories/Photos/Statues/ArkSoft0507170032.jpg \
 	accessories/Photos/Statues/ArkSoft0507170033.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/external/accessories/ExternalPackage_accessoriesgalleryphotostravel.mk
index 63265c3265a5..c1e9cdb4ee54 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
+++ b/external/accessories/ExternalPackage_accessoriesgalleryphotostravel.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotostravel,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotostravel,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
 	accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
 	accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \
 	accessories/Photos/Travel/JS_PDPhO_tall_ship.jpg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/external/accessories/ExternalPackage_accessoriestemplatescommon.mk
index 975520a89488..6c549f861e53 100644
--- a/extras/ExternalPackage_accessoriestemplatescommon.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommon.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommon,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommon,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
 	templates/common/dummy_common_templates.txt \
 	templates/common/svn-commit.2.tmp \
 	templates/common/svn-commit.tmp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/external/accessories/ExternalPackage_accessoriestemplatescommoneducate.mk
index 771db9a4a392..220bd75a942f 100644
--- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommoneducate.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommoneducate,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommoneducate,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
 	templates/common/educate/A4-chequered.otg \
 	templates/common/educate/A4-lin_2mm.otg \
 	templates/common/educate/A4-lin_3mm.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonfinance.mk
index 343061b5764b..ec4346020773 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonfinance.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonfinance,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonfinance,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
 	templates/common/finance/dummy_common_templates.txt \
 ))
 
diff --git a/extras/ExternalPackage_accessoriestemplatescommonforms.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonforms.mk
index 0bcfae6be014..ad33c8d74250 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonforms.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonforms,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonforms,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
 	templates/common/forms/dummy_common_templates.txt \
 ))
 
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonlabels.mk
index a16b04893932..b0b21e7fb43f 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonlabels.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlabels,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonlabels,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
 	templates/common/labels/24_port_patch_text.otg \
 	templates/common/labels/arrows-black-base.ott \
 	templates/common/labels/WL-OL1000.ott \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonlayout.mk
index c1de6724ac45..a8387628025d 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonlayout.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlayout,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonlayout,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
 	templates/common/layout/31407-squares.otp \
 	templates/common/layout/abstract-015_1.jpg.otp \
 	templates/common/layout/abstract-015_2.jpg.otp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonmisc.mk
index 769da4aa0933..7a08346612b3 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonmisc.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonmisc,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonmisc,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
 	templates/common/misc/White_Notebook_Paper_legal.ott \
 	templates/common/misc/Yellow_Pad_Legal.ott \
 ))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonofficorr.mk
index 3e8518c84e35..aa032875168c 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonofficorr.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonofficorr,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonofficorr,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
 	templates/common/officorr/dummy_common_templates.txt \
 ))
 
diff --git a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonoffimisc.mk
index 780c5ead8e67..5581dde0d55d 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonoffimisc.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonoffimisc,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonoffimisc,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
 	templates/common/offimisc/dummy_common_templates.txt \
 ))
 
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonpersonal.mk
index 42a7b7d82df8..6c781fab9166 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonpersonal.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpersonal,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonpersonal,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
 	templates/common/personal/szivesoldal.otg \
 ))
 
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk b/external/accessories/ExternalPackage_accessoriestemplatescommonpresent.mk
index 51eba77b5f7d..348ef36fb26c 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
+++ b/external/accessories/ExternalPackage_accessoriestemplatescommonpresent.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpresent,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonpresent,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
 	templates/common/presnt/dummy_common_templates.txt \
 ))
 
diff --git a/extras/ExternalPackage_extra_fonts.mk b/external/accessories/ExternalPackage_extra_fonts.mk
index 9e7d5e8cbb24..ee62e61c7902 100644
--- a/extras/ExternalPackage_extra_fonts.mk
+++ b/external/accessories/ExternalPackage_extra_fonts.mk
@@ -7,11 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_extra_fonts,fonts-pack))
 
-$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
+$(eval $(call gb_ExternalPackage_use_unpacked,accessories_extra_fonts,fonts-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	decorative/BETSY2.ttf \
 	decorative/Berylibi.ttf \
 	decorative/Beryliub.ttf \
diff --git a/external/accessories/Makefile b/external/accessories/Makefile
new file mode 100644
index 000000000000..e4968cf85fb6
--- /dev/null
+++ b/external/accessories/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/accessories/Module_accessories.mk b/external/accessories/Module_accessories.mk
new file mode 100644
index 000000000000..ac055579658a
--- /dev/null
+++ b/external/accessories/Module_accessories.mk
@@ -0,0 +1,93 @@
+# -*- 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_Module_Module,accessories))
+
+ifeq ($(WITH_EXTRA_FONT),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	ExternalPackage_extra_fonts \
+	UnpackedTarball_fonts_pack \
+))
+endif
+
+ifeq ($(WITH_EXTRA_GALLERY),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	UnpackedTarball_gallery_pack \
+	ExternalPackage_accessoriesgallery \
+	ExternalPackage_accessoriesgallerydrawspeople \
+	ExternalPackage_accessoriesgalleryelementsbullets2 \
+	ExternalPackage_accessoriesgallerynonfree \
+	ExternalPackage_accessoriesgalleryphotosbuildings \
+	ExternalPackage_accessoriesgalleryphotoscelebration \
+	ExternalPackage_accessoriesgalleryphotoscities \
+	ExternalPackage_accessoriesgalleryphotosfauna \
+	ExternalPackage_accessoriesgalleryphotosflowers \
+	ExternalPackage_accessoriesgalleryphotosfoodsanddrinks \
+	ExternalPackage_accessoriesgalleryphotoshumans \
+	ExternalPackage_accessoriesgalleryphotoslandscapes \
+	ExternalPackage_accessoriesgalleryphotosobjects \
+	ExternalPackage_accessoriesgalleryphotosplants \
+	ExternalPackage_accessoriesgalleryphotosspace \
+	ExternalPackage_accessoriesgalleryphotosstatues \
+	ExternalPackage_accessoriesgalleryphotostravel \
+))
+endif
+
+ifeq ($(WITH_EXTRA_SAMPLE),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	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,accessories,\
+	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 \
+	ExternalPackage_accessoriestemplatescommon \
+	ExternalPackage_accessoriestemplatescommoneducate \
+	ExternalPackage_accessoriestemplatescommonfinance \
+	ExternalPackage_accessoriestemplatescommonforms \
+	ExternalPackage_accessoriestemplatescommonlabels \
+	ExternalPackage_accessoriestemplatescommonlayout \
+	ExternalPackage_accessoriestemplatescommonmisc \
+	ExternalPackage_accessoriestemplatescommonofficorr \
+	ExternalPackage_accessoriestemplatescommonoffimisc \
+	ExternalPackage_accessoriestemplatescommonpersonal \
+	ExternalPackage_accessoriestemplatescommonpresent \
+	UnpackedTarball_templates_pack \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/UnpackedTarball_fonts_pack.mk b/external/accessories/UnpackedTarball_fonts_pack.mk
index 26effc64e366..26effc64e366 100644
--- a/extras/UnpackedTarball_fonts_pack.mk
+++ b/external/accessories/UnpackedTarball_fonts_pack.mk
diff --git a/extras/UnpackedTarball_gallery_pack.mk b/external/accessories/UnpackedTarball_gallery_pack.mk
index a4adf20e1551..a4adf20e1551 100644
--- a/extras/UnpackedTarball_gallery_pack.mk
+++ b/external/accessories/UnpackedTarball_gallery_pack.mk
diff --git a/extras/UnpackedTarball_samples_pack.mk b/external/accessories/UnpackedTarball_samples_pack.mk
index ff54ac2254d7..ff54ac2254d7 100644
--- a/extras/UnpackedTarball_samples_pack.mk
+++ b/external/accessories/UnpackedTarball_samples_pack.mk
diff --git a/extras/UnpackedTarball_templates_pack.mk b/external/accessories/UnpackedTarball_templates_pack.mk
index dc777adb6ee7..dc777adb6ee7 100644
--- a/extras/UnpackedTarball_templates_pack.mk
+++ b/external/accessories/UnpackedTarball_templates_pack.mk
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index c94b1e0195f0..6f5f644c83ea 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -59,85 +59,4 @@ $(eval $(call gb_Module_add_targets,extras,\
 ))
 endif
 
-ifeq ($(WITH_EXTRA_FONT),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	ExternalPackage_extra_fonts \
-	UnpackedTarball_fonts_pack \
-))
-endif
-
-ifeq ($(WITH_EXTRA_GALLERY),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	UnpackedTarball_gallery_pack \
-	ExternalPackage_accessoriesgallery \
-	ExternalPackage_accessoriesgallerydrawspeople \
-	ExternalPackage_accessoriesgalleryelementsbullets2 \
-	ExternalPackage_accessoriesgallerynonfree \
-	ExternalPackage_accessoriesgalleryphotosbuildings \
-	ExternalPackage_accessoriesgalleryphotoscelebration \
-	ExternalPackage_accessoriesgalleryphotoscities \
-	ExternalPackage_accessoriesgalleryphotosfauna \
-	ExternalPackage_accessoriesgalleryphotosflowers \
-	ExternalPackage_accessoriesgalleryphotosfoodsanddrinks \
-	ExternalPackage_accessoriesgalleryphotoshumans \
-	ExternalPackage_accessoriesgalleryphotoslandscapes \
-	ExternalPackage_accessoriesgalleryphotosobjects \
-	ExternalPackage_accessoriesgalleryphotosplants \
-	ExternalPackage_accessoriesgalleryphotosspace \
-	ExternalPackage_accessoriesgalleryphotosstatues \
-	ExternalPackage_accessoriesgalleryphotostravel \
-))
-endif
-
-ifeq ($(WITH_EXTRA_SAMPLE),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	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,\
-	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 \
-	ExternalPackage_accessoriestemplatescommon \
-	ExternalPackage_accessoriestemplatescommoneducate \
-	ExternalPackage_accessoriestemplatescommonfinance \
-	ExternalPackage_accessoriestemplatescommonforms \
-	ExternalPackage_accessoriestemplatescommonlabels \
-	ExternalPackage_accessoriestemplatescommonlayout \
-	ExternalPackage_accessoriestemplatescommonmisc \
-	ExternalPackage_accessoriestemplatescommonofficorr \
-	ExternalPackage_accessoriestemplatescommonoffimisc \
-	ExternalPackage_accessoriestemplatescommonpersonal \
-	ExternalPackage_accessoriestemplatescommonpresent \
-	UnpackedTarball_templates_pack \
-))
-endif
-
 # vim: set noet sw=4 ts=4: