diff --git a/bootstrap.php b/bootstrap.php
new file mode 100644
index 0000000..690cf7a
--- /dev/null
+++ b/bootstrap.php
@@ -0,0 +1,12 @@
+<?php
+
+use Underpin\Abstracts\Underpin;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+// Add this loader.
+Underpin::attach( 'setup', new \Underpin\Factories\Observers\Loader( 'options', [
+	'class' => 'Underpin\Options\Loaders\Options',
+] ) );
diff --git a/composer.json b/composer.json
index caa0da8..24fd700 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,9 @@
     "underpin/underpin": "^2.0"
   },
   "autoload": {
+    "psr-4": {"Underpin\\Options\\":  "lib/"},
     "files": [
-      "options.php"
+      "bootstrap.php"
     ]
   }
 }
diff --git a/lib/abstracts/Option.php b/lib/Abstracts/Option.php
similarity index 98%
rename from lib/abstracts/Option.php
rename to lib/Abstracts/Option.php
index 2783655..6e53024 100644
--- a/lib/abstracts/Option.php
+++ b/lib/Abstracts/Option.php
@@ -7,7 +7,7 @@
  */
 
 
-namespace Underpin_Options\Abstracts;
+namespace Underpin\Options\Abstracts;
 
 use Underpin\Traits\Feature_Extension;
 use WP_Error;
diff --git a/lib/factories/Option_Instance.php b/lib/Factories/Option_Instance.php
similarity index 74%
rename from lib/factories/Option_Instance.php
rename to lib/Factories/Option_Instance.php
index 18d24ce..c74ebdc 100644
--- a/lib/factories/Option_Instance.php
+++ b/lib/Factories/Option_Instance.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Underpin_Options\Factories;
+namespace Underpin\Options\Factories;
 
 
 use Underpin\Traits\Instance_Setter;
-use Underpin_Options\Abstracts\Option;
+use Underpin\Options\Abstracts\Option;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
diff --git a/lib/loaders/Options.php b/lib/Loaders/Options.php
similarity index 84%
rename from lib/loaders/Options.php
rename to lib/Loaders/Options.php
index 1cdeaa4..e25ea94 100644
--- a/lib/loaders/Options.php
+++ b/lib/Loaders/Options.php
@@ -7,10 +7,10 @@
  */
 
 
-namespace Underpin_Options\Loaders;
+namespace Underpin\Options\Loaders;
 
 use Underpin\Abstracts\Registries\Object_Registry;
-use Underpin_Options\Abstracts\Option;
+use Underpin\Options\Abstracts\Option;
 use WP_Error;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -29,9 +29,9 @@ class Options extends Object_Registry {
 	/**
 	 * @inheritDoc
 	 */
-	protected $abstraction_class = 'Underpin_Options\Abstracts\Option';
+	protected $abstraction_class = 'Underpin\Options\Abstracts\Option';
 
-	protected $default_factory = 'Underpin_Options\Factories\Option_Instance';
+	protected $default_factory = 'Underpin\Options\Factories\Option_Instance';
 
 	/**
 	 * @inheritDoc
diff --git a/options.php b/options.php
deleted file mode 100644
index ee826c0..0000000
--- a/options.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-use Underpin\Abstracts\Underpin;
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-// Add this loader.
-Underpin::attach( 'setup', new \Underpin\Factories\Observer( 'options', [
-	'update' => function ( Underpin $plugin ) {
-	require_once( plugin_dir_path( __FILE__ ) . 'lib/abstracts/Option.php' );
-	require_once( plugin_dir_path( __FILE__ ) . 'lib/loaders/Options.php' );
-	require_once( plugin_dir_path( __FILE__ ) . 'lib/factories/Option_Instance.php' );
-	$plugin->loaders()->add( 'options', [
-		'class' => 'Underpin_Options\Loaders\Options',
-	] );
-	},
-] ) );