diff --git a/README.md b/README.md
index fd0fa51c6..c38bcf8fa 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 10th March, 2021
++ *Last Build*: 16th March, 2021
 + *Version*: 2.12.9
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index fd0fa51c6..c38bcf8fa 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -143,7 +143,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 10th March, 2021
++ *Last Build*: 16th March, 2021
 + *Version*: 2.12.9
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/compiler/joomla_3/JModelAdmin.php b/admin/compiler/joomla_3/JModelAdmin.php
index c44f02bbd..9922d920b 100644
--- a/admin/compiler/joomla_3/JModelAdmin.php
+++ b/admin/compiler/joomla_3/JModelAdmin.php
@@ -127,7 +127,7 @@ class ###Component###Model###View### extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_###component###/models/forms/###view###.js';
+		return 'media/com_###component###/js/###view###.js';
 	}
     
 	/**
diff --git a/admin/compiler/joomla_3/JModelAdmin_site.php b/admin/compiler/joomla_3/JModelAdmin_site.php
index ba406fdcd..b0a06753d 100644
--- a/admin/compiler/joomla_3/JModelAdmin_site.php
+++ b/admin/compiler/joomla_3/JModelAdmin_site.php
@@ -127,7 +127,7 @@ class ###Component###Model###View### extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_###component###/models/forms/###view###.js';
+		return 'media/com_###component###/js/###view###.js';
 	}
     
 	/**
diff --git a/admin/compiler/joomla_3/settings.json b/admin/compiler/joomla_3/settings.json
index e8a1de7bd..edfe475a9 100644
--- a/admin/compiler/joomla_3/settings.json
+++ b/admin/compiler/joomla_3/settings.json
@@ -280,7 +280,7 @@
 					"type": "single"
 				},
 				"module_forms.js": {
-					"path": "c0mp0n3nt/admin/models/forms",
+					"path": "c0mp0n3nt/media/js",
 					"rename": "module_forms",
 					"type": "single"
 				},
diff --git a/admin/models/admin_custom_tabs.php b/admin/models/admin_custom_tabs.php
index 418bd7c80..a2dc3290d 100644
--- a/admin/models/admin_custom_tabs.php
+++ b/admin/models/admin_custom_tabs.php
@@ -238,7 +238,7 @@ class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/admin_custom_tabs.js';
+		return 'media/com_componentbuilder/js/admin_custom_tabs.js';
 	}
     
 	/**
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index 59356b5f3..9eb9bf0a8 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -259,7 +259,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/admin_fields.js';
+		return 'media/com_componentbuilder/js/admin_fields.js';
 	}
     
 	/**
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 68a5f9509..686e5dc8c 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -259,7 +259,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/admin_fields_conditions.js';
+		return 'media/com_componentbuilder/js/admin_fields_conditions.js';
 	}
     
 	/**
diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php
index 24e4b31fc..1f155d9a1 100644
--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@@ -321,7 +321,7 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/admin_fields_relations.js';
+		return 'media/com_componentbuilder/js/admin_fields_relations.js';
 	}
     
 	/**
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 3cd110fa5..d2a640855 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -818,7 +818,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/admin_view.js';
+		return 'media/com_componentbuilder/js/admin_view.js';
 	}
     
 	/**
diff --git a/admin/models/class_extends.php b/admin/models/class_extends.php
index 67f07d021..03216d301 100644
--- a/admin/models/class_extends.php
+++ b/admin/models/class_extends.php
@@ -342,7 +342,7 @@ class ComponentbuilderModelClass_extends extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/class_extends.js';
+		return 'media/com_componentbuilder/js/class_extends.js';
 	}
     
 	/**
diff --git a/admin/models/class_method.php b/admin/models/class_method.php
index 0e596434e..bb7e9bd71 100644
--- a/admin/models/class_method.php
+++ b/admin/models/class_method.php
@@ -358,7 +358,7 @@ class ComponentbuilderModelClass_method extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/class_method.js';
+		return 'media/com_componentbuilder/js/class_method.js';
 	}
     
 	/**
diff --git a/admin/models/class_property.php b/admin/models/class_property.php
index 4f5b66aec..0f25141ec 100644
--- a/admin/models/class_property.php
+++ b/admin/models/class_property.php
@@ -349,7 +349,7 @@ class ComponentbuilderModelClass_property extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/class_property.js';
+		return 'media/com_componentbuilder/js/class_property.js';
 	}
     
 	/**
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index a7063aa6f..b83118693 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -270,7 +270,7 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_admin_views.js';
+		return 'media/com_componentbuilder/js/component_admin_views.js';
 	}
     
 	/**
diff --git a/admin/models/component_config.php b/admin/models/component_config.php
index 266038484..7a0540f2d 100644
--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@@ -266,7 +266,7 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_config.js';
+		return 'media/com_componentbuilder/js/component_config.js';
 	}
     
 	/**
diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php
index 4f1bc1304..7e9171664 100644
--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@@ -266,7 +266,7 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_custom_admin_menus.js';
+		return 'media/com_componentbuilder/js/component_custom_admin_menus.js';
 	}
     
 	/**
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index c82da6f68..0f438a0ca 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -270,7 +270,7 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_custom_admin_views.js';
+		return 'media/com_componentbuilder/js/component_custom_admin_views.js';
 	}
     
 	/**
diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php
index 8e71cef9d..bc38469ab 100644
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@@ -355,7 +355,7 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_dashboard.js';
+		return 'media/com_componentbuilder/js/component_dashboard.js';
 	}
     
 	/**
diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php
index e4ad6f16f..85645e4e5 100644
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@@ -303,7 +303,7 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_files_folders.js';
+		return 'media/com_componentbuilder/js/component_files_folders.js';
 	}
     
 	/**
diff --git a/admin/models/component_modules.php b/admin/models/component_modules.php
index c71f92801..4e5917003 100644
--- a/admin/models/component_modules.php
+++ b/admin/models/component_modules.php
@@ -236,7 +236,7 @@ class ComponentbuilderModelComponent_modules extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_modules.js';
+		return 'media/com_componentbuilder/js/component_modules.js';
 	}
     
 	/**
diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php
index 34a6a2596..257a96331 100644
--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@@ -266,7 +266,7 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_mysql_tweaks.js';
+		return 'media/com_componentbuilder/js/component_mysql_tweaks.js';
 	}
     
 	/**
diff --git a/admin/models/component_placeholders.php b/admin/models/component_placeholders.php
index 87f213ab5..bf9c9ec03 100644
--- a/admin/models/component_placeholders.php
+++ b/admin/models/component_placeholders.php
@@ -235,7 +235,7 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_placeholders.js';
+		return 'media/com_componentbuilder/js/component_placeholders.js';
 	}
     
 	/**
diff --git a/admin/models/component_plugins.php b/admin/models/component_plugins.php
index 17243acc8..00430c310 100644
--- a/admin/models/component_plugins.php
+++ b/admin/models/component_plugins.php
@@ -236,7 +236,7 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_plugins.js';
+		return 'media/com_componentbuilder/js/component_plugins.js';
 	}
     
 	/**
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index d39ffd0bf..ebec0c7de 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -270,7 +270,7 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_site_views.js';
+		return 'media/com_componentbuilder/js/component_site_views.js';
 	}
     
 	/**
diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php
index b4a0ccfa3..6d0af5578 100644
--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@@ -266,7 +266,7 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/component_updates.js';
+		return 'media/com_componentbuilder/js/component_updates.js';
 	}
     
 	/**
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 3edd664c0..170e83530 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -522,7 +522,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/custom_admin_view.js';
+		return 'media/com_componentbuilder/js/custom_admin_view.js';
 	}
     
 	/**
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index d51807c4b..ad77de21b 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -351,7 +351,7 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/custom_code.js';
+		return 'media/com_componentbuilder/js/custom_code.js';
 	}
     
 	/**
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index 6c7feeb82..67c3a90b1 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -542,7 +542,7 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/dynamic_get.js';
+		return 'media/com_componentbuilder/js/dynamic_get.js';
 	}
     
 	/**
diff --git a/admin/models/field.php b/admin/models/field.php
index da907ab6f..c2a8a2226 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -435,7 +435,7 @@ class ComponentbuilderModelField extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/field.js';
+		return 'media/com_componentbuilder/js/field.js';
 	}
     
 	/**
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index a6cf3c4ee..025e6440c 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -614,7 +614,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/fieldtype.js';
+		return 'media/com_componentbuilder/js/fieldtype.js';
 	}
     
 	/**
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 8e45eb824..23e4eee7c 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -247,7 +247,7 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/help_document.js';
+		return 'media/com_componentbuilder/js/help_document.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index aad548d1a..ab68e104a 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -712,7 +712,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_component.js';
+		return 'media/com_componentbuilder/js/joomla_component.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_module.php b/admin/models/joomla_module.php
index b847b3476..965c88c69 100644
--- a/admin/models/joomla_module.php
+++ b/admin/models/joomla_module.php
@@ -530,7 +530,7 @@ class ComponentbuilderModelJoomla_module extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_module.js';
+		return 'media/com_componentbuilder/js/joomla_module.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_module_files_folders_urls.php b/admin/models/joomla_module_files_folders_urls.php
index c68c0bb6f..b51d382b4 100644
--- a/admin/models/joomla_module_files_folders_urls.php
+++ b/admin/models/joomla_module_files_folders_urls.php
@@ -281,7 +281,7 @@ class ComponentbuilderModelJoomla_module_files_folders_urls extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_module_files_folders_urls.js';
+		return 'media/com_componentbuilder/js/joomla_module_files_folders_urls.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_module_updates.php b/admin/models/joomla_module_updates.php
index 301acadcd..dfc218c85 100644
--- a/admin/models/joomla_module_updates.php
+++ b/admin/models/joomla_module_updates.php
@@ -235,7 +235,7 @@ class ComponentbuilderModelJoomla_module_updates extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_module_updates.js';
+		return 'media/com_componentbuilder/js/joomla_module_updates.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_plugin.php b/admin/models/joomla_plugin.php
index 12ffba20f..c1c17c29d 100644
--- a/admin/models/joomla_plugin.php
+++ b/admin/models/joomla_plugin.php
@@ -495,7 +495,7 @@ class ComponentbuilderModelJoomla_plugin extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_plugin.js';
+		return 'media/com_componentbuilder/js/joomla_plugin.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_plugin_files_folders_urls.php b/admin/models/joomla_plugin_files_folders_urls.php
index a8015fb3f..1b24326d4 100644
--- a/admin/models/joomla_plugin_files_folders_urls.php
+++ b/admin/models/joomla_plugin_files_folders_urls.php
@@ -281,7 +281,7 @@ class ComponentbuilderModelJoomla_plugin_files_folders_urls extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_plugin_files_folders_urls.js';
+		return 'media/com_componentbuilder/js/joomla_plugin_files_folders_urls.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_plugin_group.php b/admin/models/joomla_plugin_group.php
index 45be78032..5d1634db8 100644
--- a/admin/models/joomla_plugin_group.php
+++ b/admin/models/joomla_plugin_group.php
@@ -225,7 +225,7 @@ class ComponentbuilderModelJoomla_plugin_group extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_plugin_group.js';
+		return 'media/com_componentbuilder/js/joomla_plugin_group.js';
 	}
     
 	/**
diff --git a/admin/models/joomla_plugin_updates.php b/admin/models/joomla_plugin_updates.php
index 28673a4db..1d34194d3 100644
--- a/admin/models/joomla_plugin_updates.php
+++ b/admin/models/joomla_plugin_updates.php
@@ -235,7 +235,7 @@ class ComponentbuilderModelJoomla_plugin_updates extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/joomla_plugin_updates.js';
+		return 'media/com_componentbuilder/js/joomla_plugin_updates.js';
 	}
     
 	/**
diff --git a/admin/models/language.php b/admin/models/language.php
index 3154fb8a3..407ee5a51 100644
--- a/admin/models/language.php
+++ b/admin/models/language.php
@@ -225,7 +225,7 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/language.js';
+		return 'media/com_componentbuilder/js/language.js';
 	}
     
 	/**
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 31196d6bc..c068b27ae 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -322,7 +322,7 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/language_translation.js';
+		return 'media/com_componentbuilder/js/language_translation.js';
 	}
     
 	/**
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 1839a9f2d..7f815ae13 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -367,7 +367,7 @@ class ComponentbuilderModelLayout extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/layout.js';
+		return 'media/com_componentbuilder/js/layout.js';
 	}
     
 	/**
diff --git a/admin/models/library.php b/admin/models/library.php
index 4564a806f..503114920 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -374,7 +374,7 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/library.js';
+		return 'media/com_componentbuilder/js/library.js';
 	}
     
 	/**
diff --git a/admin/models/library_config.php b/admin/models/library_config.php
index d4daba221..7a59f29a4 100644
--- a/admin/models/library_config.php
+++ b/admin/models/library_config.php
@@ -235,7 +235,7 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/library_config.js';
+		return 'media/com_componentbuilder/js/library_config.js';
 	}
     
 	/**
diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php
index f71a21683..e162b23f3 100644
--- a/admin/models/library_files_folders_urls.php
+++ b/admin/models/library_files_folders_urls.php
@@ -281,7 +281,7 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/library_files_folders_urls.js';
+		return 'media/com_componentbuilder/js/library_files_folders_urls.js';
 	}
     
 	/**
diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php
index e8f5380d7..a647a004f 100644
--- a/admin/models/placeholder.php
+++ b/admin/models/placeholder.php
@@ -316,7 +316,7 @@ class ComponentbuilderModelPlaceholder extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/placeholder.js';
+		return 'media/com_componentbuilder/js/placeholder.js';
 	}
     
 	/**
diff --git a/admin/models/server.php b/admin/models/server.php
index ea573835f..5c85cd5dd 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -397,7 +397,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/server.js';
+		return 'media/com_componentbuilder/js/server.js';
 	}
     
 	/**
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index 1a84ff315..62abfdcc7 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -543,7 +543,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/site_view.js';
+		return 'media/com_componentbuilder/js/site_view.js';
 	}
     
 	/**
diff --git a/admin/models/snippet.php b/admin/models/snippet.php
index 679d7b215..b3b150d35 100644
--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@@ -259,7 +259,7 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/snippet.js';
+		return 'media/com_componentbuilder/js/snippet.js';
 	}
     
 	/**
diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php
index 6be318f5e..6894c6468 100644
--- a/admin/models/snippet_type.php
+++ b/admin/models/snippet_type.php
@@ -225,7 +225,7 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/snippet_type.js';
+		return 'media/com_componentbuilder/js/snippet_type.js';
 	}
     
 	/**
diff --git a/admin/models/template.php b/admin/models/template.php
index 775dc15d9..98ba44c22 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -367,7 +367,7 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/template.js';
+		return 'media/com_componentbuilder/js/template.js';
 	}
     
 	/**
diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php
index 9f818935b..89d4b1c8d 100644
--- a/admin/models/validation_rule.php
+++ b/admin/models/validation_rule.php
@@ -319,7 +319,7 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 	 */
 	public function getScript()
 	{
-		return 'administrator/components/com_componentbuilder/models/forms/validation_rule.js';
+		return 'media/com_componentbuilder/js/validation_rule.js';
 	}
     
 	/**
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 852bd60a3..dcbe74458 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>10th March, 2021</creationDate>
+	<creationDate>16th March, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/admin/models/forms/admin_custom_tabs.js b/media/js/admin_custom_tabs.js
similarity index 100%
rename from admin/models/forms/admin_custom_tabs.js
rename to media/js/admin_custom_tabs.js
diff --git a/admin/models/forms/admin_fields.js b/media/js/admin_fields.js
similarity index 100%
rename from admin/models/forms/admin_fields.js
rename to media/js/admin_fields.js
diff --git a/admin/models/forms/admin_fields_conditions.js b/media/js/admin_fields_conditions.js
similarity index 100%
rename from admin/models/forms/admin_fields_conditions.js
rename to media/js/admin_fields_conditions.js
diff --git a/admin/models/forms/admin_fields_relations.js b/media/js/admin_fields_relations.js
similarity index 100%
rename from admin/models/forms/admin_fields_relations.js
rename to media/js/admin_fields_relations.js
diff --git a/admin/models/forms/admin_view.js b/media/js/admin_view.js
similarity index 100%
rename from admin/models/forms/admin_view.js
rename to media/js/admin_view.js
diff --git a/admin/models/forms/class_extends.js b/media/js/class_extends.js
similarity index 100%
rename from admin/models/forms/class_extends.js
rename to media/js/class_extends.js
diff --git a/admin/models/forms/class_method.js b/media/js/class_method.js
similarity index 100%
rename from admin/models/forms/class_method.js
rename to media/js/class_method.js
diff --git a/admin/models/forms/class_property.js b/media/js/class_property.js
similarity index 100%
rename from admin/models/forms/class_property.js
rename to media/js/class_property.js
diff --git a/admin/models/forms/component_admin_views.js b/media/js/component_admin_views.js
similarity index 100%
rename from admin/models/forms/component_admin_views.js
rename to media/js/component_admin_views.js
diff --git a/admin/models/forms/component_config.js b/media/js/component_config.js
similarity index 100%
rename from admin/models/forms/component_config.js
rename to media/js/component_config.js
diff --git a/admin/models/forms/component_custom_admin_menus.js b/media/js/component_custom_admin_menus.js
similarity index 100%
rename from admin/models/forms/component_custom_admin_menus.js
rename to media/js/component_custom_admin_menus.js
diff --git a/admin/models/forms/component_custom_admin_views.js b/media/js/component_custom_admin_views.js
similarity index 100%
rename from admin/models/forms/component_custom_admin_views.js
rename to media/js/component_custom_admin_views.js
diff --git a/admin/models/forms/component_dashboard.js b/media/js/component_dashboard.js
similarity index 100%
rename from admin/models/forms/component_dashboard.js
rename to media/js/component_dashboard.js
diff --git a/admin/models/forms/component_files_folders.js b/media/js/component_files_folders.js
similarity index 100%
rename from admin/models/forms/component_files_folders.js
rename to media/js/component_files_folders.js
diff --git a/admin/models/forms/component_modules.js b/media/js/component_modules.js
similarity index 100%
rename from admin/models/forms/component_modules.js
rename to media/js/component_modules.js
diff --git a/admin/models/forms/component_mysql_tweaks.js b/media/js/component_mysql_tweaks.js
similarity index 100%
rename from admin/models/forms/component_mysql_tweaks.js
rename to media/js/component_mysql_tweaks.js
diff --git a/admin/models/forms/component_placeholders.js b/media/js/component_placeholders.js
similarity index 100%
rename from admin/models/forms/component_placeholders.js
rename to media/js/component_placeholders.js
diff --git a/admin/models/forms/component_plugins.js b/media/js/component_plugins.js
similarity index 100%
rename from admin/models/forms/component_plugins.js
rename to media/js/component_plugins.js
diff --git a/admin/models/forms/component_site_views.js b/media/js/component_site_views.js
similarity index 100%
rename from admin/models/forms/component_site_views.js
rename to media/js/component_site_views.js
diff --git a/admin/models/forms/component_updates.js b/media/js/component_updates.js
similarity index 100%
rename from admin/models/forms/component_updates.js
rename to media/js/component_updates.js
diff --git a/admin/models/forms/custom_admin_view.js b/media/js/custom_admin_view.js
similarity index 100%
rename from admin/models/forms/custom_admin_view.js
rename to media/js/custom_admin_view.js
diff --git a/admin/models/forms/custom_code.js b/media/js/custom_code.js
similarity index 100%
rename from admin/models/forms/custom_code.js
rename to media/js/custom_code.js
diff --git a/admin/models/forms/dynamic_get.js b/media/js/dynamic_get.js
similarity index 100%
rename from admin/models/forms/dynamic_get.js
rename to media/js/dynamic_get.js
diff --git a/admin/models/forms/field.js b/media/js/field.js
similarity index 100%
rename from admin/models/forms/field.js
rename to media/js/field.js
diff --git a/admin/models/forms/fieldtype.js b/media/js/fieldtype.js
similarity index 100%
rename from admin/models/forms/fieldtype.js
rename to media/js/fieldtype.js
diff --git a/admin/models/forms/help_document.js b/media/js/help_document.js
similarity index 100%
rename from admin/models/forms/help_document.js
rename to media/js/help_document.js
diff --git a/admin/models/forms/joomla_component.js b/media/js/joomla_component.js
similarity index 100%
rename from admin/models/forms/joomla_component.js
rename to media/js/joomla_component.js
diff --git a/admin/models/forms/joomla_module.js b/media/js/joomla_module.js
similarity index 100%
rename from admin/models/forms/joomla_module.js
rename to media/js/joomla_module.js
diff --git a/admin/models/forms/joomla_module_files_folders_urls.js b/media/js/joomla_module_files_folders_urls.js
similarity index 100%
rename from admin/models/forms/joomla_module_files_folders_urls.js
rename to media/js/joomla_module_files_folders_urls.js
diff --git a/admin/models/forms/joomla_module_updates.js b/media/js/joomla_module_updates.js
similarity index 100%
rename from admin/models/forms/joomla_module_updates.js
rename to media/js/joomla_module_updates.js
diff --git a/admin/models/forms/joomla_plugin.js b/media/js/joomla_plugin.js
similarity index 100%
rename from admin/models/forms/joomla_plugin.js
rename to media/js/joomla_plugin.js
diff --git a/admin/models/forms/joomla_plugin_files_folders_urls.js b/media/js/joomla_plugin_files_folders_urls.js
similarity index 100%
rename from admin/models/forms/joomla_plugin_files_folders_urls.js
rename to media/js/joomla_plugin_files_folders_urls.js
diff --git a/admin/models/forms/joomla_plugin_group.js b/media/js/joomla_plugin_group.js
similarity index 100%
rename from admin/models/forms/joomla_plugin_group.js
rename to media/js/joomla_plugin_group.js
diff --git a/admin/models/forms/joomla_plugin_updates.js b/media/js/joomla_plugin_updates.js
similarity index 100%
rename from admin/models/forms/joomla_plugin_updates.js
rename to media/js/joomla_plugin_updates.js
diff --git a/admin/models/forms/language.js b/media/js/language.js
similarity index 100%
rename from admin/models/forms/language.js
rename to media/js/language.js
diff --git a/admin/models/forms/language_translation.js b/media/js/language_translation.js
similarity index 100%
rename from admin/models/forms/language_translation.js
rename to media/js/language_translation.js
diff --git a/admin/models/forms/layout.js b/media/js/layout.js
similarity index 100%
rename from admin/models/forms/layout.js
rename to media/js/layout.js
diff --git a/admin/models/forms/library.js b/media/js/library.js
similarity index 100%
rename from admin/models/forms/library.js
rename to media/js/library.js
diff --git a/admin/models/forms/library_config.js b/media/js/library_config.js
similarity index 100%
rename from admin/models/forms/library_config.js
rename to media/js/library_config.js
diff --git a/admin/models/forms/library_files_folders_urls.js b/media/js/library_files_folders_urls.js
similarity index 100%
rename from admin/models/forms/library_files_folders_urls.js
rename to media/js/library_files_folders_urls.js
diff --git a/admin/models/forms/placeholder.js b/media/js/placeholder.js
similarity index 100%
rename from admin/models/forms/placeholder.js
rename to media/js/placeholder.js
diff --git a/admin/models/forms/server.js b/media/js/server.js
similarity index 100%
rename from admin/models/forms/server.js
rename to media/js/server.js
diff --git a/admin/models/forms/site_view.js b/media/js/site_view.js
similarity index 100%
rename from admin/models/forms/site_view.js
rename to media/js/site_view.js
diff --git a/admin/models/forms/snippet.js b/media/js/snippet.js
similarity index 100%
rename from admin/models/forms/snippet.js
rename to media/js/snippet.js
diff --git a/admin/models/forms/snippet_type.js b/media/js/snippet_type.js
similarity index 100%
rename from admin/models/forms/snippet_type.js
rename to media/js/snippet_type.js
diff --git a/admin/models/forms/template.js b/media/js/template.js
similarity index 100%
rename from admin/models/forms/template.js
rename to media/js/template.js
diff --git a/admin/models/forms/validation_rule.js b/media/js/validation_rule.js
similarity index 100%
rename from admin/models/forms/validation_rule.js
rename to media/js/validation_rule.js