diff --git a/componentbuildercustomadminheaderstabs.xml b/componentbuildercustomadminheaderstabs.xml
index 862c644..fae3ce1 100644
--- a/componentbuildercustomadminheaderstabs.xml
+++ b/componentbuildercustomadminheaderstabs.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="5.0" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS</name>
-	<creationDate>27th July, 2024</creationDate>
+	<creationDate>14th August, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.0.0</version>
+	<version>4.0.0</version>
+	<namespace path="src">VDM\Plugin\Content\ComponentbuilderCustomAdminHeadersTabs</namespace>
 	<description>PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
@@ -15,15 +16,16 @@
 
 	<!-- Language files -->
 	<languages folder="language">
-		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.ini</language>
-		<language tag="en-GB">en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.sys.ini</language>
+		<language tag="en-GB">en-GB/plg_content_componentbuildercustomadminheaderstabs.ini</language>
+		<language tag="en-GB">en-GB/plg_content_componentbuildercustomadminheaderstabs.sys.ini</language>
 	</languages>
 
 	<!-- Plugin files -->
 	<files>
-		<filename plugin="componentbuildercustomadminheaderstabs">componentbuildercustomadminheaderstabs.php</filename>
+		<folder plugin="componentbuildercustomadminheaderstabs">services</folder>
 		<filename>index.html</filename>
-		<folder>language</folder>
 		<folder>forms</folder>
+		<folder>services</folder>
+		<folder>src</folder>
 	</files>
 </extension>
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.ini b/language/en-GB/plg_content_componentbuildercustomadminheaderstabs.ini
similarity index 99%
rename from language/en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.ini
rename to language/en-GB/plg_content_componentbuildercustomadminheaderstabs.ini
index 309f1d1..f1650bd 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.ini
+++ b/language/en-GB/plg_content_componentbuildercustomadminheaderstabs.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS="Content - Componentbuilder Custom Admin Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_DESCRIPTION="This plugin is used to set custom admin class custom headers."
-PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Custom Admin Headers Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Custom Admin Headers Tabs (v.4.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_CLASS_HEADERS="Class Headers"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_ADD_CUSTOM_ADMIN_VIEW_MODEL_LABEL="Target Custom Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_ADD_CUSTOM_ADMIN_VIEW_MODEL_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
diff --git a/language/en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.sys.ini b/language/en-GB/plg_content_componentbuildercustomadminheaderstabs.sys.ini
similarity index 99%
rename from language/en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.sys.ini
rename to language/en-GB/plg_content_componentbuildercustomadminheaderstabs.sys.ini
index 309f1d1..f1650bd 100644
--- a/language/en-GB/en-GB.plg_content_componentbuildercustomadminheaderstabs.sys.ini
+++ b/language/en-GB/plg_content_componentbuildercustomadminheaderstabs.sys.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS="Content - Componentbuilder Custom Admin Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_DESCRIPTION="This plugin is used to set custom admin class custom headers."
-PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Custom Admin Headers Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Custom Admin Headers Tabs (v.4.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set custom admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_CLASS_HEADERS="Class Headers"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_ADD_CUSTOM_ADMIN_VIEW_MODEL_LABEL="Target Custom Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_ADD_CUSTOM_ADMIN_VIEW_MODEL_DESCRIPTION="Only use this option if you have a <b>getItem</b> as your <b>Main Get</b>."
diff --git a/script.php b/script.php
index a9e6678..3905fcb 100644
--- a/script.php
+++ b/script.php
@@ -13,15 +13,129 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Version;
+use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Folder;
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
 
 /**
  * Content - Componentbuilder Custom Admin Headers Tabs script file.
  *
- * @package PlgContentComponentbuilderCustomAdminHeadersTabs
+ * @package ComponentbuilderCustomAdminHeadersTabs
  */
 class plgContentComponentbuilderCustomAdminHeadersTabsInstallerScript
 {
+	/**
+	 * The CMS Application.
+	 *
+	 * @since  4.4.2
+	 */
+	protected $app;
+
+	/**
+	 * A list of files to be deleted
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected array $deleteFiles = [];
+
+	/**
+	 * A list of folders to be deleted
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected array $deleteFolders = [];
+
+	/**
+	 * Constructor
+	 *
+	 * @param   InstallerAdapter  $adapter  The object responsible for running this script
+	 */
+	public function __construct($adapter)
+	{
+		// get application
+		$this->app = Factory::getApplication();
+
+		if (is_file(JPATH_ROOT . '/plugins/content/componentbuildercustomadminheaderstabs/componentbuildercustomadminheaderstabs.php'))
+		{
+			$this->deleteFiles[] = '/plugins/content/componentbuildercustomadminheaderstabs/componentbuildercustomadminheaderstabs.php';
+		}
+	}
+
+	/**
+	 * Called before any type of action
+	 *
+	 * @param   string  $route  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   InstallerAdapter  $adapter  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function preflight($route, $adapter)
+	{
+		// set application to local method var, just use $this->app in future [we will drop $app in J6]
+		$app = $this->app;
+
+		// the default for both install and update
+		$jversion = new Version();
+		if (!$jversion->isCompatible('5.0.0'))
+		{
+			$app->enqueueMessage('Please upgrade to at least Joomla! 5.0.0 before continuing!', 'error');
+			return false;
+		}
+
+		// remove old files and folders
+		$this->removeFiles();
+
+		return true;
+	}
+
+	/**
+	 * Called before any type of action
+	 *
+	 * @param   string  $route  Which action is happening (install|uninstall|discover_install|update)
+	 * @param   InstallerAdapter  $adapter  The object responsible for running this script
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function postflight($route, $adapter)
+	{
+		// set application to local method var, just use $this->app in future [we will drop $app in J6]
+		$app = $this->app;
+
+		return true;
+	}
+
+	/**
+	 * Remove the files and folders in the given array from
+	 *
+	 * @return  void
+	 * @since   5.0.2
+	 */
+	protected function removeFiles()
+	{
+		if (!empty($this->deleteFiles))
+		{
+			foreach ($this->deleteFiles as $file)
+			{
+				if (is_file(JPATH_ROOT . $file) && !File::delete(JPATH_ROOT . $file))
+				{
+					echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '<br>';
+				}
+			}
+		}
+
+		if (!empty($this->deleteFolders))
+		{
+			foreach ($this->deleteFolders as $folder)
+			{
+				if (is_dir(JPATH_ROOT . $folder) && !Folder::delete(JPATH_ROOT . $folder))
+				{
+					echo Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '<br>';
+				}
+			}
+		}
+	}
 }
diff --git a/services/index.html b/services/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/services/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/services/provider.php b/services/provider.php
new file mode 100644
index 0000000..e9f23f4
--- /dev/null
+++ b/services/provider.php
@@ -0,0 +1,47 @@
+<?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\Plugin\PluginHelper;
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\DI\Container;
+use VDM\Plugin\Content\ComponentbuilderCustomAdminHeadersTabs\Extension\ComponentbuilderCustomAdminHeadersTabs;
+
+return new class () implements ServiceProviderInterface {
+	/**
+	* Registers the service provider with a DI container.
+	*
+	* @param   Container  $container  The DI container.
+	*
+	* @return  void
+	* @since   4.3.0
+	*/
+	public function register(Container $container)
+	{
+		$container->set(
+			PluginInterface::class,
+			function (Container $container) {
+				$plugin = new ComponentbuilderCustomAdminHeadersTabs(
+					$container->get(DispatcherInterface::class),
+					(array) PluginHelper::getPlugin('content', 'componentbuildercustomadminheaderstabs')
+				);
+				$plugin->setApplication(Factory::getApplication());
+
+				return $plugin;
+			}
+		);
+	}
+};
diff --git a/componentbuildercustomadminheaderstabs.php b/src/Extension/ComponentbuilderCustomAdminHeadersTabs.php
similarity index 88%
rename from componentbuildercustomadminheaderstabs.php
rename to src/Extension/ComponentbuilderCustomAdminHeadersTabs.php
index 2d8165c..5ea9a85 100644
--- a/componentbuildercustomadminheaderstabs.php
+++ b/src/Extension/ComponentbuilderCustomAdminHeadersTabs.php
@@ -8,22 +8,23 @@
  * @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');
+namespace VDM\Plugin\Content\ComponentbuilderCustomAdminHeadersTabs\Extension;
 
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Component\ComponentHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
 
 /**
  * Content - Componentbuilder Custom Admin Headers Tabs plugin.
  *
  * @package   ComponentbuilderCustomAdminHeadersTabs
- * @since     3.0.0
+ * @since     4.0.0
  */
-class PlgContentComponentbuilderCustomAdminHeadersTabs extends CMSPlugin
+final class ComponentbuilderCustomAdminHeadersTabs extends CMSPlugin
 {
 
 	/**
@@ -52,7 +53,7 @@ class PlgContentComponentbuilderCustomAdminHeadersTabs extends CMSPlugin
 		if (strpos($context, 'com_componentbuilder.custom_admin_view') === 0)
 		{
 			// Add the forms path
-			Form::addFormPath(__DIR__ . '/forms');
+			Form::addFormPath(__DIR__ . '/../../forms');
 			// add the admin view params for privacy integration
 			$form->loadFile('custom_admin_view');
 			// update all editors to use this components global editor
diff --git a/src/Extension/index.html b/src/Extension/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/src/Extension/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file