Release of v5.0.3-alpha1

Add push option to powers area.
Release of v5.0.2
2024-08-20 22:34:47 +02:00 · 2024-08-16 19:22:12 +02:00 · 2024-08-15 01:35:23 +02:00 · 2024-08-01 23:01:42 +02:00 · 2024-08-01 18:08:40 +02:00 · 2024-08-01 10:06:30 +02:00
2958 changed files with 229184 additions and 349561 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,8 +1,8 @@
-# v3.2.4-alpha1
+# v5.0.3-alpha1

 - Add push option to powers area

-# v3.2.3
+# v5.0.2

 - Fix site view form missing classes in J4+
 - Fix permissions tab in items in J4+
@ -18,15 +18,17 @@
 - Add option to use powers in preflight event in the installer class
 - Fix abstract schema class function check default index warring
 - Fix dynamicGet so that the table values will load again. #1155
- Keep jQuery in dynamicGet area for Joomla 3
+- Add more pure JS to the dynamic get area
 - Add native plugin builder for Joomla 4 & 5
 - Add basic API for admin views

-# v3.2.2
+# v5.0.1

- Fix auto build from SQL in Joomla 4 and 5.
+- Fix auto build from SQL in Joomla 5.
 - Fix permission issue for admin views.
+- Add in JCB gitea push feature to help maintain JCB core features.
 - Add extending options to interfaces.
+- Change the extendsinterfaces field to allow null, #1139
 - Update the Schema class to also update null mismatching if needed
 - Add repositories for better integration with gitea
 - Refactored the Data classes
@ -47,15 +49,32 @@
 - Add option to use placeholders in Joomla Power namespaces.
 - Fix subform layout of uikit in JCB

-# v3.2.1
+# v5.0.0

+- Fix the plug-in installer script builder bug #1067
+- Fix Event triggers for Joomla 4 and 5 builds.
+- Add fix to the update script, so that upgrading JCB from Joomla 4 to 5 will not fail.
+- Fix plugin field selection
+- Fix plugin params tab layout
+- Add issue templates
+- Force autoloader to always load
+- Fix repeatable layout #1076
+- Add Factory class to the J5 Event class. #1093
+- Fix customfilelist field to conform to the new namespacing conventions. #1094
+- Add menus for languages, servers, get snippets to J5 #1095
+- Fix [Set String Value] in placeholder table to store the value as a base64 string.
+- Fix the search area layout.
+- Fix the search area code line selection.
+- Fix the input edit button for custom fields.
+- Add the new layout to list fields (GUI UPDATE)
+- Start fixing the field view in Joomla 5. #1096
 - Add power path override option on component level.
 - Fix the sql build feature. #1032
+- Add the compiler menu back.
+- Fix the CustomfolderlistField #1094
 - Add view list and single name fix.
 - Add component code name fix.
 - Add reset list of powers.
- Fix missing Factory class in plugin. #1102
- Fix plugin code display when methods and properties are missing.
 - Add Joomla powers for namespace dynamic management.
 - Add fallback option to ensure that all JCB tables and fields exist.
 - Move the powers autoloader to its own file.
@ -63,125 +82,51 @@
 - Add dynamic datatype update to schema field check.
 - Fix version_update column size.
 - Improved the Schema Table update engine.
- Improved the Schema Table update engine (more)
+- Improved the Schema Table update engine (more).
 - Fix autoloader timing, and loading.
 - Implement the Joomla Powers in JCB code, to move away from JClasses.
- Remove many of the SQL updates, to only use the Schema updates of table columns to avoid collusion.
+- Remove the SQL update, to only use the Schema updates of table columns to avoid collusion.
 - Fix the admin.css file loading on dashboard. #1112
+- Fix dynamic get data-type default to 0. #1110
 - Fix the missing model call. #1114
 - Fix the wrong $date call. #1115
 - Add the BaseDatabaseModel use statement to custom site view controller. #1119
- Fix the customfolderlist field. #1120
- Stable release of JCB 3.2.1
+- Fix the customfolderlist field. #1120

-# v3.2.0
+# v4.0.2

- Fix #1053 so that the right and left tabs display correctly in Joomla 4&5
- Move the old helper compiler files to powers
- Move the old helper extrusion files to powers
- Add Preferred Joomla Version to Components
- Add custom file file mapping for Joomla 4 and 5
- Fix the plug-in installer script builder bug #1068
- Fix Event triggers for Joomla 4 and 5 builds.
- Fix plugin field selection
- Fix plugin params tab layout
- Add issue templates
- Force autoloader to always load
- Add Factory class to the J5 Event class. #1093
- Fix [Set String Value] in placeholder table to store the value as a base64 string.
- Fix the search area layout.
- Fix the search area code line selection.
- Fix the input edit button for custom fields.
- Add the new layout to list fields (GUI UPDATE)
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+- Fix missing scripts and styles fields and methods in the site admin view model
+- Update subform field layout across JCB for cleaner look
+- Remove expansion feature
+- Fix helper area
+- Fix database mySql update in J4+
+- Remove phpspreadsheet completely from Joomla 4+
+- Add option to use powers in preflight event in the installer class
+- Fix abstract schema class function check default index warring
+- Fix dynamicGet so that the table values will load again. #1155
+- Add more pure JS to the dynamic get area
+- Add native plugin builder for Joomla 4 & 5

-# v3.2.0-beta
+# v3.2.3

- Add namspace prefix to both global, and component override level.
- Add Joomla 4 and 5 build option
- Add joomla_version to custom code.
- Add Joomla 4 and 5 correct build files.
- Fix #1026 by removing chosen everywhere.
- Resolve #1028 by adding in line helper toggle integration to all admin views.
- Remove the import and export buttons until the area is fixed.
- Add emptystate list template to all admin list views.
- Fix #1026 by adding the correct layout to the filter views.
- Fix #1026 by adding the class to the filter views.
- Fix #1026 by adding a hint to the filters that are having multiple selection.
- Fix the directional bog where a field in the filters are also called direction.
- Fix the getModel helper method fot J4+.
- Fix the AjaxController contructor class.
- Improved the getModel calls from the AxajController class.
- Improve the Joomla 4 Templates.
- Fix #1033 the response class issue for the gitea classes.
- Remove the JRegistry class to resolve #1036, #1035
- Move the defined or die below use statements.
- Add the new router view
- Fix #1041 so that custom tabs are build correctly.
- Fix #1043 so that delete function in Joomla 4 and 5 will work.
- Fix #1045 so that plug-in Structure::setMainXmlFile method will except an object.
- Fix #1042 so that it will remove line breaks and new lines from other languages as well.
- Fix #1046 so that the version restore function will work.
- Fix #1051 making sure the list view is lowercase.
- Fix #1052 so that tabs last opened is remembered and opened again on save, refresh or reopening of an item.
- Fix #1057 so that the datetime fields will be set correctly in mysql.
- Fix #1055 to add the style and scripts to all views.
- Move beta to main repo
-
-# v3.1.28
-
- Adds better remote repository management for the super power features.
- Fixes #1014 so that powers are added to components.
- Updates PHPSecLib.
- Fixed connection failure to remote server.
- Adds overriding of back-folder and git-folder on component level.
-
-# v3.1.26
-
- Fixed changelog direction so newest changes is listed at top of the file.
- Finished the init function of super powers.
- Adds rest function inside super power.
- Adds super powers to all templates.
- Updates many helper class methods to now use the utility classes.
- Adds the `spl_autoload_register` method to the component entry file (as-well).
- Moved most methods from the compiler fields class to powers. #955
- Refactored many new builder classes from the registry class.
- Converted the Content class to two builder classes.
- Adds option to add additional templates to a module.
- Resolves #1002 by adding STRING instead of WORD.
- Ported the FOF encryption class into Powers. https://git.vdm.dev/joomla/fof
- Changed all CSS and JS to use `Html::_(` instead of `$this->document->` in compiler code.
- Adds option to turn jQuery off if UIKIT 3 is added.
- Adds option to auto write injection boilerplate code in Powers area.
- Adds option to auto write service provider boilerplate code in the Powers area.
- Improved the `getDynamicContent` method and all banner locations to fetch from https://git.vdm.dev/joomla/jcb-external/ instead.
- Major stability improvements all over the new powers complier classes.
- New [base Registry class](https://git.vdm.dev/joomla/super-powers/src/branch/master/src/7e822c03-1b20-41d1-9427-f5b8d5836af7) has been created specially for JCB.
- Remember to update all plug-ins with this version update (use the package).
-
-# v3.1.24
-
- Fix the update server #978 issue.
- Fixed the change log to load all entries, not just the last one.
- Fixed #983 so that database updates are created when adding a new adminview
- Moved a few builder arrays to the Compiler Registry
- Adds super powers to JCB
- Adds Gitea API library
- Improves Power filters
- Fix #991 to add the Utilities service class
- Adds Superpower Key (SPK) replacement feature
- Adds Superpower search (GREP) feature
- Adds Power Insert/Update Classes
- Fix #995 that all update sites are using the correct URL
-
-# v3.1.19
-
- We fixed #972 so that custom code (in the header) will be added after the power namespaces
- We added a message to show when a server move failed
- We fixed the BaseConfig to not use '_' as separator
- We fixed the footable loading issue
- We removed the need for passing placeholders by reference
- We added the option to generate a CHANGELOG
- We fixed the server class to load new client if server details changed.
- We fixed the readme placeholder issue #978.
- We fixed the empty server url issue #978.
- Fixed Package import to now use the phplibsec version 3
+- Fix site view form missing classes in J4+
+- Fix permissions tab in items in J4+
+- Fix site display controller checkEditId function in J4+
+- Add class methods to the HtmlView classes in J4+
+- Fix broken toolbar call in HtmlView in J4+
+- Fix missing scripts and styles fields and methods in the site admin view model
+- Update subform field layout across JCB for cleaner look
+- Remove expansion feature
+- Fix helper area
+- Fix database mySql update in J4+
+- Remove phpspreadsheet completely from Joomla 4+
+- Add option to use powers in preflight event in the installer class
+- Fix abstract schema class function check default index warring
+- Fix dynamicGet so that the table values will load again. #1155
+- Keep jQuery in dynamicGet area for Joomla 3
+- Add native plugin builder for Joomla 4 & 5
--- a/ComponentbuilderInstallerPowerloader.php
+++ b/ComponentbuilderInstallerPowerloader.php
--- a/ComponentbuilderInstallerScript.php
+++ b/ComponentbuilderInstallerScript.php
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@

 # Joomla Component Builder ([JCB](https://www.joomlacomponentbuilder.com))

-This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
+This is a [Joomla 5.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

 ![Component Builder image](https://git.vdm.dev/joomla/Component-Builder/raw/branch/5.x/admin/assets/images/jcb-banner.jpg "The Component Builder")

@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.4-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.3-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -145,13 +145,13 @@ TODO
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 20th August, 2024
-+ *Version*: 3.2.4-alpha1
+ *Version*: 5.0.3-alpha1
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **835568**
-+ *Field count*: **2098**
-+ *File count*: **5677**
-+ *Folder count*: **496**
+ *Line count*: **830565**
+ *Field count*: **2104**
+ *File count*: **5760**
+ *Folder count*: **618**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
--- a/admin/README.txt
+++ b/admin/README.txt
@ -1,7 +1,7 @@

 # Joomla Component Builder ([JCB](https://www.joomlacomponentbuilder.com))

-This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
+This is a [Joomla 5.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

 ![Component Builder image](https://git.vdm.dev/joomla/Component-Builder/raw/branch/5.x/admin/assets/images/jcb-banner.jpg "The Component Builder")

@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.4-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.3-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -145,13 +145,13 @@ TODO
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 20th August, 2024
-+ *Version*: 3.2.4-alpha1
+ *Version*: 5.0.3-alpha1
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **835568**
-+ *Field count*: **2098**
-+ *File count*: **5677**
-+ *Folder count*: **496**
+ *Line count*: **830565**
+ *Field count*: **2104**
+ *File count*: **5760**
+ *Folder count*: **618**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
--- a/admin/access.xml
+++ b/admin/access.xml
@ -4,8 +4,6 @@
 		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
 		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
 		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
-		<action name="core.export" title="COM_COMPONENTBUILDER_EXPORT_DATA" description="COM_COMPONENTBUILDER_EXPORT_DATA_DESC" />
-		<action name="core.import" title="COM_COMPONENTBUILDER_IMPORT_DATA" description="COM_COMPONENTBUILDER_IMPORT_DATA_DESC" />
 		<action name="core.batch" title="COM_COMPONENTBUILDER_USE_BATCH" description="COM_COMPONENTBUILDER_USE_BATCH_DESC" />
 		<action name="core.version" title="COM_COMPONENTBUILDER_EDIT_VERSIONS" description="COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC" />
 		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
@ -26,8 +24,6 @@
 		<action name="admin_view.edit.own" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC" />
 		<action name="admin_view.edit.state" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC" />
 		<action name="admin_view.version" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC" />
-		<action name="admin_view.export" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC" />
-		<action name="admin_view.import" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="admin_view.submenu" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC" />
 		<action name="admin_custom_tabs.access" title="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_ACCESS" description="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_ACCESS_DESC" />
 		<action name="admin_custom_tabs.batch" title="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_BATCH_USE_DESC" />
@ -89,8 +85,6 @@
 		<action name="class_method.edit.own" title="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_OWN" description="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_OWN_DESC" />
 		<action name="class_method.edit.state" title="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_STATE" description="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_STATE_DESC" />
 		<action name="class_method.version" title="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION" description="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION_DESC" />
-		<action name="class_method.export" title="COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT" description="COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT_DESC" />
-		<action name="class_method.import" title="COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT" description="COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT_DESC" />
 		<action name="class_property.access" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_ACCESS" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_ACCESS_DESC" />
 		<action name="class_property.batch" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_USE" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_USE_DESC" />
 		<action name="class_property.create" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_CREATE" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_CREATE_DESC" />
@ -101,14 +95,11 @@
 		<action name="class_property.edit.own" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_OWN" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_OWN_DESC" />
 		<action name="class_property.edit.state" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_STATE" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_STATE_DESC" />
 		<action name="class_property.version" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION_DESC" />
-		<action name="class_property.export" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT_DESC" />
-		<action name="class_property.import" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT_DESC" />
 		<action name="compiler.access" title="COM_COMPONENTBUILDER_COMPILER_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC" />
 		<action name="compiler.clear_tmp" title="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC" />
 		<action name="compiler.compiler_animations" title="COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS_DESC" />
 		<action name="compiler.dashboard_list" title="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC" />
 		<action name="compiler.submenu" title="COM_COMPONENTBUILDER_COMPILER_SUBMENU" description="COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC" />
-		<action name="compiler.translate" title="COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC" />
 		<action name="component_admin_views.access" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="component_admin_views.batch" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="component_admin_views.create" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_CREATE" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_CREATE_DESC" />
@ -244,8 +235,6 @@
 		<action name="custom_admin_view.batch" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="custom_admin_view.dashboard_list" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESC" />
 		<action name="custom_admin_view.version" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION_DESC" />
-		<action name="custom_admin_view.export" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT_DESC" />
-		<action name="custom_admin_view.import" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="custom_admin_view.submenu" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC" />
 		<action name="custom_code.run_expansion" title="COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="custom_code.access" title="COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS_DESC" />
@ -259,8 +248,6 @@
 		<action name="custom_code.edit.own" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_OWN" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_OWN_DESC" />
 		<action name="custom_code.edit.state" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE_DESC" />
 		<action name="custom_code.version" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION_DESC" />
-		<action name="custom_code.export" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT_DESC" />
-		<action name="custom_code.import" title="COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT" description="COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC" />
 		<action name="custom_code.submenu" title="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC" />
 		<action name="dynamic_get.access" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC" />
 		<action name="dynamic_get.batch" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE_DESC" />
@ -272,8 +259,6 @@
 		<action name="dynamic_get.edit.own" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_OWN" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_OWN_DESC" />
 		<action name="dynamic_get.edit.state" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE_DESC" />
 		<action name="dynamic_get.version" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION_DESC" />
-		<action name="dynamic_get.export" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT_DESC" />
-		<action name="dynamic_get.import" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC" />
 		<action name="dynamic_get.submenu" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC" />
 		<action name="field.access" title="COM_COMPONENTBUILDER_FIELDS_ACCESS" description="COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC" />
 		<action name="field.batch" title="COM_COMPONENTBUILDER_FIELDS_BATCH_USE" description="COM_COMPONENTBUILDER_FIELDS_BATCH_USE_DESC" />
@ -285,8 +270,6 @@
 		<action name="field.edit.own" title="COM_COMPONENTBUILDER_FIELDS_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDS_EDIT_OWN_DESC" />
 		<action name="field.edit.state" title="COM_COMPONENTBUILDER_FIELDS_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDS_EDIT_STATE_DESC" />
 		<action name="field.version" title="COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION_DESC" />
-		<action name="field.export" title="COM_COMPONENTBUILDER_FIELDS_EXPORT" description="COM_COMPONENTBUILDER_FIELDS_EXPORT_DESC" />
-		<action name="field.import" title="COM_COMPONENTBUILDER_FIELDS_IMPORT" description="COM_COMPONENTBUILDER_FIELDS_IMPORT_DESC" />
 		<action name="field.submenu" title="COM_COMPONENTBUILDER_FIELDS_SUBMENU" description="COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC" />
 		<action name="fieldtype.access" title="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS" description="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC" />
 		<action name="fieldtype.batch" title="COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE" description="COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE_DESC" />
@ -297,17 +280,13 @@
 		<action name="fieldtype.edit.own" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC" />
 		<action name="fieldtype.edit.state" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
-		<action name="fieldtype.export" title="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC" />
-		<action name="fieldtype.import" title="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC" />
 		<action name="fieldtype.submenu" title="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU" description="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC" />
 		<action name="get_snippets.access" title="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC" />
 		<action name="get_snippets.custom_admin_views" title="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC" />
-		<action name="get_snippets.dashboard_list" title="COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC" />
 		<action name="get_snippets.layouts" title="COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC" />
 		<action name="get_snippets.libraries" title="COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC" />
 		<action name="get_snippets.site_views" title="COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC" />
 		<action name="get_snippets.snippets" title="COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC" />
-		<action name="get_snippets.submenu" title="COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU" description="COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC" />
 		<action name="get_snippets.templates" title="COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC" />
 		<action name="help_document.access" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS_DESC" />
 		<action name="help_document.batch" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE_DESC" />
@ -318,14 +297,8 @@
 		<action name="help_document.edit.own" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN_DESC" />
 		<action name="help_document.edit.state" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_STATE" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_STATE_DESC" />
 		<action name="help_document.version" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION_DESC" />
-		<action name="help_document.export" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC" />
-		<action name="help_document.import" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC" />
 		<action name="help_document.submenu" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC" />
-		<action name="joomla_component.backup" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.clear_tmp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.clone" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.export_jcb_packages" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.import_jcb_packages" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.access" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC" />
 		<action name="joomla_component.batch" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC" />
 		<action name="joomla_component.create" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC" />
@ -350,7 +323,6 @@
 		<action name="joomla_module.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_OWN_DESC" />
 		<action name="joomla_module.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_STATE_DESC" />
 		<action name="joomla_module.version" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION_DESC" />
-		<action name="joomla_module.export" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT_DESC" />
 		<action name="joomla_module_files_folders_urls.access" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS_DESC" />
 		<action name="joomla_module_files_folders_urls.batch" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_USE_DESC" />
 		<action name="joomla_module_files_folders_urls.create" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_CREATE_DESC" />
@ -361,7 +333,6 @@
 		<action name="joomla_module_files_folders_urls.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_OWN_DESC" />
 		<action name="joomla_module_files_folders_urls.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_STATE_DESC" />
 		<action name="joomla_module_files_folders_urls.version" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC" />
-		<action name="joomla_module.import" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT_DESC" />
 		<action name="joomla_module.submenu" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_SUBMENU_DESC" />
 		<action name="joomla_module_updates.access" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_ACCESS_DESC" />
 		<action name="joomla_module_updates.batch" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_BATCH_USE_DESC" />
@ -435,27 +406,22 @@
 		<action name="language_translation.edit.own" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN_DESC" />
 		<action name="language_translation.edit.state" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC" />
 		<action name="language_translation.version" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC" />
-		<action name="language_translation.export" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC" />
-		<action name="language_translation.import" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC" />
 		<action name="language_translation.submenu" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC" />
 		<action name="language.access" title="COM_COMPONENTBUILDER_LANGUAGES_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC" />
 		<action name="language.batch" title="COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE_DESC" />
 		<action name="language.create" title="COM_COMPONENTBUILDER_LANGUAGES_CREATE" description="COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC" />
+		<action name="language.dashboard_list" title="COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST_DESC" />
 		<action name="language.delete" title="COM_COMPONENTBUILDER_LANGUAGES_DELETE" description="COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC" />
 		<action name="language.edit" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_DESC" />
 		<action name="language.edit.own" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN_DESC" />
 		<action name="language.edit.state" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE_DESC" />
 		<action name="language.version" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC" />
-		<action name="language.export" title="COM_COMPONENTBUILDER_LANGUAGES_EXPORT" description="COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC" />
-		<action name="language.import" title="COM_COMPONENTBUILDER_LANGUAGES_IMPORT" description="COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC" />
 		<action name="language.submenu" title="COM_COMPONENTBUILDER_LANGUAGES_SUBMENU" description="COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC" />
 		<action name="layout.get_snippets" title="COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="layout.access" title="COM_COMPONENTBUILDER_LAYOUTS_ACCESS" description="COM_COMPONENTBUILDER_LAYOUTS_ACCESS_DESC" />
 		<action name="layout.batch" title="COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE" description="COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE_DESC" />
 		<action name="layout.dashboard_list" title="COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST_DESC" />
 		<action name="layout.version" title="COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION_DESC" />
-		<action name="layout.export" title="COM_COMPONENTBUILDER_LAYOUTS_EXPORT" description="COM_COMPONENTBUILDER_LAYOUTS_EXPORT_DESC" />
-		<action name="layout.import" title="COM_COMPONENTBUILDER_LAYOUTS_IMPORT" description="COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC" />
 		<action name="layout.submenu" title="COM_COMPONENTBUILDER_LAYOUTS_SUBMENU" description="COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC" />
 		<action name="library.access" title="COM_COMPONENTBUILDER_LIBRARIES_ACCESS" description="COM_COMPONENTBUILDER_LIBRARIES_ACCESS_DESC" />
 		<action name="library.batch" title="COM_COMPONENTBUILDER_LIBRARIES_BATCH_USE" description="COM_COMPONENTBUILDER_LIBRARIES_BATCH_USE_DESC" />
@ -497,8 +463,6 @@
 		<action name="placeholder.edit.own" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_OWN" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_OWN_DESC" />
 		<action name="placeholder.edit.state" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_STATE" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_STATE_DESC" />
 		<action name="placeholder.version" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION_DESC" />
-		<action name="placeholder.export" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT_DESC" />
-		<action name="placeholder.import" title="COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT" description="COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT_DESC" />
 		<action name="placeholder.submenu" title="COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU" description="COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU_DESC" />
 		<action name="power.init" title="COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS_DESC" />
 		<action name="power.push" title="COM_COMPONENTBUILDER_POWER_PUSH_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_PUSH_BUTTON_ACCESS_DESC" />
@ -542,16 +506,12 @@
 		<action name="server.edit.own" title="COM_COMPONENTBUILDER_SERVERS_EDIT_OWN" description="COM_COMPONENTBUILDER_SERVERS_EDIT_OWN_DESC" />
 		<action name="server.edit.state" title="COM_COMPONENTBUILDER_SERVERS_EDIT_STATE" description="COM_COMPONENTBUILDER_SERVERS_EDIT_STATE_DESC" />
 		<action name="server.version" title="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION_DESC" />
-		<action name="server.export" title="COM_COMPONENTBUILDER_SERVERS_EXPORT" description="COM_COMPONENTBUILDER_SERVERS_EXPORT_DESC" />
-		<action name="server.import" title="COM_COMPONENTBUILDER_SERVERS_IMPORT" description="COM_COMPONENTBUILDER_SERVERS_IMPORT_DESC" />
 		<action name="server.submenu" title="COM_COMPONENTBUILDER_SERVERS_SUBMENU" description="COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC" />
 		<action name="site_view.get_snippets" title="COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="site_view.access" title="COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS_DESC" />
 		<action name="site_view.batch" title="COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE_DESC" />
 		<action name="site_view.dashboard_list" title="COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST_DESC" />
 		<action name="site_view.version" title="COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION_DESC" />
-		<action name="site_view.export" title="COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT_DESC" />
-		<action name="site_view.import" title="COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC" />
 		<action name="site_view.submenu" title="COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC" />
 		<action name="snippet.get_snippets" title="COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="snippet.share_snippets" title="COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC" />
@ -567,8 +527,6 @@
 		<action name="snippet.batch" title="COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE" description="COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE_DESC" />
 		<action name="snippet.dashboard_list" title="COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST_DESC" />
 		<action name="snippet.version" title="COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION_DESC" />
-		<action name="snippet.export" title="COM_COMPONENTBUILDER_SNIPPETS_EXPORT" description="COM_COMPONENTBUILDER_SNIPPETS_EXPORT_DESC" />
-		<action name="snippet.import" title="COM_COMPONENTBUILDER_SNIPPETS_IMPORT" description="COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC" />
 		<action name="snippet.submenu" title="COM_COMPONENTBUILDER_SNIPPETS_SUBMENU" description="COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC" />
 		<action name="template.get_snippets" title="COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="template.access" title="COM_COMPONENTBUILDER_TEMPLATES_ACCESS" description="COM_COMPONENTBUILDER_TEMPLATES_ACCESS_DESC" />
@ -576,8 +534,6 @@
 		<action name="template.dashboard_add" title="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD_DESC" />
 		<action name="template.dashboard_list" title="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC" />
 		<action name="template.version" title="COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION_DESC" />
-		<action name="template.export" title="COM_COMPONENTBUILDER_TEMPLATES_EXPORT" description="COM_COMPONENTBUILDER_TEMPLATES_EXPORT_DESC" />
-		<action name="template.import" title="COM_COMPONENTBUILDER_TEMPLATES_IMPORT" description="COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC" />
 		<action name="template.submenu" title="COM_COMPONENTBUILDER_TEMPLATES_SUBMENU" description="COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC" />
 		<action name="validation_rule.access" title="COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS" description="COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS_DESC" />
 		<action name="validation_rule.batch" title="COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE" description="COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE_DESC" />
@ -588,8 +544,6 @@
 		<action name="validation_rule.edit.own" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_OWN" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_OWN_DESC" />
 		<action name="validation_rule.edit.state" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE_DESC" />
 		<action name="validation_rule.version" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION_DESC" />
-		<action name="validation_rule.export" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT_DESC" />
-		<action name="validation_rule.import" title="COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT" description="COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT_DESC" />
 		<action name="validation_rule.submenu" title="COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU" description="COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC" />
 	</section>
 	<section name="joomla_component">
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -14,7 +14,7 @@
 }
 .fieldMedium { width: 120px; }
 .fieldLarge { width: 320px; }
-.fieldMid { width: 80px; }
+.fieldMid { width: 89px; }
 .fieldFull { width: 100%; }
-.fieldSmall { width: 60px; }
+.fieldSmall { width: 74px; }
 code { display: inline-block; margin: 3px;}
--- a/admin/assets/images/icons/get_snippets.png
+++ b/admin/assets/images/icons/get_snippets.png
--- a/admin/assets/images/icons/importjcbpackages.png
+++ b/admin/assets/images/icons/importjcbpackages.png
--- a/admin/assets/images/icons/languages.png
+++ b/admin/assets/images/icons/languages.png
--- a/admin/assets/js/search.js
+++ b/admin/assets/js/search.js
@ -453,13 +453,14 @@ const addSelectedItem = async (value, table, row, field, line) => {
 			// show and set the save button
 			buttonUpdateItemObject.style.display = '';
 			buttonUpdateItemObject.setAttribute('onclick',"setValueCheck(" + row + ", '" + field + "', '" + table + "');");
-
-			// get top of the code line
-			let top = editorObject.charCoords({line: line, ch: 0}, "local").top;
-			// scroll to the line
-			editorObject.scrollTo(null, top - 12);
-			// select the line
-			editorObject.setCursor(line - 1);
+			// Get line info from current state.
+			const line_info = editorObject.instance.state.doc.line(line);
+			editorObject.instance.dispatch({
+				// Set selection to that entire line.
+				selection: { head: line_info.from, anchor: line_info.to },
+				// Ensure the selection is shown in viewport
+				scrollIntoView: true
+			});
 		} else {
 			// no line so no data we can't save this data
 			buttonUpdateItemObject.setAttribute('onclick', "");
--- a/admin/compiler/joomla_basic.txt
+++ b/admin/compiler/joomla_basic.txt
@ -0,0 +1,10 @@
+/**
+ * @package    ###Component_name###
+ *
+ * @created    ###CREATIONDATE###
+ * @author     ###AUTHOR### <###AUTHORWEBSITE###>
+ * @copyright  ###COPYRIGHT###
+ * @license    ###LICENSE###
+ *
+ * ###SHORT_DESCRIPTION###
+ */
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@ -1,53 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/powerloader.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Access\Exception\NotAllowed;
-use Joomla\CMS\HTML\HTMLHelper as Html;
-use Joomla\CMS\MVC\Controller\BaseController;
-
-// Access check.
-if (!Factory::getUser()->authorise('core.manage', 'com_componentbuilder'))
-{
-	throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
-}
-
-// Add CSS file for all pages
-Html::_('stylesheet', 'components/com_componentbuilder/assets/css/admin.css', ['version' => 'auto']);
-Html::_('script', 'components/com_componentbuilder/assets/js/admin.js', ['version' => 'auto']);
-
-// require helper files
-JLoader::register('ComponentbuilderHelper', __DIR__ . '/helpers/componentbuilder.php');
-\JLoader::register('ComponentbuilderEmail', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/componentbuilderemail.php'); 
-JLoader::register('JHtmlBatch_', __DIR__ . '/helpers/html/batch_.php');
-
-// Trigger the Global Admin Event
-ComponentbuilderHelper::globalEvent(Factory::getDocument());
-
-// Get an instance of the controller prefixed by Componentbuilder
-$controller = BaseController::getInstance('Componentbuilder');
-
-// Perform the Request task
-$controller->execute(Factory::getApplication()->input->get('task'));
-
-// Redirect if set by the controller
-$controller->redirect();
--- a/admin/config.xml
+++ b/admin/config.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset
-		addrulepath="/administrator/components/com_componentbuilder/models/rules"
-		addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+		addruleprefix="VDM\Component\Componentbuilder\Administrator\Rule"
+		addfieldprefix="VDM\Component\Componentbuilder\Administrator\Field"
 		name="global_config"
 		label="COM_COMPONENTBUILDER_CONFIG_GLOBAL_LABEL"
 		description="COM_COMPONENTBUILDER_CONFIG_GLOBAL_DESC">
@ -113,13 +113,13 @@
 					multiple="false"
 					filter="CMD"
 					required="true"
-					default="repeatablejcb">
+					default="repeatablejcbjfive">
 					<!-- Option Set. -->
 					<option value="joomla.form.field.subform.repeatable-table">
 						COM_COMPONENTBUILDER_CONFIG_REPEATABLETABLE_JOOMLA</option>
 					<option value="joomla.form.field.subform.repeatable">
 						COM_COMPONENTBUILDER_CONFIG_REPEATABLE_JOOMLA</option>
-					<option value="repeatablejcb">
+					<option value="repeatablejcbjfive">
 						COM_COMPONENTBUILDER_CONFIG_REPEATABLE_UIKIT</option>
 				</field>
 			</form>
--- a/admin/controller.php
+++ b/admin/controller.php
@ -1,167 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\StringHelper;
-
-/**
- * General Controller of Componentbuilder component
- */
-class ComponentbuilderController extends BaseController
-{
-	/**
-	 * Constructor.
-	 *
-	 * @param   array  $config  An optional associative array of configuration settings.
-	 * Recognized key values include 'name', 'default_task', 'model_path', and
-	 * 'view_path' (this list is not meant to be comprehensive).
-	 *
-	 * @since   3.0
-	 */
-	public function __construct($config = [])
-	{
-		// set the default view
-		$config['default_view'] = 'componentbuilder';
-
-		parent::__construct($config);
-	}
-
-	/**
-	 * display task
-	 *
-	 * @return void
-	 */
-	function display($cachable = false, $urlparams = false)
-	{
-		// set default view if not set
-		$view      = $this->input->getCmd('view', 'componentbuilder');
-		$data      = $this->getViewRelation($view);
-		$layout    = $this->input->get('layout', null, 'WORD');
-		$id        = $this->input->getInt('id');
-
-		// Check for edit form.
-		if(UtilitiesArrayHelper::check($data))
-		{
-			if ($data['edit'] && $layout == 'edit' && !$this->checkEditId('com_componentbuilder.edit.'.$data['view'], $id))
-			{
-				// Somehow the person just went to the form - we don't allow that.
-				$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
-				$this->setMessage($this->getError(), 'error');
-				// check if item was opend from other then its own list view
-				$ref     = $this->input->getCmd('ref', 0);
-				$refid   = $this->input->getInt('refid', 0);
-				// set redirect
-				if ($refid > 0 && StringHelper::check($ref))
-				{
-					// redirect to item of ref
-					$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false));
-				}
-				elseif (StringHelper::check($ref))
-				{
-
-					// redirect to ref
-					$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view='.(string)$ref, false));
-				}
-				else
-				{
-					// normal redirect back to the list view
-					$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view='.$data['views'], false));
-				}
-
-				return false;
-			}
-		}
-
-		return parent::display($cachable, $urlparams);
-	}
-
-	protected function getViewRelation($view)
-	{
-		// check the we have a value
-		if (StringHelper::check($view))
-		{
-			// the view relationships
-			$views = array(
-				'joomla_component' => 'joomla_components',
-				'joomla_module' => 'joomla_modules',
-				'joomla_plugin' => 'joomla_plugins',
-				'joomla_power' => 'joomla_powers',
-				'power' => 'powers',
-				'admin_view' => 'admin_views',
-				'custom_admin_view' => 'custom_admin_views',
-				'site_view' => 'site_views',
-				'template' => 'templates',
-				'layout' => 'layouts',
-				'dynamic_get' => 'dynamic_gets',
-				'custom_code' => 'custom_codes',
-				'class_property' => 'class_properties',
-				'class_method' => 'class_methods',
-				'placeholder' => 'placeholders',
-				'library' => 'libraries',
-				'snippet' => 'snippets',
-				'validation_rule' => 'validation_rules',
-				'field' => 'fields',
-				'fieldtype' => 'fieldtypes',
-				'language_translation' => 'language_translations',
-				'language' => 'languages',
-				'server' => 'servers',
-				'repository' => 'repositories',
-				'help_document' => 'help_documents',
-				'admin_fields' => 'admins_fields',
-				'admin_fields_conditions' => 'admins_fields_conditions',
-				'admin_fields_relations' => 'admins_fields_relations',
-				'admin_custom_tabs' => 'admins_custom_tabs',
-				'component_admin_views' => 'components_admin_views',
-				'component_site_views' => 'components_site_views',
-				'component_custom_admin_views' => 'components_custom_admin_views',
-				'component_updates' => 'components_updates',
-				'component_mysql_tweaks' => 'components_mysql_tweaks',
-				'component_custom_admin_menus' => 'components_custom_admin_menus',
-				'component_router' => 'components_routers',
-				'component_config' => 'components_config',
-				'component_dashboard' => 'components_dashboard',
-				'component_files_folders' => 'components_files_folders',
-				'component_placeholders' => 'components_placeholders',
-				'component_plugins' => 'components_plugins',
-				'component_modules' => 'components_modules',
-				'snippet_type' => 'snippet_types',
-				'library_config' => 'libraries_config',
-				'library_files_folders_urls' => 'libraries_files_folders_urls',
-				'class_extends' => 'class_extendings',
-				'joomla_module_updates' => 'joomla_modules_updates',
-				'joomla_module_files_folders_urls' => 'joomla_modules_files_folders_urls',
-				'joomla_plugin_group' => 'joomla_plugin_groups',
-				'joomla_plugin_updates' => 'joomla_plugins_updates',
-				'joomla_plugin_files_folders_urls' => 'joomla_plugins_files_folders_urls'
-					);
-			// check if this is a list view
-			if (in_array($view, $views))
-			{
-				// this is a list view
-				return array('edit' => false, 'view' => array_search($view,$views), 'views' => $view);
-			}
-			// check if it is an edit view
-			elseif (array_key_exists($view, $views))
-			{
-				// this is a edit view
-				return array('edit' => true, 'view' => $view, 'views' => $views[$view]);
-			}
-		}
-		return false;
-	}
-}
--- a/admin/controllers/admin_custom_tabs.php
+++ b/admin/controllers/admin_custom_tabs.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Admin_custom_tabs Form Controller
- */
-class ComponentbuilderControllerAdmin_custom_tabs extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Admins_custom_tabs'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('admin_custom_tabs.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('admin_custom_tabs.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('admin_custom_tabs.access', 'com_componentbuilder.admin_custom_tabs.' . (int) $recordId) && $user->authorise('admin_custom_tabs.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('admin_custom_tabs.edit', 'com_componentbuilder.admin_custom_tabs.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('admin_custom_tabs.edit.own', 'com_componentbuilder.admin_custom_tabs.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('admin_custom_tabs.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('admin_custom_tabs.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Admin_custom_tabs', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admins_custom_tabs' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/admin_fields.php
+++ b/admin/controllers/admin_fields.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Admin_fields Form Controller
- */
-class ComponentbuilderControllerAdmin_fields extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Admins_fields'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('admin_fields.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('admin_fields.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $recordId) && $user->authorise('admin_fields.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder.admin_fields.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('admin_fields.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Admin_fields', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admins_fields' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/admin_fields_conditions.php
+++ b/admin/controllers/admin_fields_conditions.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Admin_fields_conditions Form Controller
- */
-class ComponentbuilderControllerAdmin_fields_conditions extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Admins_fields_conditions'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('admin_fields_conditions.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('admin_fields_conditions.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('admin_fields_conditions.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Admin_fields_conditions', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admins_fields_conditions' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/admin_fields_relations.php
+++ b/admin/controllers/admin_fields_relations.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Admin_fields_relations Form Controller
- */
-class ComponentbuilderControllerAdmin_fields_relations extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Admins_fields_relations'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('admin_fields_relations.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('admin_fields_relations.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('admin_fields_relations.access', 'com_componentbuilder.admin_fields_relations.' . (int) $recordId) && $user->authorise('admin_fields_relations.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('admin_fields_relations.edit', 'com_componentbuilder.admin_fields_relations.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('admin_fields_relations.edit.own', 'com_componentbuilder.admin_fields_relations.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('admin_fields_relations.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('admin_fields_relations.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Admin_fields_relations', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admins_fields_relations' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@ -1,357 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\GetHelper;
-
-/**
- * Admin_view Form Controller
- */
-class ComponentbuilderControllerAdmin_view extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Admin_views'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('admin_view.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('admin_view.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $recordId) && $user->authorise('admin_view.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('admin_view.edit.own', 'com_componentbuilder.admin_view.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('admin_view.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('admin_view.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Admin_view', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admin_views' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// get the state object (Joomla\CMS\Object\CMSObject)
-		$state = $model->get('state');		
-		// if we save2copy we need to also copy linked tables found!
-		if ($state->task === 'save2copy' && $state->{'admin_view.new'})
-		{
-			// get new ID
-			$newID = $state->{'admin_view.id'};
-			// get old ID
-			$oldID = $this->input->get('id', 0, 'INT');
-			// linked tables to update
-			$_tablesArray = array(
-				'admin_fields',
-				'admin_fields_conditions',
-				'admin_fields_relations',
-				'admin_custom_tabs'
-			);
-			foreach($_tablesArray as $_updateTable)
-			{
-				// get the linked ID
-				if ($_value = GetHelper::var($_updateTable, $oldID, 'admin_view', 'id'))
-				{
-					// copy fields to new admin view
-					ComponentbuilderHelper::copyItem(/*id->*/ $_value, /*table->*/ $_updateTable, /*change->*/ array('admin_view' => $newID));
-				}
-			}
-		}
-
-		return;
-	}
-}
--- a/admin/controllers/admin_views.php
+++ b/admin/controllers/admin_views.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Admin_views Admin Controller
- */
-class ComponentbuilderControllerAdmin_views extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMIN_VIEWS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Admin_view', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('admin_view.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Admin_views');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Admin_views_'.$date->format('jS_F_Y'),'Admin views exported ('.$date->format('jS F, Y').')','admin views');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admin_views', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('admin_view.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Admin_views');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('admin_view_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'admin_views');
-				$session->set('dataType_VDM_IMPORTINTO', 'admin_view');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_ADMIN_VIEWS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admin_views', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/admins_custom_tabs.php
+++ b/admin/controllers/admins_custom_tabs.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Admins_custom_tabs Admin Controller
- */
-class ComponentbuilderControllerAdmins_custom_tabs extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Admin_custom_tabs', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/admins_fields.php
+++ b/admin/controllers/admins_fields.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Admins_fields Admin Controller
- */
-class ComponentbuilderControllerAdmins_fields extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Admin_fields', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/admins_fields_conditions.php
+++ b/admin/controllers/admins_fields_conditions.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Admins_fields_conditions Admin Controller
- */
-class ComponentbuilderControllerAdmins_fields_conditions extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Admin_fields_conditions', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/admins_fields_relations.php
+++ b/admin/controllers/admins_fields_relations.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Admins_fields_relations Admin Controller
- */
-class ComponentbuilderControllerAdmins_fields_relations extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Admin_fields_relations', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
--- a/admin/controllers/class_extendings.php
+++ b/admin/controllers/class_extendings.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Class_extendings Admin Controller
- */
-class ComponentbuilderControllerClass_extendings extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CLASS_EXTENDINGS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Class_extends', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/class_extends.php
+++ b/admin/controllers/class_extends.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Class_extends Form Controller
- */
-class ComponentbuilderControllerClass_extends extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Class_extendings'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('class_extends.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('class_extends.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('class_extends.access', 'com_componentbuilder.class_extends.' . (int) $recordId) && $user->authorise('class_extends.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('class_extends.edit', 'com_componentbuilder.class_extends.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('class_extends.edit.own', 'com_componentbuilder.class_extends.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('class_extends.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('class_extends.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Class_extends', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_extendings' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/class_method.php
+++ b/admin/controllers/class_method.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Class_method Form Controller
- */
-class ComponentbuilderControllerClass_method extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Class_methods'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('class_method.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('class_method.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('class_method.access', 'com_componentbuilder.class_method.' . (int) $recordId) && $user->authorise('class_method.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('class_method.edit', 'com_componentbuilder.class_method.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('class_method.edit.own', 'com_componentbuilder.class_method.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('class_method.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('class_method.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Class_method', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_methods' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/class_methods.php
+++ b/admin/controllers/class_methods.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Class_methods Admin Controller
- */
-class ComponentbuilderControllerClass_methods extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CLASS_METHODS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Class_method', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('class_method.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Class_methods');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Class_methods_'.$date->format('jS_F_Y'),'Class methods exported ('.$date->format('jS F, Y').')','class methods');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_methods', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('class_method.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Class_methods');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('class_method_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'class_methods');
-				$session->set('dataType_VDM_IMPORTINTO', 'class_method');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CLASS_METHODS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_methods', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/class_properties.php
+++ b/admin/controllers/class_properties.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Class_properties Admin Controller
- */
-class ComponentbuilderControllerClass_properties extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CLASS_PROPERTIES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Class_property', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('class_property.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Class_properties');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Class_properties_'.$date->format('jS_F_Y'),'Class properties exported ('.$date->format('jS F, Y').')','class properties');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_properties', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('class_property.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Class_properties');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('class_property_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'class_properties');
-				$session->set('dataType_VDM_IMPORTINTO', 'class_property');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CLASS_PROPERTIES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_properties', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/class_property.php
+++ b/admin/controllers/class_property.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Class_property Form Controller
- */
-class ComponentbuilderControllerClass_property extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Class_properties'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('class_property.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('class_property.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('class_property.access', 'com_componentbuilder.class_property.' . (int) $recordId) && $user->authorise('class_property.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('class_property.edit', 'com_componentbuilder.class_property.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('class_property.edit.own', 'com_componentbuilder.class_property.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('class_property.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('class_property.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Class_property', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_properties' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@ -1,598 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
-use Joomla\CMS\Version;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\StringHelper;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Compiler Admin Controller
- */
-class ComponentbuilderControllerCompiler extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPILER';
-
-	/**
-	 * Proxy for getModel.
-	 * @since    2.5
-	 */
-	public function getModel($name = 'Compiler', $prefix = 'ComponentbuilderModel', $config = [])
-	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-
-		return $model;
-	}
-
-	public function dashboard()
-	{
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder', false));
-		return;
-	}
-
-	/**
-	 * get all the animations used in the compiler
-	 *
-	 * @return  true on success
-	 */
-	public function getDynamicContent()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_DOWNLOAD_THE_COMPILER_ANIMATIONS');
-		// currently only those with permissions can get these images
-		if($user->authorise('compiler.compiler_animations', 'com_componentbuilder'))
-		{
-			// get the model
-			$model = $this->getModel('compiler');
-			if ($model->getDynamicContent($message))
-			{
-				$message = Text::_('COM_COMPONENTBUILDER_BALL_THE_COMPILER_ANIMATIONS_WERE_SUCCESSFULLY_DOWNLOADED_TO_THIS_JOOMLA_INSTALLB');
-				$this->setRedirect($redirect_url, $message, 'message');
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	/**
-	 * Run the Compiler
-	 *
-	 * @return  true on success
-	 */
-	public function compiler()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// currently only those with admin access can compile a component
-		if($user->authorise('core.manage', 'com_componentbuilder'))
-		{
-			$model = $this->getModel('compiler');
-			if ($model->builder())
-			{
-				$cache = Factory::getCache('mod_menu');
-				$cache->clean();
-				// TODO: Reset the users acl here as well to kill off any missing bits
-			}
-			else
-			{
-				return false;
-			}
-
-			// switch to set multi install button
-			$add_multi_install = false;
-			$add_plugin_install = false;
-			$add_module_install = false;
-			// get application
-			$app = Factory::getApplication();
-			// set redirection URL
-			$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
-			// get system messages
-			$message = $app->getUserState('com_componentbuilder.message');
-			if (empty($redirect_url) && CFactory::_('Config')->component_id > 0)
-			{
-				// start new message
-				$message = array();
-				// update the redirection URL
-				$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-				if (($pos = strpos($model->compiler->filepath['component'], "/tmp/")) !== FALSE)
-				{
-				    $url = Uri::root() . substr($model->compiler->filepath['component'], $pos + 1);
-				}
-				// check if we have plugins
-				$add_plugin_install = UtilitiesArrayHelper::check($model->compiler->filepath['plugins'], true);
-				// check if we have modules
-				$add_module_install = UtilitiesArrayHelper::check($model->compiler->filepath['modules'], true);
-				// if a multi install we set another kind of header
-				if ($add_plugin_install || $add_module_install)
-				{
-					// Message of successful builds
-					$message[] = '<h1>The Extensions were Successfully Compiled!</h1>';
-					$message[] = '<h4>You can install any one of the following extensions!</h4>';
-					// set multi install
-					$add_multi_install = true;
-				}
-				else
-				{
-					// Message of successful build
-					$message[] = '<h1>The (' . $model->compiler->filepath['component-folder'] . ') was Successfully Compiled!</h1>';
-				}
-
-				if (CFactory::_('Config')->joomla_version == Version::MAJOR_VERSION)
-				{
-					$message[] = '<p><button class="btn btn-small btn-success" onclick="Joomla.submitbutton(\'compiler.installCompiledComponent\')">';
-					$message[] = 'Install ' . $model->compiler->filepath['component-folder'] . ' on this <span class="icon-joomla icon-white"></span>Joomla website. (component)</button></p>';
-					// check if we have modules
-					if ($add_module_install)
-					{
-						foreach ($model->compiler->filepath['modules-folder'] as $module_id => $module_folder)
-						{
-							$message[] = '<p><button class="btn btn-small btn-success" onclick="Joomla.submitbutton(\'compiler.installCompiledModule\', ' . (int) $module_id . ')">';
-							$message[] = 'Install ' . $module_folder . ' on this <span class="icon-joomla icon-white"></span>Joomla website. (module)</button></p>';
-						}
-					}
-					// check if we have plugins
-					if ($add_plugin_install)
-					{
-						foreach ($model->compiler->filepath['plugins-folder'] as $plugin_id => $plugin_folder)
-						{
-							$message[] = '<p><button class="btn btn-small btn-success" onclick="Joomla.submitbutton(\'compiler.installCompiledPlugin\', ' . (int) $plugin_id . ')">';
-							$message[] = 'Install ' . $plugin_folder . ' on this <span class="icon-joomla icon-white"></span>Joomla website. (plugin)</button></p>';
-						}
-					}
-					// set multi install button
-					if ($add_multi_install)
-					{
-						$message[] = '<h4>You can install all compiled extensions!</h4>';
-						$message[] = '<p><button class="btn btn-small btn-success" onclick="Joomla.submitbutton(\'compiler.installCompiledExtensions\')">';
-						$message[] = 'Install all above extensions on this <span class="icon-joomla icon-white"></span>Joomla! website.</button></p>';
-					}
-				}
-				$message[] = '<h2>Total time saved</h2>';
-				$message[] = '<ul>';
-				$message[] = '<li>Total folders created: <b>#'.'##FOLDER_COUNT##'.'#</b></li>';
-				$message[] = '<li>Total files created: <b>#'.'##FILE_COUNT##'.'#</b></li>';
-				$message[] = '<li>Total fields created: <b>#'.'##FIELD_COUNT##'.'#</b></li>';
-				$message[] = '<li>Total lines written: <b>#'.'##LINE_COUNT##'.'#</b></li>';
-				$message[] = '<li>A4 Book of: <b>#'.'##PAGE_COUNT##'.'# pages</b></li>';
-				$message[] = '</ul>';
-				$message[] = '<p><b>#'.'##totalHours##'.'# Hours</b> or <b>#'.'##totalDays##'.'# Eight Hour Days</b> <em>(actual time you saved)</em><br />';
-				$message[] = '<small>(if creating a folder and file took <b>5 seconds</b> and writing one line of code took <b>10 seconds</b>, never making one mistake or taking any coffee break.)</small><br />';
-				$message[] = '<b>#'.'##actualHoursSpent##'.'# Hours</b> or <b>#'.'##actualDaysSpent##'.'# Eight Hour Days</b> <em>(the actual time you spent)</em><br />';
-				$message[] = '<small>(with the following break down: <b>debugging @#'.'##debuggingHours##'.'#hours</b> = codingtime / 4; <b>planning @#'.'##planningHours##'.'#hours</b> = codingtime / 7; <b>mapping @#'.'##mappingHours##'.'#hours</b> = codingtime / 10; <b>office @#'.'##officeHours##'.'#hours</b> = codingtime / 6;)</small></p>';
-				$message[] = '<p><b>#'.'##actualTotalHours##'.'# Hours</b> or <b>#'.'##actualTotalDays##'.'# Eight Hour Days</b> <em>(a total of the realistic time frame for this project)</em><br />';
-				$message[] = '<small>(if creating a folder and file took <b>5 seconds</b> and writing one line of code took <b>10 seconds</b>, with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)</small></p>';
-				$message[] = '<p>Project duration: <b>'.$model->compiler->projectWeekTime. ' weeks</b> or <b>#'.'##projectMonthTime##'.'# months</b></p>';
-				// check if we have modules or plugins
-				if ($add_multi_install)
-				{
-					$message[] = '<h2>Path to Zip Files</h2>';
-					$message[] = '<p><b>Component Path:</b> <code>' . $model->compiler->filepath['component'] . '</code><br />';
-					$message[] = '<b>Component URL:</b> <code>' . $url . '</code><br /><br />';
-					// load modules if found
-					if ($add_module_install)
-					{
-						$module_urls = array();
-						// load the modules path/url
-						foreach ($model->compiler->filepath['modules'] as $module_id => $module_path)
-						{
-							// set module path
-							$message[] = '<b>Module Path:</b> <code>' . $module_path . '</code><br />';
-							if (($pos = strpos($module_path, "/tmp/")) !== FALSE)
-							{
-								$module_urls[$module_id] = Uri::root() . substr($module_path, $pos + 1);
-								$message[] = '<b>Module URL:</b> <code>' . $module_urls[$module_id] . '</code><br />';
-							}
-						}
-					}
-					// load plugins if found
-					if ($add_plugin_install)
-					{
-						$plugin_urls = array();
-						// load the plugins path/url
-						foreach ($model->compiler->filepath['plugins'] as $plugin_id => $plugin_path)
-						{
-							// set plugin path
-							$message[] = '<b>Plugin Path:</b> <code>' . $plugin_path . '</code><br />';
-							if (($pos = strpos($plugin_path, "/tmp/")) !== FALSE)
-							{
-								$plugin_urls[$plugin_id] = Uri::root() . substr($plugin_path, $pos + 1);
-								$message[] = '<b>Plugin URL:</b> <code>' . $plugin_urls[$plugin_id] . '</code><br />';
-							}
-						}
-					}
-					$message[] = '<br /><small>Hey! you can also download these zip files right now!</small><br />';
-					$message[] = '<a class="btn btn-success" href="' . $url . '" ><span class="icon-download icon-white"></span>Download Component</a>&nbsp;&nbsp;';
-					// load the module download URL's
-					if (isset($module_urls) && UtilitiesArrayHelper::check($module_urls))
-					{
-						foreach ($module_urls as $module_id => $module_url)
-						{
-							$message[] = ' <a class="btn btn-success" href="' . $module_url . '" >';
-							$message[] = '<span class="icon-download icon-white"></span>Download ' . $model->compiler->filepath['modules-folder'][$module_id] . '</a>&nbsp;&nbsp;';
-						}
-					}
-					// load the plugin download URL's
-					if (isset($plugin_urls) && UtilitiesArrayHelper::check($plugin_urls))
-					{
-						foreach ($plugin_urls as $plugin_id => $plugin_url)
-						{
-							$message[] = ' <a class="btn btn-success" href="' . $plugin_url . '" >';
-							$message[] = '<span class="icon-download icon-white"></span>Download ' . $model->compiler->filepath['plugins-folder'][$plugin_id] . '</a>&nbsp;&nbsp;';
-						}
-					}
-					$message[] = '</p>';
-					$message[] = '<p><small><b>Remember!</b> These zip files are in your tmp folder and therefore publicly accessible until you click [Clear tmp]!</small></p>';
-				}
-				else
-				{
-					$message[] = '<h2>Path to Zip File</h2>';
-					$message[] = '<p><b>Path:</b> <code>' . $model->compiler->filepath['component'] . '</code><br />';
-					$message[] = '<b>URL:</b> <code>' . $url . '</code><br /><br />';
-					$message[] = '<small>Hey! you can also download the zip file right now!</small><br />';
-					$message[] = '<a class="btn btn-success" href="' . $url . '" ><span class="icon-download icon-white"></span>Download</a></p>';
-					$message[] = '<p><small><b>Remember!</b> This zip file is in your tmp folder and therefore publicly accessible until you click [Clear tmp]!</small> </p>';
-				}
-				$message[] = '<p><small>Compilation took <b>#'.'##COMPILER_TIMER##'.'#</b> seconds to complete.</small> </p>';
-				// pass the message via the user state... wow this is painful
-				$app->setUserState('com_componentbuilder.success_message',
-					CFactory::_('Placeholder')->update(
-						implode(PHP_EOL, $message),
-						CFactory::_('Compiler.Builder.Content.One')->allActive()
-					)
-				);
-				// set redirect
-				$this->setRedirect($redirect_url, '<h2>Successful Build!</h2>', 'message');
-				$app->setUserState('com_componentbuilder.component_folder_name', $model->compiler->filepath['component-folder']);
-				// check if we have modules
-				if ($add_module_install)
-				{
-					$app->setUserState('com_componentbuilder.modules_folder_name', $model->compiler->filepath['modules-folder']);
-				}
-				// check if we have plugins
-				if ($add_plugin_install)
-				{
-					$app->setUserState('com_componentbuilder.plugins_folder_name', $model->compiler->filepath['plugins-folder']);
-				}
-			} 
-			else
-			{
-				// wipe out the user state when we're going to redirect
-				$app->setUserState('com_componentbuilder.redirect_url', '');
-				$app->setUserState('com_componentbuilder.message', '');
-				$app->setUserState('com_componentbuilder.extension_message', '');
-				$app->setUserState('com_componentbuilder.component_folder_name', '');
-				$app->setUserState('com_componentbuilder.modules_folder_name', '');
-				$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-				$app->setUserState('com_componentbuilder.success_message', '');
-				// set redirect
-				$this->setRedirect($redirect_url, $message);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Install All Compiled Extensions
-	 *
-	 * @return  true on success
-	 */
-	public function installCompiledExtensions()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_INSTALL_THESE_EXTENSIONS');
-		// currently only those with admin access can install a component via JCB
-		if($user->authorise('core.manage'))
-		{
-			$message = Text::_('COM_COMPONENTBUILDER_COULD_NOT_INSTALL_EXTENSIONS');
-			$_message = array('success' => array(), 'error' => array());
-			$app = Factory::getApplication();
-			// start file name array
-			$fileNames = array();
-			$fileNames[] = $app->getUserState('com_componentbuilder.component_folder_name', null);
-			// check if we have modules
-			$fileNames = UtilitiesArrayHelper::merge(array($fileNames, $app->getUserState('com_componentbuilder.modules_folder_name', array()) ));
-			// check if we have plugins
-			$fileNames = UtilitiesArrayHelper::merge(array($fileNames, $app->getUserState('com_componentbuilder.plugins_folder_name', array()) ));
-
-			// wipe out the user c-m-p since we are done with them all
-			$app->setUserState('com_componentbuilder.component_folder_name', '');
-			$app->setUserState('com_componentbuilder.modules_folder_name', '');
-			$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-			$app->setUserState('com_componentbuilder.success_message', '');
-
-			// loop and install all extensions found
-			foreach ($fileNames as $fileName)
-			{
-				if ($this->installExtension($fileName))
-				{
-					$_message['success'][] = Text::sprintf('COM_COMPONENTBUILDER_SZIP_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION', $fileName);
-				}
-				else
-				{
-					$_message['error'][] = Text::sprintf('COM_COMPONENTBUILDER_SZIP_COULD_NOT_BE_INSTALLED', $fileName);
-				}
-			}
-			// catch errors
-			if (UtilitiesArrayHelper::check($_message['error']))
-			{
-				$app->enqueueMessage(implode('<br />', $_message['error']), 'Error');
-			}
-			// build success message
-			if (UtilitiesArrayHelper::check($_message['success']))
-			{
-				$this->setRedirect($redirect_url, implode('<br />', $_message['success']), 'message');
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	/**
-	 * Install Compiled Component
-	 *
-	 * @return  true on success
-	 */
-	public function installCompiledComponent()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_INSTALL_THE_COMPONENT');
-		// currently only those with admin access can install a component via JCB
-		if($user->authorise('core.manage'))
-		{
-			$message = Text::_('COM_COMPONENTBUILDER_COULD_NOT_INSTALL_COMPONENT');
-			$app = Factory::getApplication();
-			$fileName = $app->getUserState('com_componentbuilder.component_folder_name');
-
-			// wipe out the user c-m-p since we are done with them all
-			$app->setUserState('com_componentbuilder.component_folder_name', '');
-			$app->setUserState('com_componentbuilder.modules_folder_name', '');
-			$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-			$app->setUserState('com_componentbuilder.success_message', '');
-
-			if ($this->installExtension($fileName))
-			{
-				$message = Text::sprintf('COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION', $fileName);
-				$this->setRedirect($redirect_url, $message, 'message');
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	/**
-	 * Install Compiled Module
-	 *
-	 * @return  true on success
-	 */
-	public function installCompiledModule()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_INSTALL_THE_MODULE');
-		// currently only those with admin access can install a molule via JCB
-		if($user->authorise('core.manage'))
-		{
-			$message = Text::_('COM_COMPONENTBUILDER_COULD_NOT_INSTALL_MODULE');
-			$app = Factory::getApplication();
-			$fileNames = $app->getUserState('com_componentbuilder.modules_folder_name');
-
-			// wipe out the user c-m-p since we are done with them all
-			$app->setUserState('com_componentbuilder.component_folder_name', '');
-			$app->setUserState('com_componentbuilder.modules_folder_name', '');
-			$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-			$app->setUserState('com_componentbuilder.success_message', '');
-
-			if (UtilitiesArrayHelper::check($fileNames))
-			{
-				$jinput = Factory::getApplication()->input;
-				$moduleId = $jinput->post->get('install_item_id', 0, 'INT');
-				if ($moduleId > 0 && isset($fileNames[$moduleId]) && $this->installExtension($fileNames[$moduleId]))
-				{
-					$message = Text::sprintf('COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION', $fileNames[$moduleId]);
-					$this->setRedirect($redirect_url, $message, 'message');
-					return true;
-				}
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	/**
-	 * Install Compiled Plugin
-	 *
-	 * @return  true on success
-	 */
-	public function installCompiledPlugin()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_INSTALL_THE_PLUGIN');
-		// currently only those with admin access can install a plugin via JCB
-		if($user->authorise('core.manage'))
-		{
-			$message = Text::_('COM_COMPONENTBUILDER_COULD_NOT_INSTALL_PLUGIN');
-			$app = Factory::getApplication();
-			$fileNames = $app->getUserState('com_componentbuilder.plugins_folder_name');
-
-			// wipe out the user c-m-p since we are done with them all
-			$app->setUserState('com_componentbuilder.component_folder_name', '');
-			$app->setUserState('com_componentbuilder.modules_folder_name', '');
-			$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-			$app->setUserState('com_componentbuilder.success_message', '');
-
-			if (UtilitiesArrayHelper::check($fileNames))
-			{
-				$jinput = Factory::getApplication()->input;
-				$pluginId = $jinput->post->get('install_item_id', 0, 'INT');
-				if ($pluginId > 0 && isset($fileNames[$pluginId]) && $this->installExtension($fileNames[$pluginId]))
-				{
-					$message = Text::sprintf('COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION', $fileNames[$pluginId]);
-					$this->setRedirect($redirect_url, $message, 'message');
-					return true;
-				}
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	/**
-	 * Install Extension
-	 *
-	 * @return  true on success
-	 */
-	protected function installExtension($fileName)
-	{
-		// check that the model is set
-		if (!isset($this->_compiler_model))
-		{
-			// get the compiler model
-			$this->_compiler_model = $this->getModel('compiler');
-		}
-		// set the language if not set
-		if (!isset($this->_installer_lang))
-		{
-			$this->_installer_lang = Factory::getLanguage();
-			$extension = 'com_installer';
-			$base_dir = JPATH_ADMINISTRATOR;
-			$language_tag = 'en-GB';
-			$reload = true;
-			$this->_installer_lang->load($extension, $base_dir, $language_tag, $reload);
-		}
-		// make sure we have a string
-		if (StringHelper::check($fileName))
-		{
-			return $this->_compiler_model->install($fileName.'.zip');
-		}
-		return false;
-	}
-
-	/**
-	 * Clear tmp folder
-	 *
-	 * @return  true on success
-	 */
-	public function clearTmp()
-	{
-		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = Text::_('COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER');
-		if($user->authorise('compiler.clear_tmp', 'com_componentbuilder') && $user->authorise('core.manage', 'com_componentbuilder'))
-		{
-			// get the model
-			$model = $this->getModel('compiler');
-			// get tmp folder
-			$comConfig = Factory::getConfig();
-			$tmp = $comConfig->get('tmp_path');
-			if ($model->emptyFolder($tmp))
-			{
-				$message = Text::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB');
-				$this->setRedirect($redirect_url, $message, 'message');
-				// get application
-				$app = Factory::getApplication();
-				// wipe out the user c-m-p since we are done with them all
-				$app->setUserState('com_componentbuilder.component_folder_name', '');
-				$app->setUserState('com_componentbuilder.modules_folder_name', '');
-				$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-				$app->setUserState('com_componentbuilder.success_message', '');
-
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-
-	/**
-	 * Run the Translator
-	 *
-	 * @return  void
-	 */
-	public function runTranslator()
-	{
-		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
-		// set massage
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_TRANSLATOR_MODULE');
-		// check if this user has the right to run expansion
-		if($user->authorise('compiler.run_translator', 'com_componentbuilder'))
-		{
-			// set massage
-			$message = Text::_('COM_COMPONENTBUILDER_TRANSLATION_FAILED_SINCE_THERE_ARE_NO_COMPONENTS_LINKED_WITH_TRANSLATION_TOOLS');
-			// run translator via API
-			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.translator');
-			// is there a message returned
-			if (!is_numeric($result) && StringHelper::check($result))
-			{
-				$this->setRedirect($redirect_url, $result);
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-}
--- a/admin/controllers/component_admin_views.php
+++ b/admin/controllers/component_admin_views.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_admin_views Form Controller
- */
-class ComponentbuilderControllerComponent_admin_views extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_admin_views'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_admin_views.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_admin_views.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_admin_views.access', 'com_componentbuilder.component_admin_views.' . (int) $recordId) && $user->authorise('component_admin_views.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_admin_views.edit', 'com_componentbuilder.component_admin_views.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_admin_views.edit.own', 'com_componentbuilder.component_admin_views.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_admin_views.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_admin_views.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_admin_views', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_admin_views' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_config.php
+++ b/admin/controllers/component_config.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_config Form Controller
- */
-class ComponentbuilderControllerComponent_config extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_config'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_config.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_config.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_config.access', 'com_componentbuilder.component_config.' . (int) $recordId) && $user->authorise('component_config.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_config.edit', 'com_componentbuilder.component_config.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_config.edit.own', 'com_componentbuilder.component_config.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_config.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_config.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_config', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_config' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_custom_admin_menus.php
+++ b/admin/controllers/component_custom_admin_menus.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_custom_admin_menus Form Controller
- */
-class ComponentbuilderControllerComponent_custom_admin_menus extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_custom_admin_menus'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_custom_admin_menus.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_custom_admin_menus.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_custom_admin_menus.access', 'com_componentbuilder.component_custom_admin_menus.' . (int) $recordId) && $user->authorise('component_custom_admin_menus.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_custom_admin_menus.edit', 'com_componentbuilder.component_custom_admin_menus.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_custom_admin_menus.edit.own', 'com_componentbuilder.component_custom_admin_menus.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_custom_admin_menus.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_custom_admin_menus.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_custom_admin_menus', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_custom_admin_menus' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_custom_admin_views.php
+++ b/admin/controllers/component_custom_admin_views.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_custom_admin_views Form Controller
- */
-class ComponentbuilderControllerComponent_custom_admin_views extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_custom_admin_views'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_custom_admin_views.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_custom_admin_views.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_custom_admin_views.access', 'com_componentbuilder.component_custom_admin_views.' . (int) $recordId) && $user->authorise('component_custom_admin_views.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_custom_admin_views.edit', 'com_componentbuilder.component_custom_admin_views.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_custom_admin_views.edit.own', 'com_componentbuilder.component_custom_admin_views.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_custom_admin_views.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_custom_admin_views.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_custom_admin_views', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_custom_admin_views' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_dashboard.php
+++ b/admin/controllers/component_dashboard.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_dashboard Form Controller
- */
-class ComponentbuilderControllerComponent_dashboard extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_dashboard'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_dashboard.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_dashboard.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_dashboard.access', 'com_componentbuilder.component_dashboard.' . (int) $recordId) && $user->authorise('component_dashboard.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_dashboard.edit', 'com_componentbuilder.component_dashboard.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_dashboard.edit.own', 'com_componentbuilder.component_dashboard.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_dashboard.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_dashboard.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_dashboard', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_dashboard' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_files_folders.php
+++ b/admin/controllers/component_files_folders.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_files_folders Form Controller
- */
-class ComponentbuilderControllerComponent_files_folders extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_files_folders'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_files_folders.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_files_folders.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_files_folders.access', 'com_componentbuilder.component_files_folders.' . (int) $recordId) && $user->authorise('component_files_folders.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_files_folders.edit', 'com_componentbuilder.component_files_folders.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_files_folders.edit.own', 'com_componentbuilder.component_files_folders.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_files_folders.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_files_folders.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_files_folders', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_files_folders' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_modules.php
+++ b/admin/controllers/component_modules.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_modules Form Controller
- */
-class ComponentbuilderControllerComponent_modules extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_modules'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_modules.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_modules.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_modules.access', 'com_componentbuilder.component_modules.' . (int) $recordId) && $user->authorise('component_modules.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_modules.edit', 'com_componentbuilder.component_modules.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_modules.edit.own', 'com_componentbuilder.component_modules.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_modules.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_modules.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_modules', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_modules' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_mysql_tweaks.php
+++ b/admin/controllers/component_mysql_tweaks.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_mysql_tweaks Form Controller
- */
-class ComponentbuilderControllerComponent_mysql_tweaks extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_mysql_tweaks'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_mysql_tweaks.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_mysql_tweaks.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_mysql_tweaks.access', 'com_componentbuilder.component_mysql_tweaks.' . (int) $recordId) && $user->authorise('component_mysql_tweaks.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_mysql_tweaks.edit', 'com_componentbuilder.component_mysql_tweaks.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_mysql_tweaks.edit.own', 'com_componentbuilder.component_mysql_tweaks.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_mysql_tweaks.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_mysql_tweaks.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_mysql_tweaks', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_mysql_tweaks' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_placeholders.php
+++ b/admin/controllers/component_placeholders.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_placeholders Form Controller
- */
-class ComponentbuilderControllerComponent_placeholders extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_placeholders'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_placeholders.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_placeholders.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_placeholders.access', 'com_componentbuilder.component_placeholders.' . (int) $recordId) && $user->authorise('component_placeholders.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_placeholders.edit', 'com_componentbuilder.component_placeholders.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_placeholders.edit.own', 'com_componentbuilder.component_placeholders.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_placeholders.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_placeholders.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_placeholders', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_placeholders' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_plugins.php
+++ b/admin/controllers/component_plugins.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_plugins Form Controller
- */
-class ComponentbuilderControllerComponent_plugins extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_plugins'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_plugins.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_plugins.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_plugins.access', 'com_componentbuilder.component_plugins.' . (int) $recordId) && $user->authorise('component_plugins.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_plugins.edit', 'com_componentbuilder.component_plugins.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_plugins.edit.own', 'com_componentbuilder.component_plugins.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_plugins.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_plugins.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_plugins', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_plugins' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_router.php
+++ b/admin/controllers/component_router.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_router Form Controller
- */
-class ComponentbuilderControllerComponent_router extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_routers'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_router.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_router.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_router.access', 'com_componentbuilder.component_router.' . (int) $recordId) && $user->authorise('component_router.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_router.edit', 'com_componentbuilder.component_router.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_router.edit.own', 'com_componentbuilder.component_router.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_router.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_router.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_router', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_routers' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_site_views.php
+++ b/admin/controllers/component_site_views.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Component_site_views Form Controller
- */
-class ComponentbuilderControllerComponent_site_views extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_site_views'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_site_views.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_site_views.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_site_views.access', 'com_componentbuilder.component_site_views.' . (int) $recordId) && $user->authorise('component_site_views.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_site_views.edit', 'com_componentbuilder.component_site_views.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_site_views.edit.own', 'com_componentbuilder.component_site_views.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_site_views.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_site_views.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_site_views', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_site_views' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/component_updates.php
+++ b/admin/controllers/component_updates.php
@ -1,360 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\GetHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\StringHelper;
-
-/**
- * Component_updates Form Controller
- */
-class ComponentbuilderControllerComponent_updates extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Components_updates'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('component_updates.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('component_updates.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('component_updates.access', 'com_componentbuilder.component_updates.' . (int) $recordId) && $user->authorise('component_updates.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('component_updates.edit', 'com_componentbuilder.component_updates.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('component_updates.edit.own', 'com_componentbuilder.component_updates.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('component_updates.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('component_updates.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Component_updates', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=components_updates' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// update the component version to match the updated last version
-		if (isset($validData['joomla_component']) && is_numeric($validData['joomla_component']) && $validData['joomla_component'] > 0)
-		{
-			// we must load the data (since if changed in the saved method, the $validData will not reflect this change)
-			if (($version_update = GetHelper::var(
-				'component_updates',
-				$validData['joomla_component'],
-				'joomla_component',
-				'version_update')) !== false)
-			{
-				$version_update = json_decode($version_update, true);
-
-				$objectUpdate = new \stdClass();
-				$objectUpdate->id = (int) $validData['joomla_component'];
-				if (UtilitiesArrayHelper::check($version_update)
-					&& ($component_version = end($version_update)['version'])
-					&& StringHelper::check($component_version))
-				{
-					$objectUpdate->component_version = $component_version;
-				}
-				// be sure to update the table if we have a value
-				if (isset($objectUpdate->component_version))
-				{
-					Factory::getDbo()->updateObject('#__componentbuilder_joomla_component', $objectUpdate, 'id');
-				}
-			}
-		}
-
-		return;
-	}
-}
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@ -1,28 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Componentbuilder Admin Controller
- */
-class ComponentbuilderControllerComponentbuilder extends AdminController
-{
-
-}
--- a/admin/controllers/components_admin_views.php
+++ b/admin/controllers/components_admin_views.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_admin_views Admin Controller
- */
-class ComponentbuilderControllerComponents_admin_views extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_admin_views', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_config.php
+++ b/admin/controllers/components_config.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_config Admin Controller
- */
-class ComponentbuilderControllerComponents_config extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CONFIG';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_config', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_custom_admin_menus.php
+++ b/admin/controllers/components_custom_admin_menus.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_custom_admin_menus Admin Controller
- */
-class ComponentbuilderControllerComponents_custom_admin_menus extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_custom_admin_menus', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_custom_admin_views.php
+++ b/admin/controllers/components_custom_admin_views.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_custom_admin_views Admin Controller
- */
-class ComponentbuilderControllerComponents_custom_admin_views extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_custom_admin_views', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_dashboard.php
+++ b/admin/controllers/components_dashboard.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_dashboard Admin Controller
- */
-class ComponentbuilderControllerComponents_dashboard extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_dashboard', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_files_folders.php
+++ b/admin/controllers/components_files_folders.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_files_folders Admin Controller
- */
-class ComponentbuilderControllerComponents_files_folders extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_files_folders', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_modules.php
+++ b/admin/controllers/components_modules.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_modules Admin Controller
- */
-class ComponentbuilderControllerComponents_modules extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_MODULES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_modules', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_mysql_tweaks.php
+++ b/admin/controllers/components_mysql_tweaks.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_mysql_tweaks Admin Controller
- */
-class ComponentbuilderControllerComponents_mysql_tweaks extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_mysql_tweaks', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_placeholders.php
+++ b/admin/controllers/components_placeholders.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_placeholders Admin Controller
- */
-class ComponentbuilderControllerComponents_placeholders extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_PLACEHOLDERS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_placeholders', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_plugins.php
+++ b/admin/controllers/components_plugins.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_plugins Admin Controller
- */
-class ComponentbuilderControllerComponents_plugins extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_PLUGINS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_plugins', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_routers.php
+++ b/admin/controllers/components_routers.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_routers Admin Controller
- */
-class ComponentbuilderControllerComponents_routers extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_ROUTERS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_router', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_site_views.php
+++ b/admin/controllers/components_site_views.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_site_views Admin Controller
- */
-class ComponentbuilderControllerComponents_site_views extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_site_views', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/components_updates.php
+++ b/admin/controllers/components_updates.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Components_updates Admin Controller
- */
-class ComponentbuilderControllerComponents_updates extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_UPDATES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Component_updates', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Custom_admin_view Form Controller
- */
-class ComponentbuilderControllerCustom_admin_view extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Custom_admin_views'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('custom_admin_view.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return parent::allowAdd($data);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $recordId) && $user->authorise('custom_admin_view.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('core.edit', 'com_componentbuilder.custom_admin_view.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('core.edit.own', 'com_componentbuilder.custom_admin_view.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('core.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return parent::allowEdit($data, $key);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Custom_admin_view', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_admin_views' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/custom_admin_views.php
+++ b/admin/controllers/custom_admin_views.php
@ -1,124 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Custom_admin_views Admin Controller
- */
-class ComponentbuilderControllerCustom_admin_views extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Custom_admin_view', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('custom_admin_view.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Custom_admin_views');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Custom_admin_views_'.$date->format('jS_F_Y'),'Custom admin views exported ('.$date->format('jS F, Y').')','custom admin views');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_admin_views', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('custom_admin_view.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Custom_admin_views');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('custom_admin_view_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'custom_admin_views');
-				$session->set('dataType_VDM_IMPORTINTO', 'custom_admin_view');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_ADMIN_VIEWS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_admin_views', false), $message, 'error');
-		return;
-	}
-
-	public function getSnippets()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the import snippets custom admin view
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=get_snippets', false));
-		return;
-	}
-}
--- a/admin/controllers/custom_code.php
+++ b/admin/controllers/custom_code.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Custom_code Form Controller
- */
-class ComponentbuilderControllerCustom_code extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Custom_codes'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('custom_code.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('custom_code.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('custom_code.access', 'com_componentbuilder.custom_code.' . (int) $recordId) && $user->authorise('custom_code.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('custom_code.edit', 'com_componentbuilder.custom_code.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('custom_code.edit.own', 'com_componentbuilder.custom_code.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('custom_code.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('custom_code.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Custom_code', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_codes' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/custom_codes.php
+++ b/admin/controllers/custom_codes.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Custom_codes Admin Controller
- */
-class ComponentbuilderControllerCustom_codes extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CUSTOM_CODES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Custom_code', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('custom_code.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Custom_codes');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Custom_codes_'.$date->format('jS_F_Y'),'Custom codes exported ('.$date->format('jS F, Y').')','custom codes');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_codes', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('custom_code.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Custom_codes');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('custom_code_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'custom_codes');
-				$session->set('dataType_VDM_IMPORTINTO', 'custom_code');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_CODES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_codes', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/dynamic_get.php
+++ b/admin/controllers/dynamic_get.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Dynamic_get Form Controller
- */
-class ComponentbuilderControllerDynamic_get extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Dynamic_gets'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('dynamic_get.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('dynamic_get.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('dynamic_get.access', 'com_componentbuilder.dynamic_get.' . (int) $recordId) && $user->authorise('dynamic_get.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('dynamic_get.edit', 'com_componentbuilder.dynamic_get.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('dynamic_get.edit.own', 'com_componentbuilder.dynamic_get.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('dynamic_get.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('dynamic_get.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Dynamic_get', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=dynamic_gets' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/dynamic_gets.php
+++ b/admin/controllers/dynamic_gets.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Dynamic_gets Admin Controller
- */
-class ComponentbuilderControllerDynamic_gets extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_DYNAMIC_GETS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Dynamic_get', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('dynamic_get.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Dynamic_gets');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Dynamic_gets_'.$date->format('jS_F_Y'),'Dynamic gets exported ('.$date->format('jS F, Y').')','dynamic gets');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=dynamic_gets', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('dynamic_get.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Dynamic_gets');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('dynamic_get_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'dynamic_gets');
-				$session->set('dataType_VDM_IMPORTINTO', 'dynamic_get');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_DYNAMIC_GETS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=dynamic_gets', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/field.php
+++ b/admin/controllers/field.php
@ -1,328 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Field Form Controller
- */
-class ComponentbuilderControllerField extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Fields'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('field.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('field.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('field.access', 'com_componentbuilder.field.' . (int) $recordId) && $user->authorise('field.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('field.edit', 'com_componentbuilder.field.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('field.edit.own', 'com_componentbuilder.field.' . $recordId))
-				{
-					// Fallback on edit.own. Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then do the test.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('field.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('field.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Field', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fields' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/fields.php
+++ b/admin/controllers/fields.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Fields Admin Controller
- */
-class ComponentbuilderControllerFields extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_FIELDS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Field', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('field.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Fields');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Fields_'.$date->format('jS_F_Y'),'Fields exported ('.$date->format('jS F, Y').')','fields');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fields', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('field.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Fields');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('field_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'fields');
-				$session->set('dataType_VDM_IMPORTINTO', 'field');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fields', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/fieldtype.php
+++ b/admin/controllers/fieldtype.php
@ -1,328 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Fieldtype Form Controller
- */
-class ComponentbuilderControllerFieldtype extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Fieldtypes'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('fieldtype.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('fieldtype.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('fieldtype.access', 'com_componentbuilder.fieldtype.' . (int) $recordId) && $user->authorise('fieldtype.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('fieldtype.edit', 'com_componentbuilder.fieldtype.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('fieldtype.edit.own', 'com_componentbuilder.fieldtype.' . $recordId))
-				{
-					// Fallback on edit.own. Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then do the test.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('fieldtype.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('fieldtype.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Fieldtype', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fieldtypes' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/fieldtypes.php
+++ b/admin/controllers/fieldtypes.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Fieldtypes Admin Controller
- */
-class ComponentbuilderControllerFieldtypes extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_FIELDTYPES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Fieldtype', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('fieldtype.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Fieldtypes');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Fieldtypes_'.$date->format('jS_F_Y'),'Fieldtypes exported ('.$date->format('jS F, Y').')','fieldtypes');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fieldtypes', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('fieldtype.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Fieldtypes');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('fieldtype_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'fieldtypes');
-				$session->set('dataType_VDM_IMPORTINTO', 'fieldtype');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDTYPES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fieldtypes', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/get_snippets.php
+++ b/admin/controllers/get_snippets.php
@ -1,105 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Get_snippets Admin Controller
- */
-class ComponentbuilderControllerGet_snippets extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_GET_SNIPPETS';
-
-	/**
-	 * Proxy for getModel.
-	 * @since    2.5
-	 */
-	public function getModel($name = 'Get_snippets', $prefix = 'ComponentbuilderModel', $config = [])
-	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-
-		return $model;
-	}
-
-	public function dashboard()
-	{
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder', false));
-		return;
-	}
-
-	public function openLibraries()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the libraries
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=libraries', false));
-		return;
-	}
-
-	public function openSnippets()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the snippets
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=snippets', false));
-		return;
-	}
-
-	public function openSiteViews()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the site views
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=site_views', false));
-		return;
-	}
-
-	public function openCustomAdminViews()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the custom admin views
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_admin_views', false));
-		return;
-	}
-
-	public function openTemplates()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the templates
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=templates', false));
-		return;
-	}
-
-	public function openLayouts()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the layouts
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=layouts', false));
-		return;
-	}
-}
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@ -1,119 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\Session\Session;
-use Joomla\Utilities\ArrayHelper;
-
-/**
- * Componentbuilder Help Base Controller
- */
-class ComponentbuilderControllerHelp extends BaseController
-{
-	public function __construct($config)
-	{
-		parent::__construct($config);
-		// load the tasks
-		$this->registerTask('getText', 'help');
-	}
-
-	public function help()
-	{
-		$user       = Factory::getUser();
-		$jinput     = Factory::getApplication()->input;
-		// Check Token!
-		$token         = Session::getFormToken();
-		$call_token    = $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && ($jinput->get($token, 0, 'ALNUM') || $token === $call_token))
-		{
-			$task = $this->getTask();
-			switch($task){
-				case 'getText':
-					try
-					{
-						$idValue = $jinput->get('id', 0, 'INT');
-						if($idValue)
-						{
-							$result = $this->getHelpDocumentText($idValue);
-						}
-						else
-						{
-							$result = '';
-						}
-						echo $result;
-						// stop execution gracefully
-						jexit();
-					}
-					catch(Exception $e)
-					{
-						// stop execution gracefully
-						jexit();
-					}
-				break;
-			}
-		}
-		 else
-		{
-			// stop execution gracefully
-			jexit();
-		}
-	}
-
-	protected function getHelpDocumentText($id)
-	{
-		$db       = Factory::getDbo();
-		$query    = $db->getQuery(true);
-		$query->select(array('a.title','a.content'));
-		$query->from('#__componentbuilder_help_document AS a');
-		$query->where('a.id = '.(int) $id);
-		$query->where('a.published = 1');
-		$db->setQuery($query);
-		$db->execute();
-		if($db->getNumRows())
-		{
-			$text = [];
-			$document = $db->loadObject();
-			// fix image issue
-			$images['src="images'] = 'src="'.Uri::root().'images';
-			$images["src='images"] = "src='".Uri::root()."images";
-			$images['src="/images'] = 'src="'.Uri::root().'images';
-			$images["src='/images"] = "src='".Uri::root()."images";
-			// set document template
-			$text[] = "<!doctype html>";
-			$text[] = '<html>';
-			$text[] = "<head>";
-			$text[] = '<meta charset="utf-8">';
-			$text[] = "<title>".$document->title."</title>";
-			$text[] = '<link type="text/css" href="'.Uri::root().'media/com_componentbuilder/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
-			$text[] = '<script type="text/javascript" src="'.Uri::root().'media/com_componentbuilder/uikit/js/uikit.min.js"></script>';
-			$text[] = "</head>";
-			$text[] = '<body><br />';
-			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
-			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
-			// build the help text
-			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
-			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
-			// end template
-			$text[] = '</div><br /><br />';
-			$text[] = '</div>';
-			$text[] = "</body>";
-			$text[] = "</html>";
-
-			return implode("\n",$text);
-		}
-		return false;
-	}
-}
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Help_document Form Controller
- */
-class ComponentbuilderControllerHelp_document extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Help_documents'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('help_document.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('help_document.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('help_document.access', 'com_componentbuilder.help_document.' . (int) $recordId) && $user->authorise('help_document.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('help_document.edit', 'com_componentbuilder.help_document.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('help_document.edit.own', 'com_componentbuilder.help_document.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('help_document.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('help_document.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Help_document', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=help_documents' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Help_documents Admin Controller
- */
-class ComponentbuilderControllerHelp_documents extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_HELP_DOCUMENTS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Help_document', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('help_document.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Help_documents');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Help_documents_'.$date->format('jS_F_Y'),'Help documents exported ('.$date->format('jS F, Y').')','help documents');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=help_documents', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('help_document.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Help_documents');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('help_document_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'help_documents');
-				$session->set('dataType_VDM_IMPORTINTO', 'help_document');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=help_documents', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@ -1,60 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\Utilities\ArrayHelper;
-
-/**
- * Componentbuilder Import Base Controller
- */
-class ComponentbuilderControllerImport extends BaseController
-{
-	/**
-	 * Import an spreadsheet.
-	 *
-	 * @return  void
-	 */
-	public function import()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		$model = $this->getModel('import');
-		if ($model->import())
-		{
-			$cache = Factory::getCache('mod_menu');
-			$cache->clean();
-			// TODO: Reset the users acl here as well to kill off any missing bits
-		}
-
-		$app = Factory::getApplication();
-		$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
-		if (empty($redirect_url))
-		{
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=import', false);
-		}
-		else
-		{
-			// wipe out the user state when we're going to redirect
-			$app->setUserState('com_componentbuilder.redirect_url', '');
-			$app->setUserState('com_componentbuilder.message', '');
-			$app->setUserState('com_componentbuilder.extension_message', '');
-		}
-		$this->setRedirect($redirect_url);
-	}
-}
--- a/admin/controllers/import_joomla_components.php
+++ b/admin/controllers/import_joomla_components.php
@ -1,61 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
-
-/**
- * Componentbuilder Import_joomla_components Base Controller
- */
-class ComponentbuilderControllerImport_joomla_components extends BaseController
-{
-	/**
-	 * Import an spreadsheet.
-	 *
-	 * @return  void
-	 */
-	public function import()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		$model = $this->getModel('Import_joomla_components');
-		if ($model->import())
-		{
-			$cache = Factory::getCache('mod_menu');
-			$cache->clean();
-			// TODO: Reset the users acl here as well to kill off any missing bits
-		}
-
-		$app = Factory::getApplication();
-		$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
-		if (empty($redirect_url))
-		{
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=import_joomla_components', false);
-		}
-		else
-		{
-			// wipe out the user state when we're going to redirect
-			$app->setUserState('com_componentbuilder.redirect_url', '');
-			$app->setUserState('com_componentbuilder.message', '');
-			$app->setUserState('com_componentbuilder.extension_message', '');
-		}
-		$this->setRedirect($redirect_url);
-	}
-}
--- a/admin/controllers/import_language_translations.php
+++ b/admin/controllers/import_language_translations.php
@ -1,60 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\Utilities\ArrayHelper;
-
-/**
- * Componentbuilder Import_language_translations Base Controller
- */
-class ComponentbuilderControllerImport_language_translations extends BaseController
-{
-	/**
-	 * Import an spreadsheet.
-	 *
-	 * @return  void
-	 */
-	public function import()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		$model = $this->getModel('Import_language_translations');
-		if ($model->import())
-		{
-			$cache = Factory::getCache('mod_menu');
-			$cache->clean();
-			// TODO: Reset the users acl here as well to kill off any missing bits
-		}
-
-		$app = Factory::getApplication();
-		$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
-		if (empty($redirect_url))
-		{
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=import_language_translations', false);
-		}
-		else
-		{
-			// wipe out the user state when we're going to redirect
-			$app->setUserState('com_componentbuilder.redirect_url', '');
-			$app->setUserState('com_componentbuilder.message', '');
-			$app->setUserState('com_componentbuilder.extension_message', '');
-		}
-		$this->setRedirect($redirect_url);
-	}
-}
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@ -1,390 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\GetHelper;
-
-/**
- * Joomla_component Form Controller
- */
-class ComponentbuilderControllerJoomla_component extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_components'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	public function refresh()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('joomla_component.import_jcb_packages', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			$session = Factory::getSession();
-			$session->set('backto_VDM_IMPORT', 'joomla_components');
-			$session->set('dataType_VDM_IMPORTINTO', 'smart_package');
-			// clear the session
-			ComponentbuilderHelper::set('vdmGithubPackages', null);
-			ComponentbuilderHelper::set('communityGithubPackages', null);
-			// Redirect to import view.
-			$message = Text::_('COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL');
-			$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import_joomla_components&target=smartPackage', false), $message);
-			return;
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-		return;
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_component.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_component.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $recordId) && $user->authorise('joomla_component.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_component.edit', 'com_componentbuilder.joomla_component.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_component.edit.own', 'com_componentbuilder.joomla_component.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_component.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_component.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_component', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// get the state object (Joomla\CMS\Object\CMSObject)
-		$state = $model->get('state');
-		// if we save2copy we need to also copy linked tables found!
-		if ($state->task === 'save2copy' && $state->{'joomla_component.new'})
-		{
-			// get new ID
-			$newID = $state->{'joomla_component.id'};
-			// get old ID
-			$oldID = $this->input->get('id', 0, 'INT');
-			// linked tables to update
-			$_tablesArray = array(
-				'component_admin_views' => 'joomla_component',
-				'component_site_views' => 'joomla_component',
-				'component_custom_admin_views' => 'joomla_component',
-				'component_updates' => 'joomla_component',
-				'component_mysql_tweaks' => 'joomla_component',
-				'component_custom_admin_menus' => 'joomla_component',
-				'component_config' => 'joomla_component',
-				'component_dashboard' => 'joomla_component',
-				'component_files_folders' => 'joomla_component',
-				'component_placeholders' => 'joomla_component',
-				'custom_code' => 'component',
-				'component_router' => 'joomla_component'
-			);
-			foreach($_tablesArray as $_updateTable => $_key)
-			{
-				// get the linked ID
-				if ($_value = GetHelper::var($_updateTable, $oldID, $_key, 'id'))
-				{
-					// copy fields to new linked table
-					ComponentbuilderHelper::copyItem(/*id->*/ $_value, /*table->*/ $_updateTable, /*change->*/ array($_key => $newID));
-				}
-			}
-		}
-
-		return;
-	}
-}
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@ -1,476 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-use VDM\Joomla\Utilities\StringHelper;
-
-/**
- * Joomla_components Admin Controller
- */
-class ComponentbuilderControllerJoomla_components extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_COMPONENTS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_component', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('joomla_component.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Joomla_components');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Joomla_components_'.$date->format('jS_F_Y'),'Joomla components exported ('.$date->format('jS F, Y').')','joomla components');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Joomla_components');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('joomla_component_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'joomla_components');
-				$session->set('dataType_VDM_IMPORTINTO', 'joomla_component');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_COMPONENTS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import_joomla_components', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-		return;
-	}
-
-
-	/**
-	 * Clear tmp folder
-	 *
-	 * @return  true on success
-	 */
-	public function clearTmp()
-	{
-		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_components', false);
-		$message = Text::_('COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER');
-		if($user->authorise('joomla_components.clear_tmp', 'com_componentbuilder') && $user->authorise('core.manage', 'com_componentbuilder'))
-		{
-			// get the model
-			$model = $this->getModel('compiler');
-			// get tmp folder
-			$comConfig = Factory::getConfig();
-			$tmp = $comConfig->get('tmp_path');
-			if ($model->emptyFolder($tmp))
-			{
-				$message = Text::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB');
-				$this->setRedirect($redirect_url, $message, 'message');
-				// get application
-				$app = Factory::getApplication();
-				// wipe out the user c-m-p since we are done with them all
-				$app->setUserState('com_componentbuilder.component_folder_name', '');
-				$app->setUserState('com_componentbuilder.modules_folder_name', '');
-				$app->setUserState('com_componentbuilder.plugins_folder_name', '');
-				$app->setUserState('com_componentbuilder.success_message', '');
-
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	public function smartImport()
-	{
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('joomla_component.import_jcb_packages', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			$session = Factory::getSession();
-			$session->set('backto_VDM_IMPORT', 'joomla_components');
-			$session->set('dataType_VDM_IMPORTINTO', 'smart_package');
-			// Redirect to import view.
-			$message = Text::_('COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL');
-			$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import_joomla_components&target=smartPackage', false), $message);
-			return;
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-		return;
-	}
-
-	public function smartExport()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// Get the model
-		$model = $this->getModel('Joomla_components');
-		// check if export is allowed for this user.
-		$model->user = Factory::getUser();
-		if ($model->user->authorise('joomla_component.export_jcb_packages', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			ArrayHelper::toInteger($pks);
-			// check if there is any selections
-			if (!JCBArrayHelper::check($pks))
-			{
-				// Redirect to the list screen with error.
-				$message = Text::_('COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-				return;
-			}
-			// set auto loader
-			ComponentbuilderHelper::autoLoader('smart');
-			// get the data to export
-			if ($model->getSmartExport($pks))
-			{
-				// set the key string
-				if (StringHelper::check($model->key) && strlen($model->key) == 32)
-				{
-					$keyNotice = '<h1>' . Text::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE', $model->key) . '</h1>';
-					$keyNotice .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_TWO_HUNDRED_AND_FIFTY_SIX_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY') . '</p>';
-
-					// set the package owner info
-					if (PackageFactory::_('Display.Details')->hasOwner($model->info))
-					{
-						$ownerDetails = PackageFactory::_('Display.Details')->owner($model->info, true);
-					}
-					else
-					{
-						$ownerDetails = '<h2>' . Text::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET') . '</h2>';
-						$ownerDetails .= '<p>' . Text::_('COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE') . '</p>';
-						$ownerDetails .= '<h3>' . Text::_('COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS') . '</h3>';
-						$ownerDetails .= '<p>' . Text::_('COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB') . '</p>';
-					}
-				}
-				else
-				{
-					$keyNotice = '<h1>' . Text::_('COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY') . '</h1>';
-					$ownerDetails = '<p>' . Text::_('COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB') . '</p>';
-				}
-				// Redirect to the list screen with success.
-				$message = array();
-				$message[] = '<h1>' . Text::_('COM_COMPONENTBUILDER_EXPORT_COMPLETED') . '</h1>';
-				$message[] = '<p>' . Text::sprintf('COM_COMPONENTBUILDER_PATH_TO_THE_ZIPPED_PACKAGE_IS_CODESCODE_BR_S_S', $model->zipPath, $keyNotice, $ownerDetails) . '</p>';
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), implode('', $message), 'Success');
-				return;
-			}
-			else
-			{
-				if (StringHelper::check($model->packagePath))
-				{
-					// clear all if not successful
-					ComponentbuilderHelper::removeFolder($model->packagePath);
-				}
-				if (StringHelper::check($model->zipPath))
-				{
-					// clear all if not successful
-					File::delete($model->zipPath);
-				}				
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-		return;
-	}
-
-	public function backup()
-	{
-		// get params first
-		if (!isset($this->params) || !ObjectHelper::check($this->params))
-		{
-			$this->params = ComponentHelper::getParams('com_componentbuilder');
-		}
-		// Get the model
-		$model = componentbuilderHelper::getModel('joomla_components', JPATH_ADMINISTRATOR . '/components/com_componentbuilder');
-		// set user
-		$model->user = $this->getApiUser();
-		// make sure to set active type (adding this script from custom code :)
-		$model->activeType = 'manualBackup';
-		// check if export is allowed for this user. (we need this sorry)
-		if ($model->user->authorise('joomla_component.export_jcb_packages', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// get all component IDs to backup
-			$pks = componentbuilderHelper::getComponentIDs();
-			// set auto loader
-			ComponentbuilderHelper::autoLoader('smart');
-			// manual backup message
-			$backupNotice = [];
-			// get the data to export
-			if (UtilitiesArrayHelper::check($pks) && $model->getSmartExport($pks))
-			{
-				$backupNotice[] = Text::_('COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY');
-				$backupNoticeStatus = 'Success';
-				// set the key string
-				if (StringHelper::check($model->key) && strlen($model->key) == 32)
-				{
-					$textNotice = array();
-					$keyNotice = '<h1>' . Text::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE', $model->key) . '</h1>';
-					$keyNotice .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_TWO_HUNDRED_AND_FIFTY_SIX_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY') . '</p>';
-					$textNotice[] = Text::sprintf('COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_S', $model->key);
-					// set the package owner info
-					if ((isset($model->info['getKeyFrom']['company']) && StringHelper::check($model->info['getKeyFrom']['company'])) || (isset($model->info['getKeyFrom']['owner']) && StringHelper::check($model->info['getKeyFrom']['owner'])))
-					{
-						$ownerDetails = '<h2>' . Text::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS') . '</h2>';
-						$textNotice[] = '# ' . Text::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS');
-						$ownerDetails .= '<ul>';
-						if (isset($model->info['getKeyFrom']['company']) && StringHelper::check($model->info['getKeyFrom']['company']))
-						{
-							$ownerDetails .= '<li>' . Text::sprintf('COM_COMPONENTBUILDER_EMCOMPANYEM_BSB', $model->info['getKeyFrom']['company']) . '</li>';
-							$textNotice[] = '- ' . Text::sprintf('COM_COMPONENTBUILDER_COMPANY_S', $model->info['getKeyFrom']['company']);
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['owner']) && StringHelper::check($model->info['getKeyFrom']['owner']))
-						{
-							$ownerDetails .= '<li>' . Text::sprintf('COM_COMPONENTBUILDER_EMOWNEREM_BSB', $model->info['getKeyFrom']['owner']) . '</li>';
-							$textNotice[] = '- ' . Text::sprintf('COM_COMPONENTBUILDER_OWNER_S', $model->info['getKeyFrom']['owner']);
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['website']) && StringHelper::check($model->info['getKeyFrom']['website']))
-						{
-							$ownerDetails .= '<li>' . Text::sprintf('COM_COMPONENTBUILDER_EMWEBSITEEM_BSB', $model->info['getKeyFrom']['website']) . '</li>';
-							$textNotice[] = '- ' . Text::sprintf('COM_COMPONENTBUILDER_WEBSITE_S', $model->info['getKeyFrom']['website']);
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['email']) && StringHelper::check($model->info['getKeyFrom']['email']))
-						{
-							$ownerDetails .= '<li>' . Text::sprintf('COM_COMPONENTBUILDER_EMEMAILEM_BSB', $model->info['getKeyFrom']['email']) . '</li>';
-							$textNotice[] = '- ' . Text::sprintf('COM_COMPONENTBUILDER_EMAIL_S', $model->info['getKeyFrom']['email']);
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['license']) && StringHelper::check($model->info['getKeyFrom']['license']))
-						{
-							$ownerDetails .= '<li>' . Text::sprintf('COM_COMPONENTBUILDER_EMLICENSEEM_BSB', $model->info['getKeyFrom']['license']) . '</li>';
-							$textNotice[] = '- ' . Text::sprintf('COM_COMPONENTBUILDER_LICENSE_S', $model->info['getKeyFrom']['license']);
-						}
-						// add value only if set
-						if (isset($model->info['getKeyFrom']['copyright']) && StringHelper::check($model->info['getKeyFrom']['copyright']))
-						{
-							$ownerDetails .= '<li>' . Text::sprintf('COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB', $model->info['getKeyFrom']['copyright']) . '</li>';
-							$textNotice[] = '- ' . Text::sprintf('COM_COMPONENTBUILDER_COPYRIGHT_S', $model->info['getKeyFrom']['copyright']);
-						}							
-						$ownerDetails .= '</ul>';
-						$backupNotice[] = Text::_('COM_COMPONENTBUILDER_OWNER_DETAILS_WAS_SET');
-					}
-					else
-					{
-						$ownerDetails = '<h2>' . Text::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_NOT_SET') . '</h2>';
-						$textNotice[] = '# ' . Text::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS');
-						$ownerDetails .= Text::_('COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE') . '<br />';
-						$textNotice[] = Text::_('COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE');
-						$ownerDetails .= '<h3>' . Text::_('COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS') . '</h3>';
-						$textNotice[] = '## ' .  Text::_('COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS');
-						$ownerDetails .= Text::_('COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB') . '<br />';
-						$textNotice[] = Text::_('COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_IMPORT_PROCESS_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_DOES_NOT_HAVE_THE_KEY_THEY_CAN_SEE_WHERE_TO_GET_IT');
-						$backupNotice[] = Text::_('COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE');
-					}
-				}
-				else
-				{
-					$keyNotice = '<h1>' . Text::_('COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY') . '</h1>';
-					$textNotice[] = '# ' . Text::_('COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY');
-					$ownerDetails = Text::_('COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_BSETTINGSB_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_BEXPORT_KEYB') . '<br />';
-					$textNotice[] = Text::_('COM_COMPONENTBUILDER_THAT_MEANS_ANYONE_WHO_HAS_THIS_PACKAGE_CAN_INSTALL_IT_INTO_JCB_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY');
-					$backupNotice[] = Text::_('COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY');
-				}
-				// get email
-				if ($email = $this->params->get('backup_email', null))
-				{
-					// plain text
-					$plainText = implode("\n", $textNotice);
-					// set hash to track changes
-					$hashTracker = md5($plainText);
-					if (ComponentbuilderHelper::newHash($hashTracker))
-					{
-						// Build final massage.
-						$message = $keyNotice . $ownerDetails . '<br /><small>HASH: ' . $hashTracker . '</small>';
-						// set the subject
-						$subject = Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY');
-						// email the message
-						componentbuilderEmail::send($email, $subject, componentbuilderEmail::setTableBody($message, $subject), $plainText, 1);
-						$backupNotice[] = Text::_('COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SENT');
-					}
-					else
-					{
-						$backupNotice[] = Text::_('COM_COMPONENTBUILDER_KEY_HAS_NOT_CHANGED');
-					}
-				}
-			}
-			else
-			{
-				$backupNotice[] = Text::_('COM_COMPONENTBUILDER_BACKUP_FAILED_PLEASE_TRY_AGAIN_IF_THE_ERROR_CONTINUE_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR');
-				$backupNoticeStatus = 'Error';
-				if (StringHelper::check($model->packagePath))
-				{
-					// clear all if not successful
-					ComponentbuilderHelper::removeFolder($model->packagePath);
-				}
-				if (StringHelper::check($model->zipPath))
-				{
-					// clear all if not successful
-					File::delete($model->zipPath);
-				}				
-			}
-			// quite only if auto backup (adding this script from custom code :)
-			if ('backup' === $model->activeType)
-			{
-				echo "# " . $backupNoticeStatus . "\n" .implode("\n", $backupNotice);
-				// clear session
-				Factory::getApplication()->getSession()->destroy();
-				jexit();
-			}
-			$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), implode("<br />", $backupNotice), $backupNoticeStatus);
-			return;
-		}
-		// quite only if auto backup (adding this script from custom code :)
-		if ('backup' === $model->activeType)
-		{
-			echo "# Error\n" . Text::_('COM_COMPONENTBUILDER_ACCESS_DENIED');
-			// clear session
-			Factory::getApplication()->getSession()->destroy();
-			jexit();
-		}
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), Text::_('COM_COMPONENTBUILDER_ACCESS_DENIED'), 'Error');
-		return;
-	}
-
-	public function cloner()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// Get the model
-		$model = $this->getModel('Joomla_components');
-		// check if export is allowed for this user.
-		$model->user = Factory::getUser();
-		if ($model->user->authorise('joomla_component.clone', 'com_componentbuilder') && $model->user->authorise('core.copy', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			ArrayHelper::toInteger($pks);
-			// check if there is any selections
-			if (!JCBArrayHelper::check($pks))
-			{
-				// Redirect to the list screen with error.
-				$message = Text::_('COM_COMPONENTBUILDER_NO_COMPONENT_WAS_SELECTED_PLEASE_MAKE_A_SELECTION_OF_ONE_COMPONENT_AND_TRY_AGAIN');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-				return;
-			}
-			// only one component allowed at this time
-			elseif (count( (array) $pks) !== 1)
-			{
-				// Redirect to the list screen with error.
-				$message = Text::_('COM_COMPONENTBUILDER_ONLY_ONE_COMPONENT_CAN_BE_CLONED_AT_A_TIME_PLEASE_SELECT_ONE_AND_TRY_AGAIN');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-				return;
-			}
-			// set the active type
-			$model->activeType = 'clone';
-			// clone the component and the views and the fields... everything linked to the component.
-			if ($model->cloner($pks))
-			{
-				// clone was successful
-				$message = Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_WITH_ALL_LINKED_ADMIN_VIEWS_FIELDS_LINKED_TO_ADMIN_VIEWS_CUSTOM_ADMIN_VIEWS_SITE_VIEWS_TEMPLATES_AND_LAYOUTS_WERE_CLONED_SUCCESSFUL');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message);
-				return;
-			}
-			// Redirect to the list screen with error.
-			$message = Text::_('COM_COMPONENTBUILDER_CLONE_FAILED');
-			$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-			return;
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_CLONE_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_components', false), $message, 'error');
-		return;
-	}
-
-	protected function getApiUser()
-	{
-		// admin area does not have API user, only front-end (so we fallback on login user)
-		return Factory::getUser();
-	}
-
-}
--- a/admin/controllers/joomla_module.php
+++ b/admin/controllers/joomla_module.php
@ -1,356 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\GetHelper;
-
-/**
- * Joomla_module Form Controller
- */
-class ComponentbuilderControllerJoomla_module extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_modules'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_module.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_module.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_module.access', 'com_componentbuilder.joomla_module.' . (int) $recordId) && $user->authorise('joomla_module.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_module.edit', 'com_componentbuilder.joomla_module.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_module.edit.own', 'com_componentbuilder.joomla_module.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_module.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_module.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_module', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// get the state object (Joomla\CMS\Object\CMSObject)
-		$state = $model->get('state');
-		// if we save2copy we need to also copy linked tables found!
-		if ($state->task === 'save2copy' && $state->{'joomla_plugin.new'})
-		{
-			// get new ID
-			$newID = $state->{'joomla_module.id'};
-			// get old ID
-			$oldID = $this->input->get('id', 0, 'INT');
-			// linked tables to update
-			$_tablesArray = array(
-				'joomla_module_updates' => 'joomla_module',
-				'joomla_module_files_folders_urls' => 'joomla_module'
-			);
-			foreach($_tablesArray as $_updateTable => $_key)
-			{
-				// get the linked ID
-				if ($_value = GetHelper::var($_updateTable, $oldID, $_key, 'id'))
-				{
-					// copy fields to new linked table
-					ComponentbuilderHelper::copyItem(/*id->*/ $_value, /*table->*/ $_updateTable, /*change->*/ array($_key => $newID));
-				}
-			}
-		}
-
-
-		return;
-	}
-}
--- a/admin/controllers/joomla_module_files_folders_urls.php
+++ b/admin/controllers/joomla_module_files_folders_urls.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Joomla_module_files_folders_urls Form Controller
- */
-class ComponentbuilderControllerJoomla_module_files_folders_urls extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_modules_files_folders_urls'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_module_files_folders_urls.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_module_files_folders_urls.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_module_files_folders_urls.access', 'com_componentbuilder.joomla_module_files_folders_urls.' . (int) $recordId) && $user->authorise('joomla_module_files_folders_urls.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_module_files_folders_urls.edit', 'com_componentbuilder.joomla_module_files_folders_urls.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_module_files_folders_urls.edit.own', 'com_componentbuilder.joomla_module_files_folders_urls.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_module_files_folders_urls.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_module_files_folders_urls.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_module_files_folders_urls', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules_files_folders_urls' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/joomla_module_updates.php
+++ b/admin/controllers/joomla_module_updates.php
@ -1,349 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\StringHelper;
-
-/**
- * Joomla_module_updates Form Controller
- */
-class ComponentbuilderControllerJoomla_module_updates extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_modules_updates'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_module_updates.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_module_updates.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_module_updates.access', 'com_componentbuilder.joomla_module_updates.' . (int) $recordId) && $user->authorise('joomla_module_updates.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_module_updates.edit', 'com_componentbuilder.joomla_module_updates.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_module_updates.edit.own', 'com_componentbuilder.joomla_module_updates.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_module_updates.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_module_updates.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_module_updates', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules_updates' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// update the component version to match the updated last version
-		if (isset($validData['joomla_plugin']) && is_numeric($validData['joomla_plugin']) && $validData['joomla_plugin'] > 0)
-		{
-			$objectUpdate = new \stdClass();
-			$objectUpdate->id = (int) $validData['joomla_plugin'];
-			if (isset($validData['version_update']) && UtilitiesArrayHelper::check($validData['version_update'])
-				&& ($plugin_version = end($validData['version_update'])['version'])
-				&& StringHelper::check($plugin_version))
-			{
-				$objectUpdate->plugin_version = $plugin_version;
-			}
-			// be sure to update the table if we have a value
-			if (isset($objectUpdate->plugin_version))
-			{
-				Factory::getDbo()->updateObject('#__componentbuilder_joomla_plugin', $objectUpdate, 'id');
-			}
-		}
-
-		return;
-	}
-}
--- a/admin/controllers/joomla_modules.php
+++ b/admin/controllers/joomla_modules.php
@ -1,124 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Joomla_modules Admin Controller
- */
-class ComponentbuilderControllerJoomla_modules extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_MODULES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_module', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('joomla_module.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Joomla_modules');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Joomla_modules_'.$date->format('jS_F_Y'),'Joomla modules exported ('.$date->format('jS F, Y').')','joomla modules');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('joomla_module.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Joomla_modules');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('joomla_module_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'joomla_modules');
-				$session->set('dataType_VDM_IMPORTINTO', 'joomla_module');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_MODULES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules', false), $message, 'error');
-		return;
-	}
-
-	public function getSnippets()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the import snippets custom admin view
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=get_snippets', false));
-		return;
-	}
-}
--- a/admin/controllers/joomla_modules_files_folders_urls.php
+++ b/admin/controllers/joomla_modules_files_folders_urls.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Joomla_modules_files_folders_urls Admin Controller
- */
-class ComponentbuilderControllerJoomla_modules_files_folders_urls extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_module_files_folders_urls', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/joomla_modules_updates.php
+++ b/admin/controllers/joomla_modules_updates.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Joomla_modules_updates Admin Controller
- */
-class ComponentbuilderControllerJoomla_modules_updates extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_module_updates', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/joomla_plugin.php
+++ b/admin/controllers/joomla_plugin.php
@ -1,356 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\GetHelper;
-
-/**
- * Joomla_plugin Form Controller
- */
-class ComponentbuilderControllerJoomla_plugin extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_plugins'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_plugin.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_plugin.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_plugin.access', 'com_componentbuilder.joomla_plugin.' . (int) $recordId) && $user->authorise('joomla_plugin.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_plugin.edit', 'com_componentbuilder.joomla_plugin.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_plugin.edit.own', 'com_componentbuilder.joomla_plugin.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_plugin.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_plugin.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_plugin', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_plugins' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// get the state object (Joomla\CMS\Object\CMSObject)
-		$state = $model->get('state');
-		// if we save2copy we need to also copy linked tables found!
-		if ($state->task === 'save2copy' && $state->{'joomla_plugin.new'})
-		{
-			// get new ID
-			$newID = $state->{'joomla_plugin.id'};
-			// get old ID
-			$oldID = $this->input->get('id', 0, 'INT');
-			// linked tables to update
-			$_tablesArray = array(
-				'joomla_plugin_updates' => 'joomla_plugin',
-				'joomla_plugin_files_folders_urls' => 'joomla_plugin'
-			);
-			foreach($_tablesArray as $_updateTable => $_key)
-			{
-				// get the linked ID
-				if ($_value = GetHelper::var($_updateTable, $oldID, $_key, 'id'))
-				{
-					// copy fields to new linked table
-					ComponentbuilderHelper::copyItem(/*id->*/ $_value, /*table->*/ $_updateTable, /*change->*/ array($_key => $newID));
-				}
-			}
-		}
-
-
-		return;
-	}
-}
--- a/admin/controllers/joomla_plugin_files_folders_urls.php
+++ b/admin/controllers/joomla_plugin_files_folders_urls.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Joomla_plugin_files_folders_urls Form Controller
- */
-class ComponentbuilderControllerJoomla_plugin_files_folders_urls extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_plugins_files_folders_urls'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_plugin_files_folders_urls.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_plugin_files_folders_urls.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_plugin_files_folders_urls.access', 'com_componentbuilder.joomla_plugin_files_folders_urls.' . (int) $recordId) && $user->authorise('joomla_plugin_files_folders_urls.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_plugin_files_folders_urls.edit', 'com_componentbuilder.joomla_plugin_files_folders_urls.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_plugin_files_folders_urls.edit.own', 'com_componentbuilder.joomla_plugin_files_folders_urls.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_plugin_files_folders_urls.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_plugin_files_folders_urls.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_plugin_files_folders_urls', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_plugins_files_folders_urls' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/joomla_plugin_group.php
+++ b/admin/controllers/joomla_plugin_group.php
@ -1,322 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Joomla_plugin_group Form Controller
- */
-class ComponentbuilderControllerJoomla_plugin_group extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_plugin_groups'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_plugin_group.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return parent::allowAdd($data);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('core.edit', 'com_componentbuilder.joomla_plugin_group.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('core.edit.own', 'com_componentbuilder.joomla_plugin_group.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('core.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return parent::allowEdit($data, $key);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_plugin_group', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_plugin_groups' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/joomla_plugin_groups.php
+++ b/admin/controllers/joomla_plugin_groups.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Joomla_plugin_groups Admin Controller
- */
-class ComponentbuilderControllerJoomla_plugin_groups extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_plugin_group', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/joomla_plugin_updates.php
+++ b/admin/controllers/joomla_plugin_updates.php
@ -1,349 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\StringHelper;
-
-/**
- * Joomla_plugin_updates Form Controller
- */
-class ComponentbuilderControllerJoomla_plugin_updates extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_plugins_updates'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_plugin_updates.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_plugin_updates.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_plugin_updates.access', 'com_componentbuilder.joomla_plugin_updates.' . (int) $recordId) && $user->authorise('joomla_plugin_updates.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_plugin_updates.edit', 'com_componentbuilder.joomla_plugin_updates.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_plugin_updates.edit.own', 'com_componentbuilder.joomla_plugin_updates.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_plugin_updates.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_plugin_updates.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_plugin_updates', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_plugins_updates' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		// update the component version to match the updated last version
-		if (isset($validData['joomla_plugin']) && is_numeric($validData['joomla_plugin']) && $validData['joomla_plugin'] > 0)
-		{
-			$objectUpdate = new \stdClass();
-			$objectUpdate->id = (int) $validData['joomla_plugin'];
-			if (isset($validData['version_update']) && UtilitiesArrayHelper::check($validData['version_update'])
-				&& ($plugin_version = end($validData['version_update'])['version'])
-				&& StringHelper::check($plugin_version))
-			{
-				$objectUpdate->plugin_version = $plugin_version;
-			}
-			// be sure to update the table if we have a value
-			if (isset($objectUpdate->plugin_version))
-			{
-				Factory::getDbo()->updateObject('#__componentbuilder_joomla_plugin', $objectUpdate, 'id');
-			}
-		}
-
-		return;
-	}
-}
--- a/admin/controllers/joomla_plugins.php
+++ b/admin/controllers/joomla_plugins.php
@ -1,103 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Joomla_plugins Admin Controller
- */
-class ComponentbuilderControllerJoomla_plugins extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_PLUGINS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_plugin', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-
-	/**
-	 * get Boilerplate
-	 *
-	 * @return  boolean
-	 */
-	public function getBoilerplate()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		// set page redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_plugins', false);
-		// set massage
-		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_GET_BOILERPLATE_MODULE');
-		// check if this user has the right to run expansion
-		if($user->authorise('joomla_plugin.get_boilerplate', 'com_componentbuilder'))
-		{
-			// set massage
-			$message = Text::_('COM_COMPONENTBUILDER_GETTING_JOOMLA_PLUGIN_BOILERPLATE_FAILED_IF_THE_ISSUE_CONTINUES_INFORM_YOUR_SYSTEM_ADMINISTRATOR');
-			// Get the model
-			$model = $this->getModel('joomla_plugins');
-			// check if there is any selections
-			if (!$model->getBoilerplate())
-			{
-				$message = '<b>' . Text::_('COM_COMPONENTBUILDER_GETTING_JOOMLA_PLUGIN_BOILERPLATE_WAS_SUCCESSFULLY') . '</b>';
-				$this->setRedirect($redirect_url, $message, 'message');
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url, $message, 'error');
-		return false;
-	}
-
-	public function openClassMethods()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the libraries
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_methods', false));
-		return;
-	}
-
-	public function openClassProperties()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// redirect to the libraries
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_properties', false));
-		return;
-	}
-}
--- a/admin/controllers/joomla_plugins_files_folders_urls.php
+++ b/admin/controllers/joomla_plugins_files_folders_urls.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Joomla_plugins_files_folders_urls Admin Controller
- */
-class ComponentbuilderControllerJoomla_plugins_files_folders_urls extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_plugin_files_folders_urls', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/joomla_plugins_updates.php
+++ b/admin/controllers/joomla_plugins_updates.php
@ -1,50 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-/**
- * Joomla_plugins_updates Admin Controller
- */
-class ComponentbuilderControllerJoomla_plugins_updates extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_plugin_updates', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-}
--- a/admin/controllers/joomla_power.php
+++ b/admin/controllers/joomla_power.php
@ -1,480 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Factory as JoomlaPowerFactory;
-
-/**
- * Joomla_power Form Controller
- */
-class ComponentbuilderControllerJoomla_power extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Joomla_powers'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Resets the specified Joomla power.
-	 *
-	 * This function performs several checks and operations:
-	 * 1. It verifies the authenticity of the request to prevent request forgery.
-	 * 2. It retrieves the item data posted by the user.
-	 * 3. It checks whether the current user has the necessary permissions to reset the Joomla power.
-	 * 4. It validates the presence of the necessary item identifiers (ID and GUID).
-	 * 5. If the user is authorized and the identifiers are valid, it attempts to reset the specified power.
-	 * 6. Depending on the result of the reset operation, it sets the appropriate success or error message.
-	 * 7. It redirects the user to a specified URL with the result message and status.
-	 *
-	 * @return bool True on successful reset, false on failure.
-	 */
-	public function resetPowers()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-
-		// get Item posted
-		$item = $this->input->post->get('jform', array(), 'array');
-
-		// check if user has the right
-		$user = Factory::getUser();
-
-		// set default error message
-		$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PERMISSION_DENIED') . '</h1>';
-		$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_THIS_JOOMLA_POWER') . '</p>';
-		$status = 'error';
-		$success = false;
-
-		// load the ID
-		$id = $item['id'] ?? null;
-		$guid = $item['guid'] ?? null;
-
-		// check if there is any selections
-		if ($id === null || $guid === null)
-		{
-			// set error message
-			$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_NOT_SAVED') . '</h1>';
-			$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_SAVE_THE_JOOMLA_POWER_BEFORE_YOU_CAN_USE_THIS_FEATURE') . '</p>';
-		}
-		elseif($user->authorise('joomla_power.reset', 'com_componentbuilder'))
-		{
-			try {
-				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Get')->reset([$guid]))
-				{
-					// set success message
-					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
-					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THE_JOOMLA_POWER_HAS_SUCCESSFULLY_BEEN_RESET').'</p>';
-					$status = 'success';
-					$success = true;
-				}
-				else
-				{
-					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
-					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_RESET_OF_THIS_JOOMLA_POWER_HAS_FAILED') . '</p>';
-				}
-			} catch (\Exception $e) {
-				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
-				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
-			}
-		}
-
-		// set redirect
-		$redirect_url = Route::_(
-			'index.php?option=com_componentbuilder&view=joomla_power'
-			. $this->getRedirectToItemAppend($id), $success
-		);
-
-		$this->setRedirect($redirect_url, $message, $status);
-
-		return $success;
-	}
-
-	 /**
-	 * Pushes the specified Joomla power.
-	 *
-	 * This function performs several checks and operations:
-	 * 1. It verifies the authenticity of the request to prevent request forgery.
-	 * 2. It retrieves the item data posted by the user.
-	 * 3. It checks whether the current user has the necessary permissions to push the Joomla power.
-	 * 4. It validates the presence of the necessary item identifiers (ID and GUID).
-	 * 5. If the user is authorized and the identifiers are valid, it attempts to push the specified power.
-	 * 6. Depending on the result of the push operation, it sets the appropriate success or error message.
-	 * 7. It redirects the user to a specified URL with the result message and status.
-	 *
-	 * @return bool True on successful push, false on failure.
-	 */
-	public function pushPowers()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-
-		// get Item posted
-		$item = $this->input->post->get('jform', array(), 'array');
-
-		// check if user has the right
-		$user = Factory::getUser();
-
-		// set default error message
-		$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PERMISSION_DENIED') . '</h1>';
-		$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_PUSH_THIS_JOOMLA_POWER') . '</p>';
-		$status = 'error';
-		$success = false;
-
-		// load the ID
-		$id = $item['id'] ?? null;
-		$guid = $item['guid'] ?? null;
-
-		// check if there is any selections
-		if ($id === null || $guid === null)
-		{
-			// set error message
-			$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_NOT_SAVED') . '</h1>';
-			$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_SAVE_THE_JOOMLA_POWER_BEFORE_YOU_CAN_USE_THIS_FEATURE') . '</p>';
-		}
-		elseif($user->authorise('joomla_power.push', 'com_componentbuilder'))
-		{
-			try {
-				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Set')->items([$guid]))
-				{
-					// set success message
-					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
-					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THE_JOOMLA_POWER_HAS_SUCCESSFULLY_BEEN_PUSHED').'</p>';
-					$status = 'success';
-					$success = true;
-				}
-				else
-				{
-					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
-					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_PUSH_OF_THIS_JOOMLA_POWER_HAS_FAILED') . '</p>';
-				}
-			} catch (\Exception $e) {
-				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
-				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
-			}
-		}
-
-		// set redirect
-		$redirect_url = Route::_(
-			'index.php?option=com_componentbuilder&view=joomla_power'
-			. $this->getRedirectToItemAppend($id), $success
-		);
-
-		$this->setRedirect($redirect_url, $message, $status);
-
-		return $success;
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('joomla_power.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('joomla_power.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('joomla_power.access', 'com_componentbuilder.joomla_power.' . (int) $recordId) && $user->authorise('joomla_power.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('joomla_power.edit', 'com_componentbuilder.joomla_power.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('joomla_power.edit.own', 'com_componentbuilder.joomla_power.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('joomla_power.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('joomla_power.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Joomla_power', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_powers' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/joomla_powers.php
+++ b/admin/controllers/joomla_powers.php
@ -1,266 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Factory as JoomlaPowerFactory;
-use VDM\Joomla\Utilities\GetHelper;
-
-/**
- * Joomla_powers Admin Controller
- */
-class ComponentbuilderControllerJoomla_powers extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_POWERS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Joomla_power', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	/**
-	 * Initializes all remote Joomla powers and syncs them with the local database.
-	 *
-	 * This function performs several checks and operations:
-	 * 1. It verifies the authenticity of the request to prevent request forgery.
-	 * 2. It checks whether the current user has the necessary permissions to initialize the Joomla powers.
-	 * 3. If the user is authorized, it attempts to initialize the remote Joomla powers.
-	 * 4. Depending on the result of the initialization operation, it sets the appropriate success or error message.
-	 * 5. It redirects the user to a specified URL with the result message and status.
-	 *
-	 * @return bool True on successful initialization, false on failure.
-	 */
-	public function initPowers()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-
-		// check if user has the right
-		$user = Factory::getUser();
-
-		// set default error message
-		$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PERMISSION_DENIED') . '</h1>';
-		$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_INITIALIZE_JOOMLA_POWERS') . '</p>';
-		$status = 'error';
-		$success = false;
-
-		if($user->authorise('joomla_power.init', 'com_componentbuilder'))
-		{
-			try {
-				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Get')->init())
-				{
-					// set success message
-					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_SUCCESSFULLY_INITIALIZED_ALL_REMOTE_JOOMLA_POWERS') . '</h1>';
-					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_LOCAL_DATABASE_JOOMLA_POWERS_HAS_SUCCESSFULLY_BEEN_SYNCED_WITH_THE_REMOTE_REPOSITORIES') . '</p>';
-
-					$status = 'success';
-					$success = true;
-				}
-				else
-				{
-					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_INITIALIZATION_FAILED') . '</h1>';
-					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_INITIALIZATION_OF_THIS_JOOMLA_POWERS_HAS_FAILED') . '</p>';
-				}
-			} catch (\Exception $e) {
-				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_INITIALIZATION_FAILED') . '</h1>';
-				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
-			}
-		}
-
-		// set redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', $success);
-		$this->setRedirect($redirect_url, $message, $status);
-
-		return $success;
-	}
-
-	/**
-	 * Resets the selected Joomla powers.
-	 *
-	 * This function performs several checks and operations:
-	 * 1. It verifies the authenticity of the request to prevent request forgery.
-	 * 2. It retrieves the IDs of the selected powers from the user input.
-	 * 3. It sanitizes the input by converting the IDs to integers.
-	 * 4. It checks whether any powers have been selected.
-	 * 5. It checks whether the current user has the necessary permissions to reset the selected Joomla powers.
-	 * 6. If the user is authorized and powers are selected, it attempts to reset the selected Joomla powers.
-	 * 7. Depending on the result of the reset operation, it sets the appropriate success or error message.
-	 * 8. It redirects the user to a specified URL with the result message and status.
-	 *
-	 * @return bool True on successful reset, false on failure.
-	 */
-	public function resetPowers()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-
-		// get IDS of the selected powers
-		$pks = $this->input->post->get('cid', [], 'array');
-
-		// Sanitize the input
-		ArrayHelper::toInteger($pks);
-
-		// check if there is any selections
-		if ($pks === [])
-		{
-			// set error message
-			$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_NO_SELECTION_DETECTED').'</h1>';
-			$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_PLEASE_FIRST_MAKE_A_SELECTION_FROM_THE_LIST').'</p>';
-			// set redirect
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
-			$this->setRedirect($redirect_url, $message, 'error');
-			return false;
-		}
-
-		$status = 'error';
-		$success = false;
-
-		// check if user has the right
-		$user = Factory::getUser();
-		if($user->authorise('joomla_power.reset', 'com_componentbuilder'))
-		{
-			$guids = GetHelper::vars('joomla_power', $pks, 'id', 'guid');
-
-			try {
-				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Get')->reset($guids))
-				{
-					// set success message
-					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
-					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THESE_JOOMLA_POWERS_HAVE_SUCCESSFULLY_BEEN_RESET').'</p>';
-					$status = 'success';
-					$success = true;
-				}
-				else
-				{
-					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
-					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_RESET_OF_THESE_JOOMLA_POWERS_HAS_FAILED') . '</p>';
-				}
-			} catch (\Exception $e) {
-				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
-				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
-			}
-
-			// set redirect
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', $success);
-			$this->setRedirect($redirect_url, $message, $status);
-
-			return $success;
-		}
-
-		// set redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
-		$this->setRedirect($redirect_url);
-		return $success;
-	}
-
-	/**
-	 * Pushes the selected Joomla powers.
-	 *
-	 * This function performs several checks and operations:
-	 * 1. It verifies the authenticity of the request to prevent request forgery.
-	 * 2. It retrieves the IDs of the selected powers from the user input.
-	 * 3. It sanitizes the input by converting the IDs to integers.
-	 * 4. It checks whether any powers have been selected.
-	 * 5. It checks whether the current user has the necessary permissions to push the selected Joomla powers.
-	 * 6. If the user is authorized and powers are selected, it attempts to push the selected Joomla powers.
-	 * 7. Depending on the result of the push operation, it sets the appropriate success or error message.
-	 * 8. It redirects the user to a specified URL with the result message and status.
-	 *
-	 * @return bool True on successful push, false on failure.
-	 */
-	public function pushPowers()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-
-		// get IDS of the selected powers
-		$pks = $this->input->post->get('cid', [], 'array');
-
-		// Sanitize the input
-		ArrayHelper::toInteger($pks);
-
-		// check if there is any selections
-		if ($pks === [])
-		{
-			// set error message
-			$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_NO_SELECTION_DETECTED').'</h1>';
-			$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_PLEASE_FIRST_MAKE_A_SELECTION_FROM_THE_LIST').'</p>';
-			// set redirect
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
-			$this->setRedirect($redirect_url, $message, 'error');
-			return false;
-		}
-
-		$status = 'error';
-		$success = false;
-
-		// check if user has the right
-		$user = Factory::getUser();
-		if($user->authorise('joomla_power.push', 'com_componentbuilder'))
-		{
-			$guids = GetHelper::vars('joomla_power', $pks, 'id', 'guid');
-
-			try {
-				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Set')->items($guids))
-				{
-					// set success message
-					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
-					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THESE_JOOMLA_POWERS_HAVE_SUCCESSFULLY_BEEN_PUSHED').'</p>';
-					$status = 'success';
-					$success = true;
-				}
-				else
-				{
-					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
-					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_PUSH_OF_THESE_JOOMLA_POWERS_HAS_FAILED') . '</p>';
-				}
-			} catch (\Exception $e) {
-				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
-				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
-			}
-
-			// set redirect
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', $success);
-			$this->setRedirect($redirect_url, $message, $status);
-
-			return $success;
-		}
-
-		// set redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
-		$this->setRedirect($redirect_url);
-		return $success;
-	}
-}
--- a/admin/controllers/language.php
+++ b/admin/controllers/language.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Language Form Controller
- */
-class ComponentbuilderControllerLanguage extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Languages'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('language.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('language.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('language.access', 'com_componentbuilder.language.' . (int) $recordId) && $user->authorise('language.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('language.edit', 'com_componentbuilder.language.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('language.edit.own', 'com_componentbuilder.language.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('language.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('language.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Language', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=languages' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Language_translation Form Controller
- */
-class ComponentbuilderControllerLanguage_translation extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Language_translations'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('language_translation.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return $user->authorise('language_translation.create', $this->option);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $recordId) && $user->authorise('language_translation.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('language_translation.edit', 'com_componentbuilder.language_translation.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('language_translation.edit.own', 'com_componentbuilder.language_translation.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('language_translation.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return $user->authorise('language_translation.edit', $this->option);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Language_translation', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=language_translations' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@ -1,115 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Language_translations Admin Controller
- */
-class ComponentbuilderControllerLanguage_translations extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Language_translation', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('language_translation.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Language_translations');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Language_translations_'.$date->format('jS_F_Y'),'Language translations exported ('.$date->format('jS F, Y').')','language translations');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('language_translation.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Language_translations');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('language_translation_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'language_translations');
-				$session->set('dataType_VDM_IMPORTINTO', 'language_translation');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import_language_translations', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error');
-		return;
-	}
-}
--- a/admin/controllers/languages.php
+++ b/admin/controllers/languages.php
@ -1,142 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
-
-/**
- * Languages Admin Controller
- */
-class ComponentbuilderControllerLanguages extends AdminController
-{
-	/**
-	 * The prefix to use with controller messages.
-	 *
-	 * @var    string
-	 * @since  1.6
-	 */
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGES';
-
-	/**
-	 * Method to get a model object, loading it if required.
-	 *
-	 * @param   string  $name    The model name. Optional.
-	 * @param   string  $prefix  The class prefix. Optional.
-	 * @param   array   $config  Configuration array for model. Optional.
-	 *
-	 * @return  JModelLegacy  The model.
-	 *
-	 * @since   1.6
-	 */
-	public function getModel($name = 'Language', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
-	{
-		return parent::getModel($name, $prefix, $config);
-	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('language.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Languages');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Languages_'.$date->format('jS_F_Y'),'Languages exported ('.$date->format('jS F, Y').')','languages');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=languages', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getUser();
-		if ($user->authorise('language.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Languages');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('language_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'languages');
-				$session->set('dataType_VDM_IMPORTINTO', 'language');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=languages', false), $message, 'error');
-		return;
-	}
-
-	public function buildLanguages()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if user has the right
-		$user = Factory::getUser();
-		if($user->authorise('core.create', 'com_componentbuilder'))
-		{
-			// get the model
-			$model = $this->getModel('languages');
-			if ($model->buildLanguages())
-			{
-				// set success message
-				$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_IMPORT_SUCCESS').'</h1>';
-				$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_ALL_THE_LANGUAGES_FOUND_IN_JOOMLA_WERE_SUCCESSFULLY_IMPORTED').'</p>';
-				// set redirect
-				$redirect_url = Route::_('index.php?option=com_componentbuilder&view=languages', false);
-				$this->setRedirect($redirect_url, $message);
-				return true;
-			}
-		}
-		// set redirect
-		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=languages', false);
-		$this->setRedirect($redirect_url);
-		return false;
-	}
-}
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@ -1,329 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-/**
- * Layout Form Controller
- */
-class ComponentbuilderControllerLayout extends FormController
-{
-	/**
-	 * Current or most recently performed task.
-	 *
-	 * @var    string
-	 * @since  12.2
-	 * @note   Replaces _task.
-	 */
-	protected $task;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param   array  $config  A named array of configuration variables.
-	 *
-	 * @since   1.6
-	 */
-	public function __construct($config = [])
-	{
-		$this->view_list = 'Layouts'; // safeguard for setting the return view listing to the main view.
-		parent::__construct($config);
-	}
-
-	/**
-	 * Method override to check if you can add a new record.
-	 *
-	 * @param   array  $data  An array of input data.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowAdd($data = [])
-	{
-		// Get user object.
-		$user = Factory::getUser();
-		// Access check.
-		$access = $user->authorise('layout.access', 'com_componentbuilder');
-		if (!$access)
-		{
-			return false;
-		}
-
-		// In the absence of better information, revert to the component permissions.
-		return parent::allowAdd($data);
-	}
-
-	/**
-	 * Method override to check if you can edit an existing record.
-	 *
-	 * @param   array   $data  An array of input data.
-	 * @param   string  $key   The name of the key for the primary key.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	protected function allowEdit($data = [], $key = 'id')
-	{
-		// get user object.
-		$user = Factory::getUser();
-		// get record id.
-		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-
-		// Access check.
-		$access = ($user->authorise('layout.access', 'com_componentbuilder.layout.' . (int) $recordId) && $user->authorise('layout.access', 'com_componentbuilder'));
-		if (!$access)
-		{
-			return false;
-		}
-
-		if ($recordId)
-		{
-			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('core.edit', 'com_componentbuilder.layout.' . (int) $recordId);
-			if (!$permission)
-			{
-				if ($user->authorise('core.edit.own', 'com_componentbuilder.layout.' . $recordId))
-				{
-					// Now test the owner is the user.
-					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-					if (empty($ownerId))
-					{
-						// Need to do a lookup from the model.
-						$record = $this->getModel()->getItem($recordId);
-
-						if (empty($record))
-						{
-							return false;
-						}
-						$ownerId = $record->created_by;
-					}
-
-					// If the owner matches 'me' then allow.
-					if ($ownerId == $user->id)
-					{
-						if ($user->authorise('core.edit.own', 'com_componentbuilder'))
-						{
-							return true;
-						}
-					}
-				}
-				return false;
-			}
-		}
-		// Since there is no permission, revert to the component permissions.
-		return parent::allowEdit($data, $key);
-	}
-
-	/**
-	 * Gets the URL arguments to append to an item redirect.
-	 *
-	 * @param   integer  $recordId  The primary key id for the item.
-	 * @param   string   $urlVar    The name of the URL variable for the id.
-	 *
-	 * @return  string  The arguments to append to the redirect URL.
-	 *
-	 * @since   1.6
-	 */
-	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
-	{
-		// get the referral options (old method use return instead see parent)
-		$ref = $this->input->get('ref', 0, 'string');
-		$refid = $this->input->get('refid', 0, 'int');
-
-		// get redirect info.
-		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
-
-		// set the referral options
-		if ($refid && $ref)
-		{
-			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
-		}
-		elseif ($ref)
-		{
-			$append = '&ref='. (string) $ref . $append;
-		}
-
-		return $append;
-	}
-
-	/**
-	 * Method to run batch operations.
-	 *
-	 * @param   object  $model  The model.
-	 *
-	 * @return  boolean   True if successful, false otherwise and internal error is set.
-	 *
-	 * @since   2.5
-	 */
-	public function batch($model = null)
-	{
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		// Set the model
-		$model = $this->getModel('Layout', '', []);
-
-		// Preset the redirect
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=layouts' . $this->getRedirectToListAppend(), false));
-
-		return parent::batch($model);
-	}
-
-	/**
-	 * Method to cancel an edit.
-	 *
-	 * @param   string  $key  The name of the primary key of the URL variable.
-	 *
-	 * @return  boolean  True if access level checks pass, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function cancel($key = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-
-		$cancel = parent::cancel($key);
-
-		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view='.(string)$this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $cancel;
-	}
-
-	/**
-	 * Method to save a record.
-	 *
-	 * @param   string  $key     The name of the primary key of the URL variable.
-	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-	 *
-	 * @return  boolean  True if successful, false otherwise.
-	 *
-	 * @since   12.2
-	 */
-	public function save($key = null, $urlVar = null)
-	{
-		// get the referral options
-		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid = $this->input->get('refid', 0, 'int');
-
-		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
-
-		if ($this->ref || $this->refid || $canReturn)
-		{
-			// to make sure the item is checkedin on redirect
-			$this->task = 'save';
-		}
-
-		$saved = parent::save($key, $urlVar);
-
-		// This is not needed since parent save already does this
-		// Due to the ref and refid implementation we need to add this
-		if ($canReturn)
-		{
-			$redirect = base64_decode($return);
-
-			// Redirect to the return value.
-			$this->setRedirect(
-				Route::_(
-					$redirect, false
-				)
-			);
-		}
-		elseif ($this->refid && $this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
-
-			// Redirect to the item screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref)
-		{
-			$redirect = '&view=' . (string) $this->ref;
-
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		return $saved;
-	}
-
-	/**
-	 * Function that allows child controller access to model data
-	 * after the data has been saved.
-	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
-	 * @param   array              $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{
-		return;
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robot	29fef2cbea	Release of v5.0.3-alpha1 Add push option to powers area.	2024-08-20 22:34:47 +02:00
Robot	2fab51f611	Release of v5.0.2 Fix site view form missing classes in J4+. Fix permissions tab in items in J4+. Fix site display controller checkEditId function in J4+. Add class methods to the HtmlView classes in J4+. Fix broken toolbar call in HtmlView in J4+. Fix missing scripts and styles fields and methods in the site admin view model. Update subform field layout across JCB for cleaner look. Remove expansion feature. Fix helper area. Fix database mySql update in J4+. Remove phpspreadsheet completely from Joomla 4+. Add option to use powers in preflight event in the installer class. Fix abstract schema class function check default index warring. Fix dynamicGet so that the table values will load again. #1155. Add more pure JS to the dynamic get area. Add native plugin builder for Joomla 4 & 5. Add basic API for admin views.	2024-08-16 19:22:12 +02:00
Robot	22aa94ad9c	Release of v5.0.2-beta4 Add native plugin builder for Joomla 4 & 5.	2024-08-15 01:35:23 +02:00
Robot	6d24fcfd2b	Release of v5.0.2-beta3 Add more pure JS to the dynamic get area.	2024-08-01 23:01:42 +02:00
Robot	04ebefe98d	Release of v5.0.2-beta2 Fix dynamicGet so that the table values will load again. #1155.	2024-08-01 18:08:40 +02:00
Robot	6a96c3b2c1	Release of v5.0.2-beta1 Fix abstract schema class function check default index warring.	2024-08-01 10:06:30 +02:00
Robot	c8b65b3b0b	Release of v5.0.2-alpha3 Fix database mySql update in J4+. Remove phpspreadsheet completely from Joomla 4+. Add option to use powers in preflight event in the installer class.	2024-07-27 22:55:29 +02:00
Robot	0cbe573fe0	Release of v5.0.2-alpha2 Fix missing scripts and styles fields and methods in the site admin view model. Update subform field layout across JCB for cleaner look. Remove expansion feature. Fix helper area.	2024-07-26 18:34:11 +02:00
Robot	9f05fb090f	Release of v5.0.2-alpha1 Fix site view form missing classes in J4+. Fix permissions tab in items in J4+. Fix site display controller checkEditId function in J4+. Add class methods to the HtmlView classes in J4+. Fix broken toolbar call in HtmlView in J4+.	2024-07-26 15:35:23 +02:00
Robot	e4d8b043c2	Release of v5.0.1 Fix auto build from SQL in Joomla 5. Fix permission issue for admin views. Add in JCB gitea push feature to help maintain JCB core features. Add extending options to interfaces. Change the extendsinterfaces field to allow null, #1139. Update the Schema class to also update null mismatching if needed. Add repositories for better integration with gitea. Refactored the Data classes. Add new Data classes. Add new subform classes. Fix registry class methods return type. Update all list and custom fields to use the new layouts. Add push options to Joomla Power. Complete the Joomla Power Init and Reset features. Fix Gitea Contents class functions. Fix subform set methods. Improved the Joomla Power Push path. Fix the metadata, metadesc, metakey database issue. Fix function mismatch call in the compiler power class. Fix init feature to only add missing powers. Fix controller postSaveHook function, for correct model class in Joomla 4 and 5. Fix app instances (mismatch) in the install script and schema class when installing from CLI. Add option to use placeholders in Joomla Power namespaces. Fix subform layout of uikit in JCB.	2024-07-20 22:40:37 +02:00
Robot	c6a6e8266a	Release of v5.0.1-rc1 Final testing for stable release!.	2024-07-19 17:28:07 +02:00
Robot	25b59990b3	Release of v5.0.1-beta5 Add option to use placeholders in Joomla Power namespaces.	2024-07-19 12:35:14 +02:00
Robot	9db186ef73	Update on v5.0.1-beta4 (changes towards the next release) Here's an update on the current version, which includes changes towards the next release still in development.	2024-07-18 21:12:31 +02:00
Robot	b9860f7718	Release of v5.0.1-beta4 Fix app instances (mismatch) in the install script and schema class when installing from CLI.	2024-07-18 20:47:33 +02:00
Robot	dbe4c858fd	Release of v5.0.1-beta3 Fix init feature to only add missing powers. Fix controller postSaveHook function, for correct model class in Joomla 4 and 5.	2024-07-18 17:10:48 +02:00
Robot	9284115e8d	Update on v5.0.1-beta2 (changes towards the next release) Here's an update on the current version, which includes changes towards the next release still in development.	2024-07-18 14:57:59 +02:00
Robot	92a14a44f5	Release of v5.0.1-beta2 Fix function mismatch call in the compiler power class.	2024-07-17 16:02:47 +02:00
Robot	a4a4a2ab9a	Release of v5.0.1-beta1 Fix subform set methods. Improved the Joomla Power Push path. Fix the metadata, metadesc, metakey database issue.	2024-07-17 02:30:54 +02:00
Robot	18545c5b8d	Release of v5.0.1-alpha7 Add push options to Joomla Power. Complete the Joomla Power Init and Reset features. Fix Gitea Contents class functions. Last Alpha release (feature block).	2024-07-08 22:55:12 +02:00
Robot	0cbf3c0e71	Release of v5.0.1-alpha6 Add new subform classes. Fix registry class methods return type. Update all list and custom fields to use the new layouts.	2024-06-28 03:50:52 +02:00
Robot	c51ef999a9	Release of v5.0.1-alpha5 Add repositories for better integration with gitea. Refactored the Data classes. Add new Data classes.	2024-06-21 03:25:28 +02:00
Robot	fc6b04cb5c	Release of v5.0.1-alpha4 Change the extendsinterfaces field to allow null, #1139. Update the Schema class to also update null mismatching if needed.	2024-06-07 23:21:05 +02:00
Robot	0c9a098335	Release of v5.0.1-alpha3 Add in JCB gitea push feature to help maintain JCB core features. Add extending options to interfaces.	2024-06-05 17:08:34 +02:00
Robot	aba1267f8e	Release of v5.0.1-alpha2 Fix permission issue for admin views.	2024-05-16 16:07:17 +02:00
Robot	54d94753b4	Release of v5.0.1-alpha1 Fix auto build from SQL in Joomla 5.	2024-05-13 12:21:17 +02:00
Robot	b3199d2abb	Release of v5.0.0 Fix the plug-in installer script builder bug #1067. Fix Event triggers for Joomla 4 and 5 builds. Add fix to the update script, so that upgrading JCB from Joomla 4 to 5 will not fail. Fix plugin field selection. Fix plugin params tab layout. Add issue templates. Force autoloader to always load. Fix repeatable layout #1076. Add Factory class to the J5 Event class. #1093. Fix customfilelist field to conform to the new namespacing conventions. #1094. Add menus for languages, servers, get snippets to J5 #1095. Fix [Set String Value] in placeholder table to store the value as a base64 string. Fix the search area layout. Fix the search area code line selection. Fix the input edit button for custom fields. Add the new layout to list fields (GUI UPDATE). Start fixing the field view in Joomla 5. #1096. Add power path override option on component level. Fix the sql build feature. #1032. Add the compiler menu back. Fix the CustomfolderlistField #1094. Add view list and single name fix. Add component code name fix. Add reset list of powers. Add Joomla powers for namespace dynamic management. Add fallback option to ensure that all JCB tables and fields exist. Move the powers autoloader to its own file. Fix the media field size limitation. #1109. Add dynamic datatype update to schema field check. Fix version_update column size. Improved the Schema Table update engine. Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses. Remove the SQL update, to only use the Schema updates of table columns to avoid collusion. Fix the admin.css file loading on dashboard. #1112. Fix dynamic get data-type default to 0. #1110. Fix the missing model call. #1114. Fix the wrong $date call. #1115. Add the BaseDatabaseModel use statement to custom site view controller. #1119. Fix the customfolderlist field. #1120.	2024-05-10 18:39:24 +02:00
Robot	b37c57611f	Release of v5.0.0-rc6 Fix the customfolderlist field. #1120.	2024-05-06 07:48:49 +02:00
Robot	827641a3d4	Release of v5.0.0-rc5 Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses. Remove the SQL update, to only use the Schema updates of table columns to avoid collusion. Fix the admin.css file loading on dashboard. #1112. Fix dynamic get data-type default to 0. #1110. Fix the missing model call. #1114. Fix the wrong $date call. #1115. Add the BaseDatabaseModel use statement to custom site view controller. #1119.	2024-05-03 07:47:48 +02:00
Robot	a24b5a0757	Release of v5.0.0-rc3 Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses. Remove the SQL update, to only use the Schema updates of table columns to avoid collusion. Fix the admin.css file loading on dashboard. #1112. Fix dynamic get data-type default to 0. #1110.	2024-04-30 19:21:28 +02:00
Robot	8ab5f2daf4	Release of v5.0.0-rc2 Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses. Remove the SQL update, to only use the Schema updates of table columns to avoid collusion.	2024-04-30 12:29:37 +02:00
Robot	2a9a66b8a7	Release of v5.0.0-rc1 Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses.	2024-04-27 16:00:36 +02:00
Robot	59af18e13a	Release of v5.0.0-beta5 Fix the media field size limitation. #1109. Add dynamic datatype update to schema field check. Fix version_update column size. Improved the Schema Table update engine.	2024-04-24 21:38:12 +02:00
Robot	0193ab735c	Release of v5.0.0-beta4 Add fallback option to ensure that all JCB tables and fields exist. Move the powers autoloader to its own file.	2024-04-22 01:15:03 +02:00
Robot	00f14c3bba	Release of v5.0.0-beta3 Add Joomla powers for namespace dynamic management.	2024-04-16 20:26:48 +02:00
Lemuel van der Merwe	25b751a935	Takes away a unnecessary question from the issue_template's a-bug.yml.	2024-04-09 19:21:50 +02:00
Robot	b2c9daa455	Release of v5.0.0-beta2 Add view list and single name fix. Add component code name fix. Add reset list of powers.	2024-04-09 13:54:59 +02:00
Robot	b988010b79	Release of v5.0.0-beta1 Add the compiler menu back. Fix the CustomfolderlistField #1094.	2024-04-07 12:01:31 +02:00
Robot	2b7b8f90e1	Release of v5.0.0-alpha8 Add power path override option on component level. Fix the sql build feature. #1032.	2024-04-06 23:41:34 +02:00
Robot	2f64eec95b	Release of v5.0.0-alpha7 Fix the search area layout. Fix the search area code line selection. Fix the input edit button for custom fields. Add the new layout to list fields (GUI UPDATE). Start fixing the field view in Joomla 5. #1096.	2024-03-26 22:51:07 +02:00
Robot	8548530b6d	Release of v5.0.0-alpha6 Fix [Set String Value] in placeholder table to store the value as a base64 string.	2024-03-20 15:36:42 +02:00
Robot	ac3e230272	Release of v5.0.0-alpha5 Add Factory class to the J5 Event class. #1093. Fix customfilelist field to conform to the new namespacing conventions. #1094. Add menus for languages, servers, get snippets to J5 #1095.	2024-03-20 14:22:10 +02:00
Robot	8deb178d7c	Release of v5.0.0-alpha4 Fix plugin field selection. Fix plugin params tab layout. Add issue templates. Force autoloader to always load. Fix repeatable layout #1076.	2024-03-15 12:26:29 +02:00
Lemuel van der Merwe	4ef96e9931	Adds g-security.yml to Component Builder v5.x	2024-03-14 14:15:15 +00:00
Lemuel van der Merwe	4116d87799	Adds e-performance.yml to Component Builder v5.x	2024-03-14 14:15:15 +00:00
Lemuel van der Merwe	1e286a7f6e	Adds c-task.yml to Component Builder v5.x	2024-03-14 14:15:15 +00:00
Lemuel van der Merwe	e77ebd8e27	Adds a-bug.yml to Component Builder v5.x	2024-03-14 14:15:15 +00:00
Malachi van der Merwe	ece14672d1	Adds an issue template for reporting the refactoring of specific locations in JCB.	2024-03-14 10:22:04 +02:00
Malachi van der Merwe	87706b19bc	Adds an issue template for the improvement of documentation in JCB.	2024-03-14 10:21:14 +02:00
Malachi van der Merwe	ecc51c4871	Adds a issue template for reporting enhancements to JCB.	2024-03-14 10:19:10 +02:00
Robot	44dacc36a0	Release of v5.0.0-alpha3 Add fix to the update script, so that upgrading JCB from Joomla 4 to 5 will not fail.	2024-03-12 12:56:41 +02:00
Robot	a920cb429b	Stable release of v5.0.0-alpha2 Fix the plug-in installer script builder bug #1067. Fix Event triggers for Joomla 4 and 5 builds.	2024-03-11 18:30:57 +02:00
Robot	87cd4305bb	Stable release of v5.0.0-alpha1 First alpha release of Component Builder towards Joomla 5 (very unstable...).	2024-03-09 21:52:51 +02:00