diff --git a/bootstrap.php b/bootstrap.php
new file mode 100644
index 0000000..dd8a172
--- /dev/null
+++ b/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+
+use Underpin\Abstracts\Underpin;
+use Underpin\Factories\Observers\Loader;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+// Add this loader.
+Underpin::attach( 'setup', new Loader('templates', [ 'class' => 'Underpin\Templates\Loaders\Templates' ] ) );
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5394cdf..3c07a3b 100644
--- a/composer.json
+++ b/composer.json
@@ -9,9 +9,13 @@
       "email": "a@alexstandiford.com"
     }
   ],
+  "require": {
+    "underpin/underpin": "^2.0"
+  },
   "autoload": {
+    "psr-4": {"Underpin\\Templates\\":  "lib/"},
     "files": [
-      "templates.php"
+      "bootstrap.php"
     ]
   }
 }
diff --git a/lib/abstracts/Template.php b/lib/Abstracts/Template.php
similarity index 96%
rename from lib/abstracts/Template.php
rename to lib/Abstracts/Template.php
index 9a02cb4..c1d06cb 100644
--- a/lib/abstracts/Template.php
+++ b/lib/Abstracts/Template.php
@@ -6,7 +6,7 @@
  * @package
  */
 
-namespace Underpin_Templates\Abstracts;
+namespace Underpin\Templates\Abstracts;
 
 use Underpin\Traits\Templates;
 use Underpin\Factories\Registry;
diff --git a/lib/factories/Template_Instance.php b/lib/Factories/Template_Instance.php
similarity index 75%
rename from lib/factories/Template_Instance.php
rename to lib/Factories/Template_Instance.php
index 3e740e8..eb4e12e 100644
--- a/lib/factories/Template_Instance.php
+++ b/lib/Factories/Template_Instance.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Underpin_Templates\Factories;
+namespace Underpin\Templates\Factories;
 
-use Underpin_Templates\Abstracts\Template;
+use Underpin\Templates\Abstracts\Template;
 use Underpin\Traits\Instance_Setter;
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/lib/loaders/Templates.php b/lib/Loaders/Templates.php
similarity index 84%
rename from lib/loaders/Templates.php
rename to lib/Loaders/Templates.php
index 78df9bc..382eb09 100644
--- a/lib/loaders/Templates.php
+++ b/lib/Loaders/Templates.php
@@ -6,11 +6,11 @@
  * @package
  */
 
-namespace Underpin_Templates\Loaders;
+namespace Underpin\Templates\Loaders;
 
-use Underpin_Templates\Abstracts\Template;
+use Underpin\Loaders\Logger;
+use Underpin\Templates\Abstracts\Template;
 use Underpin\Abstracts\Registries\Object_Registry;
-use function Underpin\underpin;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -33,9 +33,9 @@ class Templates extends Object_Registry {
 	 * @since 1.0.0
 	 * @var string The name of the abstract class this service locator uses.
 	 */
-	protected $abstraction_class = 'Underpin_Templates\Abstracts\Template';
+	protected $abstraction_class = 'Underpin\Templates\Abstracts\Template';
 
-	protected $default_factory = 'Underpin_Templates\Factories\Template_Instance';
+	protected $default_factory = 'Underpin\Templates\Factories\Template_Instance';
 
 	protected function set_default_items() {}
 
@@ -66,7 +66,7 @@ public function get_template( $key, $template, $params = [] ) {
 
 		// Validate the item didn't return a result.
 		if ( is_wp_error( $item ) ) {
-			underpin()->logger()->log_wp_error( 'error', $item );
+			Logger::log_wp_error( 'error', $item );
 
 			return '';
 		}
diff --git a/templates.php b/templates.php
deleted file mode 100644
index 9761dcc..0000000
--- a/templates.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-use Underpin\Abstracts\Underpin;
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-// Add this loader.
-Underpin::attach( 'setup', new \Underpin\Factories\Observer( 'templates', [
-	'update' => function ( Underpin $plugin, $args ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'lib/abstracts/Template.php' );
-		require_once( plugin_dir_path( __FILE__ ) . 'lib/factories/Template_Instance.php' );
-		require_once( plugin_dir_path( __FILE__ ) . 'lib/loaders/Templates.php' );
-
-		$plugin->loaders()->add( 'templates', [
-			'class' => 'Underpin_Templates\Loaders\Templates',
-		] );
-	},
-] ) );
\ No newline at end of file