diff --git a/administrator/components/com_patchtester/patchtester.php b/administrator/components/com_patchtester/patchtester.php
deleted file mode 100644
index 9516278..0000000
--- a/administrator/components/com_patchtester/patchtester.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Patch testing component for the Joomla! CMS
- *
- * @copyright  Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later
- */
-
-\defined('_JEXEC') or die;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-if (!Factory::getUser()->authorise('core.manage', 'com_patchtester')) {
-    throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
-}
-
-// Application reference
-$app = Factory::getApplication();
-// Import our Composer autoloader to load the component classes
-require_once __DIR__ . '/vendor/autoload.php';
-// Build the controller class name based on task
-$task = $app->input->getCmd('task', 'display');
-// If $task is an empty string, apply our default since JInput might not
-if ($task === '') {
-    $task = 'display';
-}
-
-$class = '\\PatchTester\\Controller\\' . ucfirst(strtolower($task)) . 'Controller';
-if (!class_exists($class)) {
-    throw new InvalidArgumentException(Text::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $class), 404);
-}
-
-// Instantiate and execute the controller
-/** @var \PatchTester\Controller\AbstractController $controller */
-$controller = new $class($app);
-$controller->execute();
diff --git a/administrator/components/com_patchtester/patchtester.xml b/administrator/components/com_patchtester/patchtester.xml
index 37a1ce9..d8dd249 100644
--- a/administrator/components/com_patchtester/patchtester.xml
+++ b/administrator/components/com_patchtester/patchtester.xml
@@ -9,6 +9,7 @@
 	<authorUrl>https://www.joomla.org</authorUrl>
 	<version>4.2.2</version>
 	<description>COM_PATCHTESTER_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Component\Patchtester</namespace>
 	<scriptfile>script.php</scriptfile>
 	<install>
 		<sql>
@@ -38,7 +39,7 @@
 		<folder>js</folder>
 	</media>
 	<administration>
-		<menu img="../media/com_patchtester/images/icon-16-patchtester.png">com_patchtester</menu>
+		<menu img="../media/com_patchtester/images/icon-16-patchtester.png" view="pulls">com_patchtester</menu>
 		<files folder="admin">
 			<folder>backups</folder>
 			<folder>forms</folder>
@@ -48,7 +49,6 @@
 			<folder>vendor</folder>
 			<filename>access.xml</filename>
 			<filename>config.xml</filename>
-			<filename>patchtester.php</filename>
 		</files>
 	</administration>
 	<updateservers>
diff --git a/administrator/components/com_patchtester/services/provider.php b/administrator/components/com_patchtester/services/provider.php
new file mode 100644
index 0000000..aacb442
--- /dev/null
+++ b/administrator/components/com_patchtester/services/provider.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Patch testing component for the Joomla! CMS
+ *
+ * @copyright  Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Component\Patchtester\Administrator\Extension\PatchtesterComponent;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The patch tester service provider.
+ *
+ * @since  4.0.0
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Patchtester'));
+        $container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Patchtester'));
+
+        $container->set(
+            ComponentInterface::class,
+            function (Container $container) {
+                require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+                $component = new PatchtesterComponent($container->get(ComponentDispatcherFactoryInterface::class));
+
+                $component->setMVCFactory($container->get(MVCFactoryInterface::class));
+
+                return $component;
+            }
+        );
+    }
+};
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php b/administrator/components/com_patchtester/src/Controller/AbstractController.php
similarity index 82%
rename from administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php
rename to administrator/components/com_patchtester/src/Controller/AbstractController.php
index e5aa161..3e05047 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/AbstractController.php
+++ b/administrator/components/com_patchtester/src/Controller/AbstractController.php
@@ -7,20 +7,22 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Component\Patchtester\Administrator\Model\AbstractModel;
 use Joomla\Input\Input;
 use Joomla\Registry\Registry;
-use PatchTester\Model\AbstractModel;
 
 /**
  * Base controller for the patch testing component
  *
  * @since  2.0
  */
-abstract class AbstractController
+abstract class AbstractController extends BaseController
 {
     /**
      * The active application
@@ -50,7 +52,7 @@ abstract class AbstractController
      *
      * @since   2.0
      */
-    public function __construct(CMSApplication $app)
+    public function __construct($config = array(), MVCFactoryInterface $factory = null, ?CMSApplication $app = null, ?Input $input = null)
     {
         $this->app = $app;
 // Set the context for the controller
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/ApplyController.php b/administrator/components/com_patchtester/src/Controller/ApplyController.php
similarity index 91%
rename from administrator/components/com_patchtester/PatchTester/Controller/ApplyController.php
rename to administrator/components/com_patchtester/src/Controller/ApplyController.php
index 7a5c2a1..af8b89d 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/ApplyController.php
+++ b/administrator/components/com_patchtester/src/Controller/ApplyController.php
@@ -7,12 +7,12 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use PatchTester\Model\PullModel;
+use Joomla\Component\Patchtester\Administrator\Model\PullModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php b/administrator/components/com_patchtester/src/Controller/DisplayController.php
similarity index 94%
rename from administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php
rename to administrator/components/com_patchtester/src/Controller/DisplayController.php
index d0cd901..ddd35f2 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/DisplayController.php
+++ b/administrator/components/com_patchtester/src/Controller/DisplayController.php
@@ -7,12 +7,12 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Registry\Registry;
-use PatchTester\Model\AbstractModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -24,8 +24,16 @@ use PatchTester\Model\AbstractModel;
  *
  * @since  2.0
  */
-class DisplayController extends AbstractController
+class DisplayController extends BaseController
 {
+    /**
+     * The default view.
+     *
+     * @var    string
+     * @since  1.6
+     */
+    protected $default_view = 'pulls';
+
     /**
      * Default ordering value
      *
@@ -41,7 +49,7 @@ class DisplayController extends AbstractController
      * @since   2.0
      * @throws  \RuntimeException
      */
-    public function execute()
+    public function executeOld()
     {
         // Set up variables to build our classes
         $view   = $this->getInput()->getCmd('view', $this->defaultView);
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/FetchController.php b/administrator/components/com_patchtester/src/Controller/FetchController.php
similarity index 96%
rename from administrator/components/com_patchtester/PatchTester/Controller/FetchController.php
rename to administrator/components/com_patchtester/src/Controller/FetchController.php
index 02f6a1b..a04a1fc 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/FetchController.php
+++ b/administrator/components/com_patchtester/src/Controller/FetchController.php
@@ -7,12 +7,12 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Response\JsonResponse;
-use PatchTester\Model\PullsModel;
+use Joomla\Component\Patchtester\Administrator\Model\PullsModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/ResetController.php b/administrator/components/com_patchtester/src/Controller/ResetController.php
similarity index 94%
rename from administrator/components/com_patchtester/PatchTester/Controller/ResetController.php
rename to administrator/components/com_patchtester/src/Controller/ResetController.php
index 3f3bc18..7019e49 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/ResetController.php
+++ b/administrator/components/com_patchtester/src/Controller/ResetController.php
@@ -7,17 +7,17 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Patchtester\Administrator\Model\PullModel;
+use Joomla\Component\Patchtester\Administrator\Model\PullsModel;
+use Joomla\Component\Patchtester\Administrator\Model\TestsModel;
 use Joomla\Filesystem\File;
-use PatchTester\Model\PullModel;
-use PatchTester\Model\PullsModel;
-use PatchTester\Model\TestsModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/RevertController.php b/administrator/components/com_patchtester/src/Controller/RevertController.php
similarity index 91%
rename from administrator/components/com_patchtester/PatchTester/Controller/RevertController.php
rename to administrator/components/com_patchtester/src/Controller/RevertController.php
index 8fa81c1..9d6bf62 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/RevertController.php
+++ b/administrator/components/com_patchtester/src/Controller/RevertController.php
@@ -7,12 +7,12 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use PatchTester\Model\PullModel;
+use Joomla\Component\Patchtester\Administrator\Model\PullModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/Controller/StartfetchController.php b/administrator/components/com_patchtester/src/Controller/StartfetchController.php
similarity index 95%
rename from administrator/components/com_patchtester/PatchTester/Controller/StartfetchController.php
rename to administrator/components/com_patchtester/src/Controller/StartfetchController.php
index 9b43529..b7db63a 100644
--- a/administrator/components/com_patchtester/PatchTester/Controller/StartfetchController.php
+++ b/administrator/components/com_patchtester/src/Controller/StartfetchController.php
@@ -7,14 +7,14 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Controller;
+namespace Joomla\Component\Patchtester\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Session\Session;
-use PatchTester\Helper;
-use PatchTester\Model\TestsModel;
+use Joomla\Component\Patchtester\Administrator\Helper\Helper;
+use Joomla\Component\Patchtester\Administrator\Model\TestsModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/src/Extension/PatchtesterComponent.php b/administrator/components/com_patchtester/src/Extension/PatchtesterComponent.php
new file mode 100644
index 0000000..f9f95d0
--- /dev/null
+++ b/administrator/components/com_patchtester/src/Extension/PatchtesterComponent.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Patch testing component for the Joomla! CMS
+ *
+ * @copyright  Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later
+ */
+
+namespace Joomla\Component\Patchtester\Administrator\Extension;
+
+use Joomla\CMS\Extension\BootableExtensionInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Psr\Container\ContainerInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('JPATH_PLATFORM') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Component class for com_contact
+ *
+ * @since  4.0.0
+ */
+class PatchtesterComponent extends MVCComponent
+    implements BootableExtensionInterface
+{
+    /**
+     * Booting the extension. This is the function to set up the environment of the extension like
+     * registering new class loaders, etc.
+     *
+     * If required, some initial set up can be done from services of the container, eg.
+     * registering HTML services.
+     *
+     * @param   ContainerInterface  $container  The container
+     *
+     * @return  void
+     *
+     * @since   4.0.0
+     */
+    public function boot(ContainerInterface $container)
+    {
+    }
+}
diff --git a/administrator/components/com_patchtester/PatchTester/Field/BranchField.php b/administrator/components/com_patchtester/src/Field/BranchField.php
similarity index 95%
rename from administrator/components/com_patchtester/PatchTester/Field/BranchField.php
rename to administrator/components/com_patchtester/src/Field/BranchField.php
index e0a1878..30ea768 100644
--- a/administrator/components/com_patchtester/PatchTester/Field/BranchField.php
+++ b/administrator/components/com_patchtester/src/Field/BranchField.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Field;
+namespace Joomla\Component\Patchtester\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_patchtester/PatchTester/Field/LabelField.php b/administrator/components/com_patchtester/src/Field/LabelField.php
similarity index 95%
rename from administrator/components/com_patchtester/PatchTester/Field/LabelField.php
rename to administrator/components/com_patchtester/src/Field/LabelField.php
index 62c5286..099e816 100644
--- a/administrator/components/com_patchtester/PatchTester/Field/LabelField.php
+++ b/administrator/components/com_patchtester/src/Field/LabelField.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Field;
+namespace Joomla\Component\Patchtester\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_patchtester/PatchTester/GitHub/Exception/UnexpectedResponse.php b/administrator/components/com_patchtester/src/GitHub/Exception/UnexpectedResponse.php
similarity index 94%
rename from administrator/components/com_patchtester/PatchTester/GitHub/Exception/UnexpectedResponse.php
rename to administrator/components/com_patchtester/src/GitHub/Exception/UnexpectedResponse.php
index 2560548..d5c262e 100644
--- a/administrator/components/com_patchtester/PatchTester/GitHub/Exception/UnexpectedResponse.php
+++ b/administrator/components/com_patchtester/src/GitHub/Exception/UnexpectedResponse.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\GitHub\Exception;
+namespace Joomla\Component\Patchtester\Administrator\Github\Exception;
 
 use Joomla\CMS\Http\Response;
 
diff --git a/administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php b/administrator/components/com_patchtester/src/GitHub/GitHub.php
similarity index 97%
rename from administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php
rename to administrator/components/com_patchtester/src/GitHub/GitHub.php
index 0312a53..f575921 100644
--- a/administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php
+++ b/administrator/components/com_patchtester/src/GitHub/GitHub.php
@@ -7,12 +7,13 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\GitHub;
+namespace Joomla\Component\Patchtester\Administrator\GitHub;
 
 use Joomla\CMS\Http\Http;
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Http\Response;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Component\Patchtester\Administrator\Github\Exception\UnexpectedResponse;
 use Joomla\Registry\Registry;
 
 /**
@@ -150,8 +151,8 @@ class GitHub
      *
      * @return  Response
      *
-     * @since   3.0.0
-     * @throws  Exception\UnexpectedResponse
+     * @throws  UnexpectedResponse
+     *@since   3.0.0
      */
     protected function processResponse(Response $response, $expectedCode = 200)
     {
@@ -162,7 +163,7 @@ class GitHub
             $error = isset($body->error) ? $body->error
                 : (isset($body->message) ? $body->message : 'Unknown Error');
 
-            throw new Exception\UnexpectedResponse(
+            throw new UnexpectedResponse(
                 $response,
                 $error,
                 $response->code
diff --git a/administrator/components/com_patchtester/PatchTester/Helper.php b/administrator/components/com_patchtester/src/Helper/Helper.php
similarity index 96%
rename from administrator/components/com_patchtester/PatchTester/Helper.php
rename to administrator/components/com_patchtester/src/Helper/Helper.php
index 3b9a5e2..c07ae56 100644
--- a/administrator/components/com_patchtester/PatchTester/Helper.php
+++ b/administrator/components/com_patchtester/src/Helper/Helper.php
@@ -7,13 +7,13 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester;
+namespace Joomla\Component\Patchtester\Administrator\Helper;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\Registry\Registry;
-use PatchTester\GitHub\GitHub;
+use src\GitHub\GitHub;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/TrackerHelper.php b/administrator/components/com_patchtester/src/Helper/TrackerHelper.php
similarity index 97%
rename from administrator/components/com_patchtester/PatchTester/TrackerHelper.php
rename to administrator/components/com_patchtester/src/Helper/TrackerHelper.php
index 6b557f0..983100a 100644
--- a/administrator/components/com_patchtester/PatchTester/TrackerHelper.php
+++ b/administrator/components/com_patchtester/src/Helper/TrackerHelper.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester;
+namespace Joomla\Component\Patchtester\Administrator\Helper;
 
 /**
  * Helper class for Joomla's issue tracker integrations
diff --git a/administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php b/administrator/components/com_patchtester/src/Model/AbstractModel.php
similarity index 97%
rename from administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php
rename to administrator/components/com_patchtester/src/Model/AbstractModel.php
index 688e11c..b4e3da3 100644
--- a/administrator/components/com_patchtester/PatchTester/Model/AbstractModel.php
+++ b/administrator/components/com_patchtester/src/Model/AbstractModel.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Model;
+namespace Joomla\Component\Patchtester\Administrator\Model;
 
 use Joomla\CMS\Factory;
 use Joomla\Database\DatabaseDriver;
diff --git a/administrator/components/com_patchtester/PatchTester/Model/FetchModel.php b/administrator/components/com_patchtester/src/Model/FetchModel.php
similarity index 88%
rename from administrator/components/com_patchtester/PatchTester/Model/FetchModel.php
rename to administrator/components/com_patchtester/src/Model/FetchModel.php
index ab17c07..1fa0387 100644
--- a/administrator/components/com_patchtester/PatchTester/Model/FetchModel.php
+++ b/administrator/components/com_patchtester/src/Model/FetchModel.php
@@ -7,9 +7,10 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Model;
+namespace Joomla\Component\Patchtester\Administrator\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
+
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
diff --git a/administrator/components/com_patchtester/PatchTester/Model/PullModel.php b/administrator/components/com_patchtester/src/Model/PullModel.php
similarity index 99%
rename from administrator/components/com_patchtester/PatchTester/Model/PullModel.php
rename to administrator/components/com_patchtester/src/Model/PullModel.php
index 43810b7..f194e5e 100644
--- a/administrator/components/com_patchtester/PatchTester/Model/PullModel.php
+++ b/administrator/components/com_patchtester/src/Model/PullModel.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Model;
+namespace Joomla\Component\Patchtester\Administrator\Model;
 
 use Joomla\Archive\Zip;
 use Joomla\CMS\Component\ComponentHelper;
@@ -16,14 +16,14 @@ use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Version;
+use Joomla\Component\Patchtester\Administrator\Helper\Helper;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Registry\Registry;
-use PatchTester\GitHub\Exception\UnexpectedResponse;
-use PatchTester\GitHub\GitHub;
-use PatchTester\Helper;
 use RuntimeException;
+use src\GitHub\Exception\UnexpectedResponse;
+use src\GitHub\GitHub;
 use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
diff --git a/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php b/administrator/components/com_patchtester/src/Model/PullsModel.php
similarity index 98%
rename from administrator/components/com_patchtester/PatchTester/Model/PullsModel.php
rename to administrator/components/com_patchtester/src/Model/PullsModel.php
index dd825f3..d2c229b 100644
--- a/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php
+++ b/administrator/components/com_patchtester/src/Model/PullsModel.php
@@ -7,15 +7,15 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Model;
+namespace Joomla\Component\Patchtester\Administrator\Model;
 
 use Exception;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\Component\Patchtester\Administrator\Github\Exception\UnexpectedResponse;
+use Joomla\Component\Patchtester\Administrator\Helper\Helper;
 use Joomla\Database\DatabaseQuery;
-use PatchTester\GitHub\Exception\UnexpectedResponse;
-use PatchTester\Helper;
 use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
diff --git a/administrator/components/com_patchtester/PatchTester/Model/TestsModel.php b/administrator/components/com_patchtester/src/Model/TestsModel.php
similarity index 95%
rename from administrator/components/com_patchtester/PatchTester/Model/TestsModel.php
rename to administrator/components/com_patchtester/src/Model/TestsModel.php
index 9946d30..0df2425 100644
--- a/administrator/components/com_patchtester/PatchTester/Model/TestsModel.php
+++ b/administrator/components/com_patchtester/src/Model/TestsModel.php
@@ -7,9 +7,10 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\Model;
+namespace Joomla\Component\Patchtester\Administrator\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
+
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
diff --git a/administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php b/administrator/components/com_patchtester/src/View/AbstractHtmlView.php
similarity index 95%
rename from administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php
rename to administrator/components/com_patchtester/src/View/AbstractHtmlView.php
index f3873c2..a7ebdee 100644
--- a/administrator/components/com_patchtester/PatchTester/View/AbstractHtmlView.php
+++ b/administrator/components/com_patchtester/src/View/AbstractHtmlView.php
@@ -7,11 +7,13 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\View;
+namespace Joomla\Component\Patchtester\Administrator\View;
 
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
-use PatchTester\Model\AbstractModel;
+use Joomla\Component\Patchtester\Administrator\Model\AbstractModel;
+use PatchTester\View\RuntimeException;
+use PatchTester\View\SplPriorityQueue;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/View/AbstractView.php b/administrator/components/com_patchtester/src/View/AbstractView.php
similarity index 88%
rename from administrator/components/com_patchtester/PatchTester/View/AbstractView.php
rename to administrator/components/com_patchtester/src/View/AbstractView.php
index 348f22a..e6a6e89 100644
--- a/administrator/components/com_patchtester/PatchTester/View/AbstractView.php
+++ b/administrator/components/com_patchtester/src/View/AbstractView.php
@@ -7,9 +7,9 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\View;
+namespace Joomla\Component\Patchtester\Administrator\View;
 
-use PatchTester\Model\AbstractModel;
+use Joomla\Component\Patchtester\Administrator\Model\AbstractModel;
 
 /**
  * Base view for the patch testing component
diff --git a/administrator/components/com_patchtester/PatchTester/View/DefaultHtmlView.php b/administrator/components/com_patchtester/src/View/DefaultHtmlView.php
similarity index 88%
rename from administrator/components/com_patchtester/PatchTester/View/DefaultHtmlView.php
rename to administrator/components/com_patchtester/src/View/DefaultHtmlView.php
index 47c6891..dbd0cbb 100644
--- a/administrator/components/com_patchtester/PatchTester/View/DefaultHtmlView.php
+++ b/administrator/components/com_patchtester/src/View/DefaultHtmlView.php
@@ -7,9 +7,10 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\View;
+namespace Joomla\Component\Patchtester\Administrator\View;
 
 // phpcs:disable PSR1.Files.SideEffects
+
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
diff --git a/administrator/components/com_patchtester/PatchTester/View/Fetch/tmpl/default.php b/administrator/components/com_patchtester/src/View/Fetch/tmpl/default.php
similarity index 94%
rename from administrator/components/com_patchtester/PatchTester/View/Fetch/tmpl/default.php
rename to administrator/components/com_patchtester/src/View/Fetch/tmpl/default.php
index 4414a01..ae2b2a4 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Fetch/tmpl/default.php
+++ b/administrator/components/com_patchtester/src/View/Fetch/tmpl/default.php
@@ -15,7 +15,7 @@ use Joomla\CMS\Language\Text;
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
-/** @var \PatchTester\View\DefaultHtmlView $this */
+/** @var \Joomla\Component\Patchtester\Administrator\View\DefaultHtmlView $this */
 
 HTMLHelper::_('jquery.framework');
 HTMLHelper::_('behavior.core');
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php b/administrator/components/com_patchtester/src/View/Pulls/HtmlView.php
similarity index 80%
rename from administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
rename to administrator/components/com_patchtester/src/View/Pulls/HtmlView.php
index 076aab8..aa5b2e5 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
+++ b/administrator/components/com_patchtester/src/View/Pulls/HtmlView.php
@@ -7,17 +7,17 @@
  * @license    GNU General Public License version 2 or later
  */
 
-namespace PatchTester\View\Pulls;
+namespace Joomla\Component\Patchtester\Administrator\View\Pulls;
 
 use Exception;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\Patchtester\Administrator\Helper\TrackerHelper;
 use Joomla\Registry\Registry;
-use PatchTester\TrackerHelper;
-use PatchTester\View\DefaultHtmlView;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,9 +28,9 @@ use PatchTester\View\DefaultHtmlView;
  *
  * @since  2.0
  *
- * @property-read  \PatchTester\Model\PullsModel $model  The model object.
+ * @property-read  \Joomla\Component\Patchtester\Administrator\Model\PullsModel $model  The model object.
  */
-class PullsHtmlView extends DefaultHtmlView
+class HtmlView extends BaseHtmlView
 {
     /**
      * Array containing environment errors
@@ -84,12 +84,12 @@ class PullsHtmlView extends DefaultHtmlView
 /**
      * Method to render the view.
      *
-     * @return  string  The rendered view.
+     * @return  void
      *
      * @since   2.0.0
      * @throws  Exception
      */
-    public function render(): string
+    public function display($tpl = null): void
     {
         if (!extension_loaded('openssl')) {
             $this->envErrors[] = Text::_('COM_PATCHTESTER_REQUIREMENT_OPENSSL');
@@ -100,11 +100,12 @@ class PullsHtmlView extends DefaultHtmlView
         }
 
         if (!count($this->envErrors)) {
-            $this->state         = $this->model->getState();
-            $this->items         = $this->model->getItems();
-            $this->pagination    = $this->model->getPagination();
-            $this->filterForm    = $this->model->getFilterForm();
-            $this->activeFilters = $this->model->getActiveFilters();
+            $model               = $this->getModel();
+            $this->state         = $model->getState();
+            $this->items         = $model->getItems();
+            $this->pagination    = $model->getPagination();
+            $this->filterForm    = $model->getFilterForm();
+            $this->activeFilters = $model->getActiveFilters();
             $this->trackerAlias  = TrackerHelper::getTrackerAlias($this->state->get('github_user'), $this->state->get('github_repo'));
         }
 
@@ -115,7 +116,8 @@ class PullsHtmlView extends DefaultHtmlView
 
         $this->addToolbar();
         Text::script('COM_PATCHTESTER_CONFIRM_RESET');
-        return parent::render();
+
+        parent::display($tpl);
     }
 
     /**
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/tmpl/pulls/default.php
similarity index 97%
rename from administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
rename to administrator/components/com_patchtester/tmpl/pulls/default.php
index 8419f86..a1051af 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/tmpl/pulls/default.php
@@ -16,7 +16,7 @@ use Joomla\CMS\Router\Route;
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
-/** @var  \PatchTester\View\Pulls\PullsHtmlView  $this */
+/** @var  \Joomla\Component\Patchtester\Administrator\View\Pulls\PullsHtmlView  $this */
 
 HTMLHelper::_('stylesheet', 'com_patchtester/octicons.css', ['version' => '3.5.0', 'relative' => true]);
 HTMLHelper::_('script', 'com_patchtester/patchtester.js', ['version' => 'auto', 'relative' => true]);
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php b/administrator/components/com_patchtester/tmpl/pulls/default_items.php
similarity index 98%
rename from administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
rename to administrator/components/com_patchtester/tmpl/pulls/default_items.php
index d27705a..e4e12d7 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
+++ b/administrator/components/com_patchtester/tmpl/pulls/default_items.php
@@ -8,7 +8,7 @@
  */
 
 use Joomla\CMS\Language\Text;
-use PatchTester\View\Pulls\PullsHtmlView;
+use Joomla\Component\Patchtester\Administrator\View\Pulls\PullsHtmlView;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/errors.php b/administrator/components/com_patchtester/tmpl/pulls/errors.php
similarity index 88%
rename from administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/errors.php
rename to administrator/components/com_patchtester/tmpl/pulls/errors.php
index a7ecbac..fdd3c77 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/errors.php
+++ b/administrator/components/com_patchtester/tmpl/pulls/errors.php
@@ -13,7 +13,7 @@ use Joomla\CMS\Language\Text;
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
-/** @var  \PatchTester\View\Pulls\PullsHtmlView  $this */
+/** @var  \Joomla\Component\Patchtester\Administrator\View\Pulls\PullsHtmlView  $this */
 ?>
 <h3><?php echo Text::_('COM_PATCHTESTER_REQUIREMENTS_HEADING'); ?></h3>
 <p><?php echo Text::_('COM_PATCHTESTER_REQUIREMENTS_NOT_MET'); ?></p>
diff --git a/composer.json b/composer.json
index 2c4b965..4acb6d2 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,5 @@
     "require-dev": {
         "joomla/crowdin-sync": "dev-master",
         "squizlabs/php_codesniffer": "~3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "PatchTester\\": "administrator/components/com_patchtester/PatchTester/"
-        }
     }
 }