diff --git a/README.md b/README.md
index 792ac49..bcc9c6c 100644
--- a/README.md
+++ b/README.md
@@ -12,40 +12,40 @@ The Joomla Component Builder Package that bundles JCB Component and all the plug
## Extensions
-- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [v3.1.17](https://git.vdm.dev/joomla/Component-Builder/archive/v3.1.17.zip)
-> Moves all major structre function to container. Adds new Server replacment class for legacy calls. Refactored multiple classes. Add more advanced compiler options, with donation notice.
-- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/v2.0.1.zip)
-> update - v2.0.1
-- [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/v2.0.1.zip)
-> update - v2.0.1
-- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/archive/v2.0.1.zip)
-> update - v2.0.1
-- [joomla/plg_content_componentbuildercustomadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs/archive/v2.0.1.zip)
-> update - v2.0.1
-- [joomla/plg_content_componentbuilderfieldorderingtabs](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs) [v1.0.2](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs/archive/v1.0.2.zip)
-> update - v1.0.2
-- [joomla/plg_content_componentbuilderlanguagetabs](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs) [v1.0.2](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs/archive/v1.0.2.zip)
-> update - v1.0.2
-- [joomla/plg_content_componentbuilderprivacytabs](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs) [v1.0.1](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs/archive/v1.0.1.zip)
-> update - v1.0.1
-- [joomla/plg_content_componentbuildersiteheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs/archive/v2.0.1.zip)
-> update - v2.0.1
-- [joomla/plg_content_componentbuilderdynamicgetheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs) [v2.0.2](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs/archive/v2.0.2.zip)
-> update - v2.0.2
-- [joomla/plg_extension_componentbuilderactionlogcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler) [v1.1.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler/archive/v1.1.0.zip)
-> update - v1.1.0
-- [joomla/plg_extension_componentbuilderexportcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler) [v1.1.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler/archive/v1.1.0.zip)
-> update - v1.1.0
-- [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [v1.0.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/archive/v1.0.2.zip)
-> update - v1.0.2
-- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [v2.2.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/v2.2.2.zip)
-> update - v2.2.2
-- [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [v1.1.4](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/v1.1.4.zip)
-> update - v1.1.4
-- [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [v1.1.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/v1.1.0.zip)
-> update - v1.1.0
-- [joomla/plg_extension_componentbuilderprivacycompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler) [v1.1.3](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler/archive/v1.1.3.zip)
-> update - v1.1.3
+- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [master](https://git.vdm.dev/joomla/Component-Builder/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuildercustomadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuilderfieldorderingtabs](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuilderlanguagetabs](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuilderprivacytabs](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuildersiteheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs/archive/master.zip)
+> master
+- [joomla/plg_content_componentbuilderdynamicgetheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderactionlogcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderexportcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderprivacycompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler/archive/master.zip)
+> master
### Copyright (2015)
> Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index fbc5cdd..7335c88 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -21,22 +21,22 @@
en-GB/en-GB.pkg_component_builder.ini
- joomla__Component-Builder__v3.1.17.zip
-
-
-
-
- joomla__plg_content_componentbuilderfieldorderingtabs__v1.0.2.zip
- joomla__plg_content_componentbuilderlanguagetabs__v1.0.2.zip
- joomla__plg_content_componentbuilderprivacytabs__v1.0.1.zip
-
-
- joomla__plg_extension_componentbuilderactionlogcompiler__v1.1.0.zip
- joomla__plg_extension_componentbuilderexportcompiler__v1.1.0.zip
- joomla__plg_extension_componentbuilderfieldorderingcompiler__v1.0.2.zip
-
- joomla__plg_extension_componentbuilderlanguagepackaging__v1.1.4.zip
- joomla__plg_extension_componentbuilderpowersautoloadercompiler__v1.1.0.zip
- joomla__plg_extension_componentbuilderprivacycompiler__v1.1.3.zip
+ joomla__Component-Builder__master.zip
+
+
+
+
+ joomla__plg_content_componentbuilderfieldorderingtabs__master.zip
+ joomla__plg_content_componentbuilderlanguagetabs__master.zip
+ joomla__plg_content_componentbuilderprivacytabs__master.zip
+
+
+ joomla__plg_extension_componentbuilderactionlogcompiler__master.zip
+ joomla__plg_extension_componentbuilderexportcompiler__master.zip
+ joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip
+
+ joomla__plg_extension_componentbuilderlanguagepackaging__master.zip
+ joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip
+ joomla__plg_extension_componentbuilderprivacycompiler__master.zip
diff --git a/src/joomla__Component-Builder__v3.1.17.zip b/src/joomla__Component-Builder__master.zip
similarity index 100%
rename from src/joomla__Component-Builder__v3.1.17.zip
rename to src/joomla__Component-Builder__master.zip
diff --git a/src/joomla__plg_content_componentbuilderadminheaderstabs__v2.0.1.zip b/src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip
similarity index 62%
rename from src/joomla__plg_content_componentbuilderadminheaderstabs__v2.0.1.zip
rename to src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip
index 7d7e213..56991ac 100644
Binary files a/src/joomla__plg_content_componentbuilderadminheaderstabs__v2.0.1.zip and b/src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__v2.0.1.zip b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip
similarity index 60%
rename from src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__v2.0.1.zip
rename to src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip
index 24afcd3..a8b8efc 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__v2.0.1.zip and b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentheaderstabs__v2.0.1.zip b/src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip
similarity index 58%
rename from src/joomla__plg_content_componentbuildercomponentheaderstabs__v2.0.1.zip
rename to src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip
index 7b5cb40..9c62ac4 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentheaderstabs__v2.0.1.zip and b/src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__v2.0.1.zip b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip
similarity index 63%
rename from src/joomla__plg_content_componentbuildercustomadminheaderstabs__v2.0.1.zip
rename to src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip
index 012c61f..18af6ba 100644
Binary files a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__v2.0.1.zip and b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__v2.0.2.zip b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip
similarity index 68%
rename from src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__v2.0.2.zip
rename to src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip
index 37402a9..04e436a 100644
Binary files a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__v2.0.2.zip and b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderfieldorderingtabs__v1.0.2.zip b/src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip
similarity index 58%
rename from src/joomla__plg_content_componentbuilderfieldorderingtabs__v1.0.2.zip
rename to src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip
index c7fa17a..1f3b8d7 100644
Binary files a/src/joomla__plg_content_componentbuilderfieldorderingtabs__v1.0.2.zip and b/src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderlanguagetabs__v1.0.2.zip b/src/joomla__plg_content_componentbuilderlanguagetabs__master.zip
similarity index 59%
rename from src/joomla__plg_content_componentbuilderlanguagetabs__v1.0.2.zip
rename to src/joomla__plg_content_componentbuilderlanguagetabs__master.zip
index 2cdfa6e..78e9d49 100644
Binary files a/src/joomla__plg_content_componentbuilderlanguagetabs__v1.0.2.zip and b/src/joomla__plg_content_componentbuilderlanguagetabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderprivacytabs__v1.0.1.zip b/src/joomla__plg_content_componentbuilderprivacytabs__master.zip
similarity index 69%
rename from src/joomla__plg_content_componentbuilderprivacytabs__v1.0.1.zip
rename to src/joomla__plg_content_componentbuilderprivacytabs__master.zip
index 2f4cc3e..058fe47 100644
Binary files a/src/joomla__plg_content_componentbuilderprivacytabs__v1.0.1.zip and b/src/joomla__plg_content_componentbuilderprivacytabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildersiteheaderstabs__v2.0.1.zip b/src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip
similarity index 63%
rename from src/joomla__plg_content_componentbuildersiteheaderstabs__v2.0.1.zip
rename to src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip
index 5673b36..3ebc6b3 100644
Binary files a/src/joomla__plg_content_componentbuildersiteheaderstabs__v2.0.1.zip and b/src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderactionlogcompiler__v1.1.0.zip b/src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip
similarity index 65%
rename from src/joomla__plg_extension_componentbuilderactionlogcompiler__v1.1.0.zip
rename to src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip
index b27294a..971c2b3 100644
Binary files a/src/joomla__plg_extension_componentbuilderactionlogcompiler__v1.1.0.zip and b/src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip b/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip
new file mode 100644
index 0000000..7a17c35
Binary files /dev/null and b/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderexportcompiler__v1.1.0.zip b/src/joomla__plg_extension_componentbuilderexportcompiler__v1.1.0.zip
deleted file mode 100644
index 27f45b7..0000000
Binary files a/src/joomla__plg_extension_componentbuilderexportcompiler__v1.1.0.zip and /dev/null differ
diff --git a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__v1.0.2.zip b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip
similarity index 54%
rename from src/joomla__plg_extension_componentbuilderfieldorderingcompiler__v1.0.2.zip
rename to src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip
index fe6f58e..6c89538 100644
Binary files a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__v1.0.2.zip and b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.2.2.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip
similarity index 67%
rename from src/joomla__plg_extension_componentbuilderheaderscompiler__v2.2.2.zip
rename to src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip
index 3dae63b..4fd70d7 100644
Binary files a/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.2.2.zip and b/src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderlanguagepackaging__v1.1.4.zip b/src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip
similarity index 71%
rename from src/joomla__plg_extension_componentbuilderlanguagepackaging__v1.1.4.zip
rename to src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip
index 34b07e9..8fb50db 100644
Binary files a/src/joomla__plg_extension_componentbuilderlanguagepackaging__v1.1.4.zip and b/src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__v1.1.0.zip b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip
similarity index 62%
rename from src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__v1.1.0.zip
rename to src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip
index 3d2ac7d..39d1e1b 100644
Binary files a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__v1.1.0.zip and b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip b/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip
new file mode 100644
index 0000000..3107864
Binary files /dev/null and b/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderprivacycompiler__v1.1.3.zip b/src/joomla__plg_extension_componentbuilderprivacycompiler__v1.1.3.zip
deleted file mode 100644
index 8fe4cef..0000000
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__v1.1.3.zip and /dev/null differ