diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..2822445
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2022 Dustin Wilson, J. King
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index 62a7bea..3673272 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ composer require mensbeam/catcher
 For most use cases this library requires no configuration and little effort to integrate into non-complex environments:
 
 ```php
-use MensBeam\Foundation\Catcher;
+use MensBeam\Catcher;
 
 $catcher = new Catcher();
 ```
@@ -38,9 +38,9 @@ $catcher = new Catcher();
 That's it. It will automatically register Catcher as an exception, error, and shutdown handler and use `PlainTextHandler` as its sole handler. Catcher can be configured to use one or multiple _handlers_. Imagine a situation where it is necessary to both output text for logging and JSON for an API endpoint. This is easily done using Catcher:
 
 ```php
-use MensBeam\Foundation\Catcher,
+use MensBeam\Catcher,
     Monolog\Logger;
-use MensBeam\Foundation\Catcher\{
+use MensBeam\Catcher\{
     JSONHandler,
     PlainTextHandler
 };
@@ -89,13 +89,13 @@ PHP by default won't allow fatal errors to be handled by error handlers. It will
 
 ## Documentation ##
   
-### MensBeam\Foundation\Catcher ###
+### MensBeam\Catcher ###
 
 This is the main class in the library. Unless you have a need to configure a handler or use multiple handlers there usually isn't a need to interact with the rest of the library at all.
 
 ```php
-namespace MensBeam\Foundation;
-use Mensbeam\Foundation\Catcher\Handler;
+namespace MensBeam;
+use MensBeam\Catcher\Handler;
 
 class Catcher {
     public bool $forking = true;
@@ -123,53 +123,53 @@ _forking_: When set to true Catcher will throw converted notices, warnings, etc.
 _preventExit_: When set to true Catcher won't exit at all even after fatal errors or exceptions  
 _throwErrors_: When set to true Catcher will convert errors to throwables
 
-#### MensBeam\Foundation\Catcher::getHandlers ####
+#### MensBeam\Catcher::getHandlers ####
 
 Returns an array of the handlers defined for use in the Catcher instance
 
-#### MensBeam\Foundation\Catcher::getLastThrowable ####
+#### MensBeam\Catcher::getLastThrowable ####
 
 Returns the last throwable that this instance of Catcher has handled
 
-#### MensBeam\Foundation\Catcher::isRegistered ####
+#### MensBeam\Catcher::isRegistered ####
 
 Returns whether the Catcher still is registered as a error, exception, and shutdown handler
 
-#### MensBeam\Foundation\Catcher::popHandler ####
+#### MensBeam\Catcher::popHandler ####
 
 Pops the last handler off the stack and returns it
 
-#### MensBeam\Foundation\Catcher::pushHandler ####
+#### MensBeam\Catcher::pushHandler ####
 
 Pushes the specified handler(s) onto the stack
 
-#### MensBeam\Foundation\Catcher::register ####
+#### MensBeam\Catcher::register ####
 
 Registers the Catcher instance as an error, exception, and shutdown handler. By default the constructor does this automatically, but this method exists in case `unregister` has been called.
 
-#### MensBeam\Foundation\Catcher::setHandlers ####
+#### MensBeam\Catcher::setHandlers ####
 
 Replaces the stack of handlers with those specified as parameters.
 
-#### MensBeam\Foundation\Catcher::shiftHandler ####
+#### MensBeam\Catcher::shiftHandler ####
 
 Shifts the first handler off the stack of handlers and returns it.
 
-#### MensBeam\Foundation\Catcher::unregister ####
+#### MensBeam\Catcher::unregister ####
 
 Unregisters the Catcher instance as an error, exception and shutdown handler.
 
-#### MensBeam\Foundation\Catcher::unshiftHandler ####
+#### MensBeam\Catcher::unshiftHandler ####
 
 Unshifts the specified handler(s) onto the beginning of the stack
 
   
-### MensBeam\Foundation\Catcher\Handler ###
+### MensBeam\Catcher\Handler ###
 
 All handlers inherit from this abstract class. Since it is an abstract class meant for constructing handlers protected methods and properties will be documented here as well.
 
 ```php
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 abstract class Handler {
     public const CONTENT_TYPE = null;
@@ -253,48 +253,48 @@ _timeFormat_: The PHP-standard date format which to use for times in output. Def
 _varExporter_: A user-defined closure to use when printing arguments in backtraces. Defaults to _null_.
 
 
-#### MensBeam\Foundation\Catcher\Handler::dispatch ####
+#### MensBeam\Catcher\Handler::dispatch ####
 
 Outputs the stored throwable arrays in the output buffer.
 
-#### MensBeam\Foundation\Catcher\Handler::getOption ####
+#### MensBeam\Catcher\Handler::getOption ####
 
 Returns the value of the provided option name
 
-#### MensBeam\Foundation\Catcher\Handler::handle ####
+#### MensBeam\Catcher\Handler::handle ####
 
 Handles the provided `ThrowableController` and stores the output array in the output buffer to be dispatched later
 
-#### MensBeam\Foundation\Catcher\Handler::setOption ####
+#### MensBeam\Catcher\Handler::setOption ####
 
 Sets the provided option with the provided value
 
-#### MensBeam\Foundation\Catcher\Handler::buildOutputArray (protected) ####
+#### MensBeam\Catcher\Handler::buildOutputArray (protected) ####
 
 With a given `ThrowableController` will output an array to be stored in the output buffer
 
-#### MensBeam\Foundation\Catcher\Handler::cleanOutputThrowable (protected) ####
+#### MensBeam\Catcher\Handler::cleanOutputThrowable (protected) ####
 
 "Cleans" an output throwable -- an individual item in the output array -- by removing information that's unnecessary in the output; useful for structured data output such as JSON.
 
-#### MensBeam\Foundation\Catcher\Handler::dispatchCallback (protected) ####
+#### MensBeam\Catcher\Handler::dispatchCallback (protected) ####
 
 A callback method meant to be extended by inherited classes to control how the class outputs the throwable arrays
 
-#### MensBeam\Foundation\Catcher\Handler::handleCallback (protected) ####
+#### MensBeam\Catcher\Handler::handleCallback (protected) ####
 
 A callback method meant to be extended by inherited classes where the output array can be manipulated before storing in the output buffer
 
-#### MensBeam\Foundation\Catcher\Handler::print (protected) ####
+#### MensBeam\Catcher\Handler::print (protected) ####
 
 Prints the provided string to stderr or stdout depending on how the handler is configured and which SAPI is being used.
 
-### MensBeam\Foundation\Catcher\ThrowableController ####
+### MensBeam\Catcher\ThrowableController ####
 
 We cannot require all throwables to be converted to our own classes, so this class exists as a controller to add new features to throwables for use with Catcher.
 
 ```php
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 class ThrowableController {
     public function __construct(\Throwable $throwable);
@@ -306,26 +306,26 @@ class ThrowableController {
 }
 ```
 
-#### MensBeam\Foundation\Catcher\ThrowableController::getErrorType ####
+#### MensBeam\Catcher\ThrowableController::getErrorType ####
 
-Returns the error type of a `MensBeam\Foundation\Catcher\Error`, meaning a human-friendly representation of the error code (eg: _"Fatal Error"_, _"Warning"_, _"Notice"_) or null if the throwable isn't an `Error`.
+Returns the error type of a `MensBeam\Catcher\Error`, meaning a human-friendly representation of the error code (eg: _"Fatal Error"_, _"Warning"_, _"Notice"_) or null if the throwable isn't an `Error`.
 
-#### MensBeam\Foundation\Catcher\ThrowableController::getFrames ####
+#### MensBeam\Catcher\ThrowableController::getFrames ####
 
 Returns the frames for the throwable as an array with deduplication and fixes all taken care of
 
-#### MensBeam\Foundation\Catcher\ThrowableController::getPrevious ####
+#### MensBeam\Catcher\ThrowableController::getPrevious ####
 
 Returns the previous `ThrowableController` if there is one
 
-#### MensBeam\Foundation\Catcher\ThrowableController::getThrowable ####
+#### MensBeam\Catcher\ThrowableController::getThrowable ####
 
 Returns the throwable controlled by this class instance
 
-### Mensbeam\Foundation\Catcher\HTMLHandler ###
+### MensBeam\Catcher\HTMLHandler ###
 
 ```php
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 class HTMLHandler extends Handler {
     public const CONTENT_TYPE = 'text/html';
@@ -343,20 +343,20 @@ _document_: The `\DOMDocument` errors should be inserted into. If one isn't prov
 _errorPath_: An XPath path to the element where the errors should be inserted. Defaults to _"/html/body"_.  
 _timeFormat_: Same as in `Handler`, but the default changes to _"H:i:s"_.
 
-### Mensbeam\Foundation\Catcher\JSONHandler ###
+### MensBeam\Catcher\JSONHandler ###
 
 ```php
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 class JSONHandler extends Handler {
     public const CONTENT_TYPE = 'application/json';
 }
 ```
 
-### Mensbeam\Foundation\Catcher\PlainTextHandler ###
+### MensBeam\Catcher\PlainTextHandler ###
 
 ```php
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 use Psr\Log\LoggerInterface;
 
 class PlainTextHandler extends Handler {
@@ -379,7 +379,7 @@ The default handlers, especially `PlainTextHandler`, are set up to handle most t
 
 ```php
 namespace Your\Namespace\Goes\Here;
-use MensBeam\Foundation\Catcher\Handler,
+use MensBeam\Catcher\Handler,
     Symfony\Component\Yaml\Yaml;
 
 
@@ -423,7 +423,7 @@ This theoretical class uses the [`symfony/yaml`][c] package in Composer and expo
 ```php
 #!/usr/bin/env php
 <?php
-use MensBeam\Foundation\Catcher,
+use MensBeam\Catcher,
     Your\Namespace\Goes\Here\YamlHandler;
 require_once('vendor/autoload.php');
 
@@ -441,9 +441,9 @@ By default internally [`print_r`][e] is used. This is due to tests made internal
 ```php
 #!/usr/bin/env php
 <?php
-use MensBeam\Foundation\Catcher,
+use MensBeam\Catcher,
     Symfony\Component\VarExporter\VarExporter;
-use MensBeam\Foundation\Catcher\PlainTextHandler;
+use MensBeam\Catcher\PlainTextHandler;
 require_once('vendor/autoload.php');
 
 $c = new Catcher(new PlainTextHandler([
diff --git a/composer.json b/composer.json
index aa52bb6..14c26a8 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "MensBeam\\Foundation\\": "lib/"
+            "MensBeam\\": "lib/"
         }
     },
     "authors": [
@@ -24,9 +24,9 @@
     },
     "require-dev": {
         "ext-dom": "*",
-        "mensbeam/html-dom": "^1.0",
-        "phpunit/phpunit": "^9.5",
-        "nikic/php-parser": "^4.15",
-        "eloquent/phony-phpunit": "^7.1"
+        "mensbeam/html-dom": ">=1.0",
+        "phpunit/phpunit": ">=9.5",
+        "nikic/php-parser": ">=4.15",
+        "eloquent/phony-phpunit": ">=7.1"
     }
 }
diff --git a/composer.lock b/composer.lock
index f5d1dba..3bfa5e0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "73069560c4ea9f687930120ab8363d8f",
+    "content-hash": "60a855adaf02eabdaca59112cbc1586d",
     "packages": [
         {
             "name": "psr/log",
@@ -276,31 +276,30 @@
             "time": "2020-12-21T09:36:47+00:00"
         },
         {
-            "name": "mensbeam/framework",
-            "version": "1.0.5",
+            "name": "mensbeam/getters-and-setters",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mensbeam/Framework.git",
-                "reference": "af4b8e72d50c01cf78d3d1b12b5a65f714f9d73b"
+                "url": "https://github.com/mensbeam/Getters-and-Setters.git",
+                "reference": "141a946eb476b1f897315aa5faf5ade64a306e88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mensbeam/Framework/zipball/af4b8e72d50c01cf78d3d1b12b5a65f714f9d73b",
-                "reference": "af4b8e72d50c01cf78d3d1b12b5a65f714f9d73b",
+                "url": "https://api.github.com/repos/mensbeam/Getters-and-Setters/zipball/141a946eb476b1f897315aa5faf5ade64a306e88",
+                "reference": "141a946eb476b1f897315aa5faf5ade64a306e88",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.4"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.3"
+                "nikic/php-parser": "^4.15",
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "MensBeam\\Framework\\": [
-                        "lib/"
-                    ]
+                    "MensBeam\\": "lib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -310,37 +309,35 @@
             "authors": [
                 {
                     "name": "Dustin Wilson",
-                    "email": "dustin@dustinwilson.com",
-                    "homepage": "https://dustinwilson.com/"
+                    "email": "dustin@dustinwilson.com"
                 }
             ],
-            "description": "Common classes and traits used in many Mensbeam projects",
+            "description": "Getter and setter method trait for PHP",
             "support": {
-                "issues": "https://github.com/mensbeam/Framework/issues",
-                "source": "https://github.com/mensbeam/Framework/tree/1.0.5"
+                "source": "https://github.com/mensbeam/Getters-and-Setters/tree/v1.1.0"
             },
-            "time": "2022-01-05T16:09:09+00:00"
+            "time": "2023-02-19T19:17:19+00:00"
         },
         {
             "name": "mensbeam/html-dom",
-            "version": "1.0.8",
+            "version": "v1.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mensbeam/HTML-DOM.git",
-                "reference": "8a9f0e18b2bc14dc6e451690be9ff0aeeb428496"
+                "reference": "cbc152e6d02cd41d8777074139d4cd727d067302"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mensbeam/HTML-DOM/zipball/8a9f0e18b2bc14dc6e451690be9ff0aeeb428496",
-                "reference": "8a9f0e18b2bc14dc6e451690be9ff0aeeb428496",
+                "url": "https://api.github.com/repos/mensbeam/HTML-DOM/zipball/cbc152e6d02cd41d8777074139d4cd727d067302",
+                "reference": "cbc152e6d02cd41d8777074139d4cd727d067302",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
-                "mensbeam/framework": "^1.0.4",
-                "mensbeam/html-parser": "^1.2.1",
+                "mensbeam/getters-and-setters": ">=1.1",
+                "mensbeam/html-parser": ">=1.2.1",
                 "php": ">=8.0.2",
-                "symfony/css-selector": "^5.3"
+                "symfony/css-selector": ">=5.3"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.3",
@@ -375,22 +372,22 @@
             "description": "Modern DOM library written in PHP for HTML documents",
             "support": {
                 "issues": "https://github.com/mensbeam/HTML-DOM/issues",
-                "source": "https://github.com/mensbeam/HTML-DOM/tree/1.0.8"
+                "source": "https://github.com/mensbeam/HTML-DOM/tree/v1.0.11"
             },
-            "time": "2022-02-12T15:46:39+00:00"
+            "time": "2023-02-19T19:28:08+00:00"
         },
         {
             "name": "mensbeam/html-parser",
-            "version": "1.2.5",
+            "version": "1.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mensbeam/HTML-Parser.git",
-                "reference": "02ec5df3fe985b3b6635c0cfd37df10ccd023e4c"
+                "reference": "fa0591bd9ce241631894bda290cb99f30b7c288d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mensbeam/HTML-Parser/zipball/02ec5df3fe985b3b6635c0cfd37df10ccd023e4c",
-                "reference": "02ec5df3fe985b3b6635c0cfd37df10ccd023e4c",
+                "url": "https://api.github.com/repos/mensbeam/HTML-Parser/zipball/fa0591bd9ce241631894bda290cb99f30b7c288d",
+                "reference": "fa0591bd9ce241631894bda290cb99f30b7c288d",
                 "shasum": ""
             },
             "require": {
@@ -446,9 +443,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mensbeam/HTML-Parser/issues",
-                "source": "https://github.com/mensbeam/HTML-Parser/tree/1.2.5"
+                "source": "https://github.com/mensbeam/HTML-Parser/tree/1.2.6"
             },
-            "time": "2022-02-15T20:47:49+00:00"
+            "time": "2023-01-25T22:49:58+00:00"
         },
         {
             "name": "mensbeam/intl",
@@ -784,16 +781,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.23",
+            "version": "9.2.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
-                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                 "shasum": ""
             },
             "require": {
@@ -849,7 +846,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
             },
             "funding": [
                 {
@@ -857,7 +854,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-12-28T12:41:10+00:00"
+            "time": "2023-01-26T08:26:55+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1102,16 +1099,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.28",
+            "version": "9.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
+                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
-                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7b1615e3e887d6c719121c6d4a44b0ab9645555",
+                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555",
                 "shasum": ""
             },
             "require": {
@@ -1153,7 +1150,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
@@ -1184,7 +1181,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.3"
             },
             "funding": [
                 {
@@ -1200,7 +1197,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-14T12:32:24+00:00"
+            "time": "2023-02-04T13:37:15+00:00"
         },
         {
             "name": "psr/http-message",
@@ -1621,16 +1618,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
@@ -1672,7 +1669,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -1680,7 +1677,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -1994,16 +1991,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
@@ -2042,10 +2039,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
@@ -2053,7 +2050,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
         },
         {
             "name": "sebastian/resource-operations",
@@ -2112,16 +2109,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
@@ -2156,7 +2153,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
@@ -2164,7 +2161,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2221,21 +2218,20 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.4.19",
+            "version": "v6.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f4a7d150f5b9e8f974f6f127d8167e420d11fc62"
+                "reference": "bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4a7d150f5b9e8f974f6f127d8167e420d11fc62",
-                "reference": "f4a7d150f5b9e8f974f6f127d8167e420d11fc62",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1",
+                "reference": "bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -2267,90 +2263,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.4.19"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-01-01T08:32:19+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/css-selector/tree/v6.2.5"
             },
             "funding": [
                 {
@@ -2366,7 +2279,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-01T08:38:09+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/lib/Catcher.php b/lib/Catcher.php
index d86e741..0c9e2d3 100644
--- a/lib/Catcher.php
+++ b/lib/Catcher.php
@@ -6,8 +6,8 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam;
+use MensBeam\Catcher\{
     Error,
     Handler,
     PlainTextHandler,
diff --git a/lib/Catcher/Error.php b/lib/Catcher/Error.php
index 75d7822..b990be3 100644
--- a/lib/Catcher/Error.php
+++ b/lib/Catcher/Error.php
@@ -6,7 +6,7 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 class Error extends \Error {
     public function __construct(string $message = '', int $code = 0, string $file = '', int $line = 0, ?\Throwable $previous = null) {
diff --git a/lib/Catcher/HTMLHandler.php b/lib/Catcher/HTMLHandler.php
index cf63ba7..ad613dc 100644
--- a/lib/Catcher/HTMLHandler.php
+++ b/lib/Catcher/HTMLHandler.php
@@ -6,7 +6,7 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 
 class HTMLHandler extends Handler {
diff --git a/lib/Catcher/Handler.php b/lib/Catcher/Handler.php
index eb46b6c..22ae310 100644
--- a/lib/Catcher/Handler.php
+++ b/lib/Catcher/Handler.php
@@ -6,7 +6,7 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 
 abstract class Handler {
diff --git a/lib/Catcher/JSONHandler.php b/lib/Catcher/JSONHandler.php
index 2fef98c..6eb1985 100644
--- a/lib/Catcher/JSONHandler.php
+++ b/lib/Catcher/JSONHandler.php
@@ -6,7 +6,7 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 
 class JSONHandler extends Handler {
diff --git a/lib/Catcher/PlainTextHandler.php b/lib/Catcher/PlainTextHandler.php
index a08dffb..a634256 100644
--- a/lib/Catcher/PlainTextHandler.php
+++ b/lib/Catcher/PlainTextHandler.php
@@ -6,7 +6,7 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 use Psr\Log\LoggerInterface;
 
 
diff --git a/lib/Catcher/ThrowableController.php b/lib/Catcher/ThrowableController.php
index fa985be..8c6ef9b 100644
--- a/lib/Catcher/ThrowableController.php
+++ b/lib/Catcher/ThrowableController.php
@@ -6,7 +6,7 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher;
+namespace MensBeam\Catcher;
 
 
 class ThrowableController {
@@ -101,7 +101,7 @@ class ThrowableController {
             !in_array($this->throwable->getCode(), [ E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING ]) ||
             !extension_loaded('xdebug') || 
             !function_exists('xdebug_info') || 
-            sizeof(xdebug_info('mode')) === 0
+            sizeof(\xdebug_info('mode')) === 0
         ) {
             $frames = $this->throwable->getTrace();
         } else {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a369544..117d01c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,7 +4,7 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation;
+namespace MensBeam;
 
 ini_set('memory_limit', '-1');
 ini_set('zend.assertions', '1');
diff --git a/tests/cases/TestCatcher.php b/tests/cases/TestCatcher.php
index bd560cb..9939299 100644
--- a/tests/cases/TestCatcher.php
+++ b/tests/cases/TestCatcher.php
@@ -6,9 +6,9 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher\Test;
-use MensBeam\Foundation\Catcher;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam\Catcher\Test;
+use MensBeam\Catcher;
+use MensBeam\Catcher\{
     Error,
     HTMLHandler,
     JSONHandler,
@@ -19,14 +19,14 @@ use Eloquent\Phony\Phpunit\Phony;
 
 class TestCatcher extends \PHPUnit\Framework\TestCase {
     /**
-     * @covers \MensBeam\Foundation\Catcher::__construct
+     * @covers \MensBeam\Catcher::__construct
      * 
-     * @covers \MensBeam\Foundation\Catcher::getHandlers
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher::getHandlers
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
      */
     public function testMethod___construct(): void {
         $c = new Catcher();
@@ -43,7 +43,7 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
         );
         $c->preventExit = true;
         $c->throwErrors = false;
-        $this->assertSame('MensBeam\Foundation\Catcher', $c::class);
+        $this->assertSame('MensBeam\Catcher', $c::class);
         $this->assertSame(3, count($c->getHandlers()));
         $h = $c->getHandlers();
         $this->assertSame(PlainTextHandler::class, $h[0]::class);
@@ -53,26 +53,26 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::getLastThrowable
+     * @covers \MensBeam\Catcher::getLastThrowable
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::handleError
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::handleError
+     * @covers \MensBeam\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_getLastThrowable(): void {
         $c = new Catcher(new PlainTextHandler([ 'silent' => true ]));
@@ -84,12 +84,12 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::pushHandler
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod_pushHandler(): void {
         $e = null;
@@ -128,14 +128,14 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::popHandler
+     * @covers \MensBeam\Catcher::popHandler
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
      */
     public function testMethod_popHandler(): void {
         $h = [
@@ -163,13 +163,13 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::isRegistered
+     * @covers \MensBeam\Catcher::isRegistered
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod_register(): void {
         $c = new Catcher();
@@ -182,14 +182,14 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::setHandlers
+     * @covers \MensBeam\Catcher::setHandlers
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::getHandlers
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::getHandlers
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod_setHandlers(): void {
         $c = new Catcher();
@@ -203,14 +203,14 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::shiftHandler
+     * @covers \MensBeam\Catcher::shiftHandler
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
      */
     public function testMethod_shiftHandler(): void {
         $h = [
@@ -238,12 +238,12 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::unregister
+     * @covers \MensBeam\Catcher::unregister
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod_unregister(): void {
         $c = new Catcher();
@@ -254,15 +254,15 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::unshiftHandler
+     * @covers \MensBeam\Catcher::unshiftHandler
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::getHandlers
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::getHandlers
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
      */
     public function testMethod_unshiftHandler(): void {
         $c = new Catcher(new PlainTextHandler());
@@ -307,26 +307,26 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::handleError
+     * @covers \MensBeam\Catcher::handleError
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::getLastThrowable
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::getLastThrowable
+     * @covers \MensBeam\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_handleError(): void {
         $c = new Catcher(new PlainTextHandler([ 'silent' => true ]));
@@ -399,25 +399,25 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::handleThrowable
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::getLastThrowable
-     * @covers \MensBeam\Foundation\Catcher::handleError
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::getLastThrowable
+     * @covers \MensBeam\Catcher::handleError
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_handleThrowable(): void {
         $c = new Catcher(new PlainTextHandler([ 'silent' => true, 'forceBreak' => true ]));
@@ -443,26 +443,26 @@ class TestCatcher extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher::handleShutdown
+     * @covers \MensBeam\Catcher::handleShutdown
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::getLastError
-     * @covers \MensBeam\Foundation\Catcher::handleError
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::getLastError
+     * @covers \MensBeam\Catcher::handleError
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_handleShutdown(): void {
         $c = new Catcher();
diff --git a/tests/cases/TestHTMLHandler.php b/tests/cases/TestHTMLHandler.php
index 915b99b..c0b5bb7 100644
--- a/tests/cases/TestHTMLHandler.php
+++ b/tests/cases/TestHTMLHandler.php
@@ -6,9 +6,9 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher\Test;
-use MensBeam\Foundation\Catcher;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam\Catcher\Test;
+use MensBeam\Catcher;
+use MensBeam\Catcher\{
     Error,
     Handler,
     HTMLHandler,
@@ -18,9 +18,9 @@ use MensBeam\Foundation\Catcher\{
 
 class TestHTMLHandler extends \PHPUnit\Framework\TestCase {
     /**
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
      * 
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod___construct__exception(): void {
         $this->expectException(\InvalidArgumentException::class);
@@ -28,21 +28,21 @@ class TestHTMLHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::buildOutputThrowable
+     * @covers \MensBeam\Catcher\HTMLHandler::buildOutputThrowable
      * 
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::serializeDocument
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getFrames
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher\HTMLHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\HTMLHandler::handleCallback
+     * @covers \MensBeam\Catcher\HTMLHandler::serializeDocument
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getFrames
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_buildOutputThrowable(): void {
         $c = new ThrowableController(new \Exception(message: 'Ook!', previous: new Error(message: 'Eek!', code: \E_USER_ERROR, previous: new Error(message: 'Ack!'))));
@@ -60,17 +60,17 @@ class TestHTMLHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\HTMLHandler::dispatchCallback
      * 
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\Handler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\HTMLHandler::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\Handler::handleCallback
+     * @covers \MensBeam\Catcher\HTMLHandler::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_dispatchCallback(): void {
         $c = new ThrowableController(new \Exception(message: 'Ook!'));
diff --git a/tests/cases/TestHandler.php b/tests/cases/TestHandler.php
index 7e741b6..e3ce51f 100644
--- a/tests/cases/TestHandler.php
+++ b/tests/cases/TestHandler.php
@@ -6,9 +6,9 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher\Test;
-use MensBeam\Foundation\Catcher;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam\Catcher\Test;
+use MensBeam\Catcher;
+use MensBeam\Catcher\{
     Error,
     HTMLHandler,
     PlainTextHandler,
@@ -20,7 +20,7 @@ use Eloquent\Phony\Phpunit\Phony;
 
 class TestHandler extends \PHPUnit\Framework\TestCase {
     /**
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod___construct__exception(): void {
         $this->expectException(\RangeException::class);
@@ -28,20 +28,20 @@ class TestHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\Handler::cleanOutputThrowable
+     * @covers \MensBeam\Catcher\Handler::cleanOutputThrowable
      * 
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\Handler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\Handler::print
-     * @covers \MensBeam\Foundation\Catcher\JSONHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getFrames
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\Handler::handleCallback
+     * @covers \MensBeam\Catcher\Handler::print
+     * @covers \MensBeam\Catcher\JSONHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getFrames
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod__cleanOutputThrowable(): void {
         // Just need to test coverage here; TestJSONHandler covers this one thoroughly.
@@ -60,16 +60,16 @@ class TestHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\Handler::handle
      * 
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getFrames
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getFrames
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod__handle(): void {
         // Just need to test backtrace handling. The rest has already been covered by prior tests.
@@ -82,24 +82,24 @@ class TestHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\Handler::getOption
+     * @covers \MensBeam\Catcher\Handler::getOption
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::handleError
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::handleError
+     * @covers \MensBeam\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod__getOption(): void {
         $h = new PlainTextHandler([ 'forceExit' => true, 'silent' => true ]);
@@ -113,9 +113,9 @@ class TestHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\Handler::setOption
+     * @covers \MensBeam\Catcher\Handler::setOption
      * 
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
      */
     public function testMethod__setOption(): void {
         $h = new PlainTextHandler([ 'forceExit' => true, 'silent' => true ]);
@@ -138,26 +138,26 @@ class TestHandler extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\Handler::print
+     * @covers \MensBeam\Catcher\Handler::print
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::handleError
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::serializeOutputThrowable
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::handleError
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::serializeOutputThrowable
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod__print(): void {
         // Just need to test forceOutputNow for coverage purposes
diff --git a/tests/cases/TestJSONHandler.php b/tests/cases/TestJSONHandler.php
index 1eb27b5..b5b6766 100644
--- a/tests/cases/TestJSONHandler.php
+++ b/tests/cases/TestJSONHandler.php
@@ -6,9 +6,9 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher\Test;
-use MensBeam\Foundation\Catcher;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam\Catcher\Test;
+use MensBeam\Catcher;
+use MensBeam\Catcher\{
     Error,
     Handler,
     JSONHandler,
@@ -18,18 +18,18 @@ use MensBeam\Foundation\Catcher\{
 
 class TestJSONHandler extends \PHPUnit\Framework\TestCase {
     /**
-     * @covers \MensBeam\Foundation\Catcher\JSONHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\JSONHandler::dispatchCallback
      * 
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\Handler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\Handler::handleCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_dispatchCallback(): void {
         // Not much left to cover; just need to test silent output
diff --git a/tests/cases/TestPlainTextHandler.php b/tests/cases/TestPlainTextHandler.php
index 7846a67..8391ef4 100644
--- a/tests/cases/TestPlainTextHandler.php
+++ b/tests/cases/TestPlainTextHandler.php
@@ -6,9 +6,9 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher\Test;
-use MensBeam\Foundation\Catcher;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam\Catcher\Test;
+use MensBeam\Catcher;
+use MensBeam\Catcher\{
     Error,
     Handler,
     PlainTextHandler,
@@ -20,20 +20,20 @@ use Eloquent\Phony\Phpunit\Phony,
 
 class TestPlainTextHandler extends \PHPUnit\Framework\TestCase {
     /**
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
      * 
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::log
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::serializeOutputThrowable
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getFrames
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::log
+     * @covers \MensBeam\Catcher\PlainTextHandler::serializeOutputThrowable
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getFrames
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_handleCallback(): void {
         $c = new ThrowableController(new \Exception(message: 'Ook!', previous: new \Error(message: 'Eek!', previous: new Error(message: 'Ack!', code: \E_USER_ERROR))));
@@ -74,19 +74,19 @@ class TestPlainTextHandler extends \PHPUnit\Framework\TestCase {
 
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::log
+     * @covers \MensBeam\Catcher\PlainTextHandler::log
      * 
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::buildOutputArray
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::buildOutputArray
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_log(): void {
         $l = Phony::mock(LoggerInterface::class);
diff --git a/tests/cases/TestThrowableController.php b/tests/cases/TestThrowableController.php
index 992d5a1..dd28967 100644
--- a/tests/cases/TestThrowableController.php
+++ b/tests/cases/TestThrowableController.php
@@ -6,9 +6,9 @@
  */
 
 declare(strict_types=1);
-namespace MensBeam\Foundation\Catcher\Test;
-use MensBeam\Foundation\Catcher;
-use MensBeam\Foundation\Catcher\{
+namespace MensBeam\Catcher\Test;
+use MensBeam\Catcher;
+use MensBeam\Catcher\{
     Error,
     PlainTextHandler,
     ThrowableController
@@ -17,27 +17,27 @@ use MensBeam\Foundation\Catcher\{
 
 class TestThrowableController extends \PHPUnit\Framework\TestCase {
     /**
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
      * 
-     * @covers \MensBeam\Foundation\Catcher::__construct
-     * @covers \MensBeam\Foundation\Catcher::getLastThrowable
-     * @covers \MensBeam\Foundation\Catcher::handleError
-     * @covers \MensBeam\Foundation\Catcher::isErrorFatal
-     * @covers \MensBeam\Foundation\Catcher::handleThrowable
-     * @covers \MensBeam\Foundation\Catcher::pushHandler
-     * @covers \MensBeam\Foundation\Catcher::register
-     * @covers \MensBeam\Foundation\Catcher::unregister
-     * @covers \MensBeam\Foundation\Catcher\Error::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::__construct
-     * @covers \MensBeam\Foundation\Catcher\Handler::dispatch
-     * @covers \MensBeam\Foundation\Catcher\Handler::handle
-     * @covers \MensBeam\Foundation\Catcher\Handler::print
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::dispatchCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::handleCallback
-     * @covers \MensBeam\Foundation\Catcher\PlainTextHandler::serializeOutputThrowable
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getThrowable
+     * @covers \MensBeam\Catcher::__construct
+     * @covers \MensBeam\Catcher::getLastThrowable
+     * @covers \MensBeam\Catcher::handleError
+     * @covers \MensBeam\Catcher::isErrorFatal
+     * @covers \MensBeam\Catcher::handleThrowable
+     * @covers \MensBeam\Catcher::pushHandler
+     * @covers \MensBeam\Catcher::register
+     * @covers \MensBeam\Catcher::unregister
+     * @covers \MensBeam\Catcher\Error::__construct
+     * @covers \MensBeam\Catcher\Handler::__construct
+     * @covers \MensBeam\Catcher\Handler::dispatch
+     * @covers \MensBeam\Catcher\Handler::handle
+     * @covers \MensBeam\Catcher\Handler::print
+     * @covers \MensBeam\Catcher\PlainTextHandler::dispatchCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::handleCallback
+     * @covers \MensBeam\Catcher\PlainTextHandler::serializeOutputThrowable
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::getThrowable
      */
     public function testMethod_getErrorType(): void {
         $c = new Catcher(new PlainTextHandler([ 'outputToStderr' => false ]));
@@ -109,11 +109,11 @@ class TestThrowableController extends \PHPUnit\Framework\TestCase {
     }
 
     /**
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getFrames
+     * @covers \MensBeam\Catcher\ThrowableController::getFrames
      * 
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::__construct
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getErrorType
-     * @covers \MensBeam\Foundation\Catcher\ThrowableController::getPrevious
+     * @covers \MensBeam\Catcher\ThrowableController::__construct
+     * @covers \MensBeam\Catcher\ThrowableController::getErrorType
+     * @covers \MensBeam\Catcher\ThrowableController::getPrevious
      */
     public function testMethod_getFrames(): void {
         $f = false;