diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml
index 5f0c38b..49e45bb 100644
--- a/.github/workflows/unused.yml
+++ b/.github/workflows/unused.yml
@@ -57,4 +57,4 @@ jobs:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
 
       - name: Detect unused packages
-        run: composer-unused -vvv --profile --ansi --no-interaction --no-progress --excludePackage=php --excludePackage=tatter/alerts --excludePackage=tatter/assets --excludePackage=tatter/audits
+        run: composer-unused -vvv --profile --ansi --no-interaction --no-progress --excludePackage=php --excludePackage=tatter/alerts --excludePackage=tatter/assets --excludePackage=tatter/audits --excludePackage=tatter/preferences --excludePackage=tatter/thumbnails
diff --git a/UPGRADING.md b/UPGRADING.md
new file mode 100644
index 0000000..3a9889a
--- /dev/null
+++ b/UPGRADING.md
@@ -0,0 +1,49 @@
+# Upgrade Guide
+
+## Version 2 to 3
+***
+
+* Switches to `Tatter\Preferences` for managing persistent settings; read more below
+* Drops `Tatter\Audits` as a dependency and adds it as a suggestion; read more below
+
+### `Settings` Migration
+
+`Preferences` relies on `CodeIgniter\Settings` instead of the abandoned `Tatter\Settings`, but
+both packages had migrations for a `settings` database table and the schemas are not compatible.
+You should archive any global and user-specific settings you would like to keep, then drop
+or rename the old table. You may also need to update your `migrations` table in case your
+project complains about a "gap in the migrations". Read more on the migration process at the
+[Tatter\Settings](https://github.com/tattersoftware/codeigniter4-settings) repo.
+
+### Audits
+
+In order to simplify this library `Tatter\Audits` is no longer included by default. If you
+want that level of user-specific logging to database changes then you may install the package
+and provide a model extension with the events to reenable. You may also need to update your
+`migrations` table in case your project complains about a "gap in the migrations".
+
+Installation:
+```bash
+composer require tatter/audits
+php spark migrate --all
+```
+
+Example model file in **app/Models/FileModel.php**:
+```
+<?php
+
+namespace App\Models;
+
+use Tatter\Audits\Traits\AuditsTrait;
+use Tatter\Files\Models\FileModel as BaseModel;
+
+class FileModel extends BaseModel
+{
+    use AuditsTrait;
+
+    // Audits
+    protected $afterInsert = ['auditInsert'];
+    protected $afterUpdate = ['auditUpdate'];
+    protected $afterDelete = ['auditDelete'];
+}
+```
diff --git a/composer.json b/composer.json
index 55ac6c6..87c8aae 100644
--- a/composer.json
+++ b/composer.json
@@ -21,22 +21,19 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "components/jquery": "^3.3",
-        "enyo/dropzone": "^5.7",
-        "fortawesome/font-awesome": "^5.8",
+        "codeigniter4/authentication-implementation": "^1.0",
+        "enyo/dropzone": "^6.0",
         "tatter/alerts": "^2.0",
-        "tatter/assets": "^2.2",
-        "tatter/audits": "^1.0",
         "tatter/exports": "^2.0",
+        "tatter/frontend": "^1.0",
         "tatter/permits": "^2.0",
-        "tatter/settings": "^1.0 || ^2.0",
-        "tatter/thumbnails": "^1.2",
-        "twbs/bootstrap": "^4.5"
+        "tatter/preferences": "^1.0",
+        "tatter/thumbnails": "^1.2"
     },
     "require-dev": {
         "antecedent/patchwork": "^2.1",
         "codeigniter4/codeigniter4": "dev-develop",
-        "myth/auth": "dev-develop",
+        "tatter/imposter": "^1.0",
         "tatter/tools": "^1.15"
     },
     "autoload": {
@@ -55,19 +52,16 @@
     "repositories": [
         {
             "type": "vcs",
-            "url": "https://github.com/codeigniter4/CodeIgniter4",
-            "no-api": true
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/lonnieezell/myth-auth",
-            "no-api": true
+            "url": "https://github.com/codeigniter4/CodeIgniter4.git"
         },
         {
             "type": "composer",
             "url": "https://asset-packagist.org"
         }
     ],
+    "suggest": {
+        "tatter/audits": "Adds logging for user changes to Files database rows."
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index fc09be5..ee6f17b 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -15,16 +15,15 @@ parameters:
 		- '#Cannot access property \$[a-z]+ on array\|object#'
 		- '#Cannot call method [A-Za-z]+\(\) on array\|object#'
 		- '#Unsafe usage of new static\(\)*#'
-		- '#Call to an undefined static method Config\\Services::authentication\(\)#'
-		- '#Function Patchwork\\redefine not found#'
 	universalObjectCratesClasses:
 		- CodeIgniter\Entity
 		- Faker\Generator
 	scanDirectories:
 		- vendor/codeigniter4/codeigniter4/system/Helpers
-		- vendor/myth/auth/src/Helpers
 		- vendor/tatter/alerts/src/Helpers
 		- vendor/tatter/handlers/src/Helpers
+		- vendor/tatter/imposter/src/Helpers
+		- vendor/tatter/preferences/src/Helpers
 	dynamicConstantNames:
 		- APP_NAMESPACE
 		- CI_DEBUG
diff --git a/src/Bundles/DropzoneBundle.php b/src/Bundles/DropzoneBundle.php
new file mode 100644
index 0000000..2e9409f
--- /dev/null
+++ b/src/Bundles/DropzoneBundle.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tatter\Files\Bundles;
+
+use Tatter\Frontend\FrontendBundle;
+
+class DropzoneBundle extends FrontendBundle
+{
+    /**
+     * Applies any initial inputs after the constructor.
+     */
+    protected function define(): void
+    {
+        $this
+            ->addPath('dropzone/dropzone.css')
+            ->addPath('dropzone/dropzone-min.js');
+    }
+}
diff --git a/src/Bundles/FilesBundle.php b/src/Bundles/FilesBundle.php
new file mode 100644
index 0000000..bbfd405
--- /dev/null
+++ b/src/Bundles/FilesBundle.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Tatter\Files\Bundles;
+
+use Tatter\Assets\Bundle;
+use Tatter\Frontend\Bundles\BootstrapBundle;
+use Tatter\Frontend\Bundles\FontAwesomeBundle;
+
+class FilesBundle extends Bundle
+{
+    /**
+     * Applies any initial inputs after the constructor.
+     */
+    protected function define(): void
+    {
+        $this
+            ->merge(new BootstrapBundle())
+            ->merge(new DropzoneBundle())
+            ->merge(new FontAwesomeBundle());
+    }
+}
diff --git a/src/Config/Files.php b/src/Config/Files.php
index d94cb10..d7e418c 100644
--- a/src/Config/Files.php
+++ b/src/Config/Files.php
@@ -3,16 +3,10 @@
 namespace Tatter\Files\Config;
 
 use CodeIgniter\Config\BaseConfig;
+use Tatter\Files\Exceptions\FilesException;
 
 class Files extends BaseConfig
 {
-    /**
-     * Directory to store files (with trailing slash)
-     *
-     * @var string
-     */
-    public $storagePath = WRITEPATH . 'files/';
-
     /**
      * Whether to include routes to the Files Controller.
      *
@@ -20,16 +14,6 @@ class Files extends BaseConfig
      */
     public $routeFiles = true;
 
-    /**
-     * Layouts to use for general access and for administration
-     *
-     * @var array<string, string>
-     */
-    public $layouts = [
-        'public' => 'Tatter\Files\Views\layout',
-        'manage' => 'Tatter\Files\Views\layout',
-    ];
-
     /**
      * View file aliases
      *
@@ -40,16 +24,84 @@ class Files extends BaseConfig
     ];
 
     /**
-     * Default display format; built in are 'cards', 'list', 'select'
+     * Path to the default thumbnail file
      *
      * @var string
      */
-    public $defaultFormat = 'cards';
+    public $defaultThumbnail = 'Tatter\Files\Assets\Unavailable.jpg';
+
+    //--------------------------------------------------------------------
+    // Display Preferences
+    //--------------------------------------------------------------------
 
     /**
-     * Path to the default thumbnail file
+     * Display format for listing files.
+     * Included options are 'cards', 'list', 'select'
      *
      * @var string
      */
-    public $defaultThumbnail = 'Tatter\Files\Assets\Unavailable.jpg';
+    public $format = 'cards';
+
+    /**
+     * Default sort column.
+     * See FileModel::$allowedFields for options.
+     *
+     * @var string
+     */
+    public $sort = 'filename';
+
+    /**
+     * Default sort ordering. "asc" or "desc"
+     *
+     * @var string
+     */
+    public $order = 'asc';
+
+    //--------------------------------------------------------------------
+    // Storage Options
+    //--------------------------------------------------------------------
+
+    /**
+     * Directory to store files (with trailing slash).
+     * Usually best to use getPath()
+     *
+     * @var string
+     */
+    protected $path = WRITEPATH . 'files' . DIRECTORY_SEPARATOR;
+
+    /**
+     * Normalizes and creates (if necessary) the storage and thumbnail paths,
+     * returning the normalized storage path.
+     *
+     * @throws FilesException
+     */
+    public function getPath(): string
+    {
+        $storage = $this->path;
+
+        // Verify the storage directory
+        if (! is_dir($storage) && ! @mkdir($storage, 0775, true)) {
+            throw FilesException::forDirFail($storage);
+        }
+
+        // Normalize the storage path
+        $this->path = realpath($storage) ?: $storage;
+        $this->path = rtrim($storage, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        // Check or create the thumbnails subdirectory
+        $thumbnails = $storage . 'thumbnails';
+        if (! is_dir($thumbnails) && ! @mkdir($thumbnails, 0775, true)) {
+            throw FilesException::forDirFail($thumbnails); // @codeCoverageIgnore
+        }
+
+        return $storage;
+    }
+
+    /**
+     * Changes the storage path value. Mostly just for testing.
+     */
+    public function setPath(string $path)
+    {
+        $this->path = $path;
+    }
 }
diff --git a/src/Config/Registrar.php b/src/Config/Registrar.php
index 01040e9..34a4cb2 100644
--- a/src/Config/Registrar.php
+++ b/src/Config/Registrar.php
@@ -2,17 +2,12 @@
 
 namespace Tatter\Files\Config;
 
-/**
- * Class Registrar
- *
- * Provides a basic registrar class for testing BaseConfig registration functions.
- */
 class Registrar
 {
     /**
-     * Override database config
+     * Adds the Files option to available Pager templates.
      *
-     * @return array
+     * @return array<string,mixed>
      */
     public static function Pager()
     {
diff --git a/src/Config/Routes.php b/src/Config/Routes.php
index fa3a7f6..6812506 100644
--- a/src/Config/Routes.php
+++ b/src/Config/Routes.php
@@ -4,8 +4,13 @@
     return;
 }
 
+$options = [
+    'filter'    => 'assets:\Tatter\Files\Bundles\FilesBundle',
+    'namespace' => '\Tatter\Files\Controllers',
+];
+
 // Routes to Files controller
-$routes->group('files', ['namespace' => '\Tatter\Files\Controllers'], static function ($routes) {
+$routes->group('files', $options, static function ($routes) {
     $routes->get('/', 'Files::index');
     $routes->get('user', 'Files::user');
     $routes->get('user/(:any)', 'Files::user/$1');
diff --git a/src/Controllers/Files.php b/src/Controllers/Files.php
index 06370bd..888f73e 100644
--- a/src/Controllers/Files.php
+++ b/src/Controllers/Files.php
@@ -6,15 +6,14 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\RedirectResponse;
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use Psr\Log\LoggerInterface;
 use Tatter\Exports\Exceptions\ExportsException;
 use Tatter\Files\Config\Files as FilesConfig;
 use Tatter\Files\Entities\File;
 use Tatter\Files\Exceptions\FilesException;
 use Tatter\Files\Models\ExportModel;
 use Tatter\Files\Models\FileModel;
+use Throwable;
 
 class Files extends Controller
 {
@@ -35,7 +34,7 @@ class Files extends Controller
     /**
      * Helpers to load.
      */
-    protected $helpers = ['alerts', 'files', 'handlers', 'html', 'text'];
+    protected $helpers = ['alerts', 'files', 'handlers', 'html', 'preferences', 'text'];
 
     /**
      * Overriding data for views.
@@ -45,36 +44,25 @@ class Files extends Controller
     protected $data = [];
 
     /**
-     * Preloads the configuration and verifies the storage directory.
-     * Parameters are mostly for testing purposes.
+     * Validation for Preferences.
      *
-     * @throws FilesException
+     * @var array<string,string>
      */
-    public function __construct(?FilesConfig $config = null, ?FileModel $model = null)
-    {
-        $this->config = $config ?? config('Files');
-
-        // Use the short model name so a child may be loaded first
-        $this->model = $model ?? model('FileModel'); // @phpstan-ignore-line
-
-        // Verify the storage directory
-        FileModel::storage();
-    }
+    protected $preferenceRules = [
+        'sort'    => 'in_list[filename,localname,clientname,type,size,created_at,updated_at,deleted_at]',
+        'order'   => 'in_list[asc,desc]',
+        'format'  => 'in_list[cards,list,select]',
+        'perPage' => 'is_natural_no_zero',
+    ];
 
     /**
-     * Verify authentication is configured correctly *after* parent calls loadHelpers().
-     *
-     * @throws \CodeIgniter\HTTP\Exceptions\HTTPException
-     *
-     * @see https://codeigniter4.github.io/CodeIgniter4/extending/authentication.html
+     * Preloads the configuration and model.
+     * Parameters are mostly for testing purposes.
      */
-    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+    public function __construct(?FilesConfig $config = null, ?FileModel $model = null)
     {
-        parent::initController($request, $response, $logger);
-
-        if (! function_exists('user_id') || ! empty($this->config->failNoAuth)) {
-            throw new FilesException(lang('Files.noAuth'));
-        }
+        $this->config = $config ?? config('Files');
+        $this->model  = $model ?? model(FileModel::class); // @phpstan-ignore-line
     }
 
     //--------------------------------------------------------------------
@@ -151,10 +139,10 @@ public function index()
     public function user($userId = null)
     {
         // Figure out user & access
-        $userId = $userId ?? user_id() ?? 0;
+        $userId = $userId ?? user_id();
 
         // Not logged in
-        if (! $userId) {
+        if ($userId === null) {
             // Check for list permission
             if (! $this->model->mayList()) {
                 return $this->failure(403, lang('Permits.notPermitted'));
@@ -163,11 +151,11 @@ public function user($userId = null)
             $this->setData([
                 'access'   => 'display',
                 'title'    => 'All Files',
-                'username' => '',
+                'userName' => '',
             ]);
         }
         // Logged in, looking at another user
-        elseif ($userId !== user_id()) {
+        elseif ((int) $userId !== user_id()) {
             // Check for list permission
             if (! $this->model->mayList()) {
                 return $this->failure(403, lang('Permits.notPermitted'));
@@ -176,7 +164,7 @@ public function user($userId = null)
             $this->setData([
                 'access'   => $this->model->mayAdmin() ? 'manage' : 'display',
                 'title'    => 'User Files',
-                'username' => 'User',
+                'userName' => 'User',
             ]);
         }
         // Looking at own files
@@ -184,7 +172,7 @@ public function user($userId = null)
             $this->setData([
                 'access'   => 'manage',
                 'title'    => 'My Files',
-                'username' => 'My',
+                'userName' => 'My',
             ]);
         }
 
@@ -388,14 +376,23 @@ public function upload()
                 return '';
             }
 
+            // Get chunks from target directory
+            helper('filesystem');
+            $chunks = get_filenames($chunkDir, true);
+            if (empty($chunks)) {
+                throw FilesException::forNoChunks($chunkDir);
+            }
+
             // Merge the chunks
             try {
-                $path = $this->mergeChunks($chunkDir);
-            } catch (FilesException $e) {
+                $path = merge_file_chunks(...$chunks);
+            } catch (Throwable $e) {
                 log_message('error', $e->getMessage());
 
                 return $this->failure(400, $e->getMessage());
             }
+
+            log_message('debug', 'Merged ' . count($chunks) . ' chunks to ' . $path);
         }
 
         // Get additional post data to pass to model
@@ -418,55 +415,6 @@ public function upload()
         return redirect()->back()->with('message', lang('File.uploadSucces', [$file->clientname]));
     }
 
-    /**
-     * Merges all chunks in a target directory into a single file, returns the file path.
-     *
-     * @param mixed $dir
-     *
-     * @throws FilesException
-     */
-    protected function mergeChunks($dir): string
-    {
-        helper('filesystem');
-        helper('text');
-
-        // Get chunks from target directory
-        $chunks = get_filenames($dir, true);
-        if (empty($chunks)) {
-            throw FilesException::forNoChunks($dir);
-        }
-
-        // Create the temp file
-        $tmpfile = tempnam(sys_get_temp_dir(), random_string());
-        log_message('debug', 'Merging ' . count($chunks) . ' chunks to ' . $tmpfile);
-
-        // Open temp file for writing
-        $output = @fopen($tmpfile, 'ab');
-        if (! $output) {
-            throw FilesException::forNewFileFail($tmpfile);
-        }
-
-        // Write each chunk to the temp file
-        foreach ($chunks as $file) {
-            $input = @fopen($file, 'rb');
-            if (! $input) {
-                throw FilesException::forWriteFileFail($tmpfile);
-            }
-
-            // Buffered merge of chunk
-            while ($buffer = fread($input, 4096)) {
-                fwrite($output, $buffer);
-            }
-
-            fclose($input);
-        }
-
-        // close output handle
-        fclose($output);
-
-        return $tmpfile;
-    }
-
     /**
      * Processes Export requests.
      *
@@ -503,7 +451,7 @@ public function export(string $slug, $fileId): ResponseInterface
         model(ExportModel::class)->insert([
             'handler' => $slug,
             'file_id' => $file->id,
-            'user_id' => user_id() ?: null,
+            'user_id' => user_id(),
         ]);
 
         // Pass to the handler
@@ -534,8 +482,6 @@ public function thumbnail($fileId): ResponseInterface
         return $this->response->setHeader('Content-type', 'image/jpeg')->setBody(file_get_contents($path));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles failures.
      *
@@ -554,6 +500,8 @@ protected function failure(int $code, string $message, ?bool $isAjax = null): Re
         return redirect()->back()->with('error', $message);
     }
 
+    //--------------------------------------------------------------------
+
     /**
      * Sets a value in $this->data, overwrites optional.
      *
@@ -579,124 +527,57 @@ protected function setData(array $data, bool $overwrite = false): self
      */
     protected function setDefaults(): self
     {
-        return $this->setData([
+        $this->setData([
             'source'   => 'index',
-            'layout'   => 'public',
+            'layout'   => 'files',
             'files'    => null,
             'selected' => explode(',', $this->request->getVar('selected') ?? ''),
             'userId'   => null,
-            'username' => '',
+            'userName' => '',
             'ajax'     => $this->request->isAJAX(),
             'search'   => $this->request->getVar('search'),
-            'sort'     => $this->getSort(),
-            'order'    => $this->getOrder(),
-            'format'   => $this->getFormat(),
-            'perPage'  => $this->getPerPage(),
             'page'     => $this->request->getVar('page'),
             'pager'    => null,
             'access'   => $this->model->mayAdmin() ? 'manage' : 'display',
             'exports'  => $this->getExports(),
             'bulks'    => handlers()->where(['bulk' => 1])->findAll(),
         ]);
-    }
-
-    /**
-     * Determines the sort field.
-     */
-    protected function getSort(): string
-    {
-        // Check for a request, then load from Settings
-        $sorts = [
-            $this->request->getVar('sort'),
-            service('settings')->filesSort,
-        ];
-
-        foreach ($sorts as $sort) {
-            // Validate
-            if (in_array($sort, $this->model->allowedFields, true)) { // @phpstan-ignore-line
-                // Update user setting with the new preference
-                service('settings')->filesSort = $sort;
-
-                return $sort;
-            }
-        }
-
-        return 'filename';
-    }
-
-    /**
-     * Determines the sort order.
-     */
-    protected function getOrder(): string
-    {
-        // Check for a request, then load from Settings
-        $orders = [
-            $this->request->getVar('order'),
-            service('settings')->filesOrder,
-        ];
 
-        foreach ($orders as $order) {
-            $order = strtolower($order);
+        // Add preferences
+        $this->setPreferences();
 
-            // Validate
-            if (in_array($order, ['asc', 'desc'], true)) {
-                // Update user setting with the new preference
-                service('settings')->filesOrder = $order;
-
-                return $order;
-            }
+        foreach (['Files.sort', 'Files.order', 'Files.format', 'Pager.perPage'] as $preference) {
+            [,$field] = explode('.', $preference);
+            $this->setData([$field => preference($preference)]);
         }
 
-        return 'asc';
-    }
-
-    /**
-     * Determines items per page.
-     */
-    protected function getPerPage(): int
-    {
-        // Check for a request, then load from Settings
-        $nums = [
-            $this->request->getVar('perPage'),
-            service('settings')->perPage,
-        ];
-
-        foreach ($nums as $num) {
-            // Validate
-            if (is_numeric($num) && (int) $num > 0) {
-                // Update user setting with the new preference
-                service('settings')->perPage = $num;
-
-                return $num;
-            }
-        }
-
-        return 10;
+        return $this;
     }
 
     /**
-     * Determines the display format.
+     * Filters, validates, and sets preferences based on input values.
+     *
+     * @return $this
      */
-    protected function getFormat(): string
+    protected function setPreferences(): self
     {
-        // Check for a request, then load from Settings, fallback to the config default
-        $formats = [
-            $this->request->getVar('format'),
-            service('settings')->filesFormat,
-            $this->config->defaultFormat,
-        ];
-
-        foreach ($formats as $format) {
-            // Validate
-            if (in_array($format, ['cards', 'list', 'select'], true)) {
-                // Update user setting with the new preference
-                service('settings')->filesFormat = $format;
-
-                return $format;
+        // Filter input on allowed fields
+        $validation = service('validation');
+
+        foreach ($this->preferenceRules as $field => $rule) {
+            if (null !== $value = $this->request->getVar($field)) {
+                if ($validation->check($value, $rule)) {
+                    // Special case for perPage
+                    $preference = $field === 'perPage'
+                        ? 'Pager.' . $field
+                        : 'Files.' . $field;
+
+                    preference($preference, $value);
+                }
             }
         }
 
-        return 'cards';
+        return $this;
     }
 
     /**
diff --git a/src/Database/Seeds/FileSeeder.php b/src/Database/Seeds/FileSeeder.php
deleted file mode 100644
index 2d02bf3..0000000
--- a/src/Database/Seeds/FileSeeder.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Tatter\Files\Database\Seeds;
-
-use Tatter\Settings\Models\SettingModel;
-
-class FileSeeder extends \CodeIgniter\Database\Seeder
-{
-    public function run()
-    {
-        // Compatible with Settings v1 and v2
-        $templates = [
-            [
-                'name'      => 'perPage',
-                'datatype'  => 'int',
-                'summary'   => 'Number of items to show per page',
-                'content'   => '10',
-                'scope'     => 'user',
-                'protected' => 1,
-            ],
-            [
-                'name'      => 'filesFormat',
-                'datatype'  => 'string',
-                'summary'   => 'Display format for listing files',
-                'content'   => 'cards',
-                'scope'     => 'user',
-                'protected' => 0,
-            ],
-            [
-                'name'      => 'filesSort',
-                'datatype'  => 'string',
-                'summary'   => 'Sort field for listing files',
-                'content'   => 'filename',
-                'scope'     => 'user',
-                'protected' => 0,
-            ],
-            [
-                'name'      => 'filesOrder',
-                'datatype'  => 'string',
-                'summary'   => 'Sort order for listing files',
-                'content'   => 'asc',
-                'scope'     => 'user',
-                'protected' => 0,
-            ],
-        ];
-
-        // Check for each template and create it if it is missing
-        foreach ($templates as $template) {
-            if (! model(SettingModel::class)->where('name', $template['name'])->first()) { // @phpstan-ignore-line
-                model(SettingModel::class)->insert($template);
-            }
-        }
-    }
-}
diff --git a/src/Entities/File.php b/src/Entities/File.php
index ad2d954..45e8b61 100644
--- a/src/Entities/File.php
+++ b/src/Entities/File.php
@@ -49,7 +49,7 @@ public static function locateDefaultThumbnail(): string
      */
     public function getPath(): string
     {
-        $path = config('Files')->storagePath . $this->attributes['localname'];
+        $path = config('Files')->getPath() . $this->attributes['localname'];
 
         return realpath($path) ?: $path;
     }
@@ -133,7 +133,7 @@ public function getExports($asterisk = true): array
      */
     public function getThumbnail(): string
     {
-        $path = config('Files')->storagePath . 'thumbnails' . DIRECTORY_SEPARATOR . ($this->attributes['thumbnail'] ?? '');
+        $path = config('Files')->getPath() . 'thumbnails' . DIRECTORY_SEPARATOR . ($this->attributes['thumbnail'] ?? '');
 
         if (! is_file($path)) {
             $path = self::locateDefaultThumbnail();
diff --git a/src/Helpers/files_helper.php b/src/Helpers/files_helper.php
index 3c33836..86817ec 100644
--- a/src/Helpers/files_helper.php
+++ b/src/Helpers/files_helper.php
@@ -1,5 +1,7 @@
 <?php
 
+use Tatter\Files\Exceptions\FilesException;
+
 if (! function_exists('bytes2human')) {
     /**
      * Converts bytes to a human-friendly format.
@@ -55,6 +57,47 @@ function max_file_upload_in_bytes(): int
     }
 }
 
+if (! function_exists('merge_file_chunks')) {
+    /**
+     * Merges the given file chunks into a single file
+     * and returns the new path.
+     *
+     * @throws FilesException
+     */
+    function merge_file_chunks(string ...$files): string
+    {
+        // Create the temp file
+        $prefix  = bin2hex(random_bytes(16));
+        $tmpfile = tempnam(sys_get_temp_dir(), $prefix);
+
+        // Open temp file for writing
+        $output = @fopen($tmpfile, 'ab');
+        if (! $output) {
+            throw FilesException::forNewFileFail($tmpfile); // @codeCoverageIgnore
+        }
+
+        // Write each chunk to the temp file
+        foreach ($files as $file) {
+            $input = @fopen($file, 'rb');
+            if (! $input) {
+                throw FilesException::forWriteFileFail($tmpfile);
+            }
+
+            // Buffered merge of chunk
+            while ($buffer = fread($input, 4096)) {
+                fwrite($output, $buffer);
+            }
+
+            fclose($input);
+        }
+
+        // close output handle
+        fclose($output);
+
+        return $tmpfile;
+    }
+}
+
 if (! function_exists('return_bytes')) {
     /**
      * Converts ini-style sizes to bytes.
diff --git a/src/Models/FileModel.php b/src/Models/FileModel.php
index e5e8930..d85eeef 100644
--- a/src/Models/FileModel.php
+++ b/src/Models/FileModel.php
@@ -5,13 +5,13 @@
 use CodeIgniter\Files\File as CIFile;
 use CodeIgniter\Model;
 use Config\Mimes;
+use Faker\Generator;
 use Tatter\Files\Entities\File;
-use Tatter\Files\Exceptions\FilesException;
+use Tatter\Permits\Traits\PermitsTrait;
 
 class FileModel extends Model
 {
-    use \Tatter\Audits\Traits\AuditsTrait;
-    use \Tatter\Permits\Traits\PermitsTrait;
+    use PermitsTrait;
 
     protected $table          = 'files';
     protected $primaryKey     = 'id';
@@ -33,11 +33,6 @@ class FileModel extends Model
         'size' => 'permit_empty|is_natural',
     ];
 
-    // Audits
-    protected $afterInsert = ['auditInsert'];
-    protected $afterUpdate = ['auditUpdate'];
-    protected $afterDelete = ['auditDelete'];
-
     // Permits
     protected $mode       = 04660;
     protected $userKey    = 'user_id';
@@ -46,33 +41,6 @@ class FileModel extends Model
 
     //--------------------------------------------------------------------
 
-    /**
-     * Normalizes and creates (if necessary) the storage and thumbnail paths.
-     *
-     * @throws FilesException
-     *
-     * @return string The normalized storage path
-     */
-    public static function storage(): string
-    {
-        // Normalize the path
-        $storage = realpath(config('Files')->storagePath) ?: config('Files')->storagePath;
-        $storage = rtrim($storage, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-        if (! is_dir($storage) && ! @mkdir($storage, 0775, true)) {
-            throw FilesException::forDirFail($storage);
-        }
-
-        // Normalize the path
-        $thumbnails = $storage . 'thumbnails';
-        if (! is_dir($thumbnails) && ! @mkdir($thumbnails, 0775, true)) {
-            throw FilesException::forDirFail($thumbnails); // @codeCoverageIgnore
-        }
-
-        return $storage;
-    }
-
-    //--------------------------------------------------------------------
-
     /**
      * Associates a file with a user
      */
@@ -139,7 +107,7 @@ public function createFromFile(CIFile $file, array $data = []): File
         $row = array_merge($row, $data);
 
         // Normalize paths
-        $storage  = self::storage();
+        $storage  = config('Files')->getPath();
         $filePath = $file->getRealPath() ?: (string) $file;
 
         // Determine if we need to move the file
@@ -184,4 +152,21 @@ public function createFromFile(CIFile $file, array $data = []): File
         // Return the File entity
         return $this->find($fileId);
     }
+
+    /**
+     * Faked data for Fabricator.
+     */
+    public function fake(Generator &$faker): File
+    {
+        $name = $faker->company . '.' . $faker->fileExtension;
+
+        return new File([
+            'filename'   => $name,
+            'localname'  => $faker->md5,
+            'clientname' => $name,
+            'type'       => $faker->mimeType,
+            'size'       => mt_rand(1000, 4000000),
+            'thumbnail'  => $faker->text(5000),
+        ]);
+    }
 }
diff --git a/src/Publishers/DropzonePublisher.php b/src/Publishers/DropzonePublisher.php
new file mode 100644
index 0000000..fb99939
--- /dev/null
+++ b/src/Publishers/DropzonePublisher.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tatter\Files\Publishers;
+
+use Tatter\Frontend\FrontendPublisher;
+
+class DropzonePublisher extends FrontendPublisher
+{
+    /**
+     * @var string
+     */
+    protected $source = 'vendor/enyo/dropzone/dist';
+
+    /**
+     * Destination path relative to AssetsConfig::directory.
+     *
+     * @see FrontendPublisher::__construct()
+     *
+     * @var string
+     */
+    protected $path = 'dropzone';
+
+    /**
+     * Reads files from the sources and copies them out to their destinations.
+     * This method should be reimplemented by child classes intended for
+     * discovery.
+     */
+    public function publish(): bool
+    {
+        return $this
+            ->addPath('/')
+            ->copy(true);
+    }
+}
diff --git a/src/Views/index.php b/src/Views/index.php
index 9041a24..17e7b4f 100644
--- a/src/Views/index.php
+++ b/src/Views/index.php
@@ -1,5 +1,10 @@
-<?= $this->extend(config('Files')->layouts[$layout ?? 'public']) ?>
-<?= $this->section('main') ?>
+<?php $this->extend(config('Layouts')->{$layout}) ?>
+<?php $this->section('navbar') ?>
+
+	<?= view('Tatter\Files\Views\navbar') ?>
+
+<?php $this->endSection() ?>
+<?php $this->section('main') ?>
 
 	<div class="row">
 		<div class="col">
@@ -17,7 +22,7 @@
 				</div>
 			</div>
 
-			<h1><?= $access === 'manage' ? 'Manage' : 'Browse' ?> <?= $username ?? '' ?> Files</h1>
+			<h1><?= $access === 'manage' ? 'Manage' : 'Browse' ?> <?= $userName ?? '' ?> Files</h1>
 
 			<form class="form-inline mb-3" name="files-search" method="get" action="<?= current_url() ?>">
 				<div class="input-group">
diff --git a/src/Views/layout.php b/src/Views/layout.php
deleted file mode 100644
index 2d1c55a..0000000
--- a/src/Views/layout.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-$menu = $menu ?? '';
-?><!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<meta name="description" content="">
-	<meta name="author" content="Matthew Gatner">
-	<title><?= $title ?? 'Files' ?></title>
-
-	<?= service('assets')->tag('vendor/jquery/jquery.min.js') ?>
-	<?= service('assets')->tag('vendor/bootstrap/bootstrap.min.css') ?>
-	<?= service('assets')->tag('vendor/font-awesome/css/all.min.css') ?>
-	<?= service('assets')->tag('vendor/dropzone/dropzone.min.css') ?>
-
-	<?= service('alerts')->css() ?>
-
-	<?= $this->renderSection('headerAssets') ?>
-
-</head>
-<body>
-	<nav class="navbar navbar-expand-md navbar-dark bg-dark">
-		<a class="navbar-brand" href="<?= site_url() ?>">Home</a>
-		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
-		</button>
-
-		<div class="collapse navbar-collapse" id="navbars">
-			<ul class="navbar-nav mr-auto">
-				<li class="nav-item <?= ($menu === 'index') ? 'active' : '' ?>">
-					<a class="nav-link" href="<?= site_url('files') ?>">All Files <?= ($menu === 'index') ? '<span class="sr-only">(current)</span>' : '' ?></a>
-				</li>
-				<li class="nav-item <?= ($menu === 'user') ? 'active' : '' ?>">
-					<a class="nav-link" href="<?= site_url('files/user') ?>">User Files <?= ($menu === 'user') ? '<span class="sr-only">(current)</span>' : '' ?></a>
-				</li>
-				<li class="nav-item <?= ($menu === 'new') ? 'active' : '' ?>">
-					<a class="nav-link" href="<?= site_url('files/new') ?>" data-toggle="modal" data-target="#dropzoneModal">Add Files</a>
-				</li>
-			</ul>
-		</div>
-	</nav>
-
-	<?= service('alerts')->display() ?>
-
-	<main role="main" class="container my-5">
-
-		<?= $this->renderSection('main') ?>
-
-	</main><!-- /.container -->
-
-	<?= service('assets')->tag('vendor/bootstrap/bootstrap.bundle.min.js') ?>
-	<?= service('assets')->tag('vendor/dropzone/dropzone.min.js') ?>
-
-	<?= $this->renderSection('footerAssets') ?>
-
-</body>
-</html>
diff --git a/src/Views/messages.php b/src/Views/messages.php
index 0c9efd5..72d2815 100644
--- a/src/Views/messages.php
+++ b/src/Views/messages.php
@@ -1,5 +1,10 @@
-<?= $this->extend($config->layouts['public']) ?>
-<?= $this->section('main') ?>
+<?php $this->extend(config('Layouts')->{$layout}) ?>
+<?php $this->section('navbar') ?>
+
+	<?= view('Tatter\Files\Views\navbar') ?>
+
+<?php $this->endSection() ?>
+<?php $this->section('main') ?>
 
 	<h2>Information</h2>
 
@@ -35,4 +40,4 @@
 endif;
 ?>
 
-<?= $this->endSection() ?>
+<?php $this->endSection() ?>
diff --git a/src/Views/navbar.php b/src/Views/navbar.php
new file mode 100644
index 0000000..7a6d24a
--- /dev/null
+++ b/src/Views/navbar.php
@@ -0,0 +1,12 @@
+
+	<ul class="navbar-nav mr-auto">
+		<li class="nav-item">
+			<a class="nav-link" href="<?= site_url('files') ?>">All Files</a>
+		</li>
+		<li class="nav-item">
+			<a class="nav-link" href="<?= site_url('files/user') ?>">User Files</a>
+		</li>
+		<li class="nav-item">
+			<a class="nav-link" href="<?= site_url('files/new') ?>" data-toggle="modal" data-target="#dropzoneModal">Add Files</a>
+		</li>
+	</ul>
diff --git a/src/Views/new.php b/src/Views/new.php
index 2739641..83156e9 100644
--- a/src/Views/new.php
+++ b/src/Views/new.php
@@ -1,10 +1,15 @@
-<?= $this->extend(config('Files')->layouts[$layout ?? 'public']) ?>
-<?= $this->section('main') ?>
+<?php $this->extend(config('Layouts')->{$layout}) ?>
+<?php $this->section('navbar') ?>
+
+	<?= view('Tatter\Files\Views\navbar') ?>
+
+<?php $this->endSection() ?>
+<?php $this->section('main') ?>
 
 	<?= view('Tatter\Files\Views\Dropzone\modal') ?>
 
-<?= $this->endSection() ?>
-<?= $this->section('footerAssets') ?>
+<?php $this->endSection() ?>
+<?php $this->section('footerAssets') ?>
 
 	<?= view(config('Files')->views['dropzone']) ?>
 
@@ -14,4 +19,4 @@
 });
 </script>
 
-<?= $this->endSection() ?>
+<?php $this->endSection() ?>
diff --git a/src/Views/rename.php b/src/Views/rename.php
index c260c79..3df9eb6 100644
--- a/src/Views/rename.php
+++ b/src/Views/rename.php
@@ -1,11 +1,16 @@
-<?= $this->extend($config->layouts['public']) ?>
-<?= $this->section('main') ?>
+<?php $this->extend(config('Layouts')->{$layout}) ?>
+<?php $this->section('navbar') ?>
+
+	<?= view('Tatter\Files\Views\navbar') ?>
+
+<?php $this->endSection() ?>
+<?php $this->section('main') ?>
 
 	<div class="row">
 		<div class="col">
 			<h1>Rename File</h1>
-			<?= view('Tatter\Files\Views\\forms\rename') ?>
+			<?= view('Tatter\Files\Views\Forms\rename') ?>
 		</div>
 	</div>
 
-<?= $this->endSection() ?>
+<?php $this->endSection() ?>
diff --git a/tests/_support/Fakers/FileFaker.php b/tests/_support/Fakers/FileFaker.php
deleted file mode 100644
index 296e1a6..0000000
--- a/tests/_support/Fakers/FileFaker.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Tests\Support\Fakers;
-
-use Faker\Generator;
-use Tatter\Files\Entities\File;
-use Tatter\Files\Models\FileModel;
-
-class FileFaker extends FileModel
-{
-    /**
-     * Faked data for Fabricator.
-     */
-    public function fake(Generator &$faker): File
-    {
-        $name = $faker->company . '.' . $faker->fileExtension;
-
-        return new File([
-            'filename'   => $name,
-            'localname'  => $faker->md5,
-            'clientname' => $name,
-            'type'       => $faker->mimeType,
-            'size'       => mt_rand(1000, 4000000),
-            'thumbnail'  => $faker->text(5000),
-        ]);
-    }
-}
diff --git a/tests/_support/FeatureTestCase.php b/tests/_support/FeatureTestCase.php
index 7a5a25e..b64227e 100644
--- a/tests/_support/FeatureTestCase.php
+++ b/tests/_support/FeatureTestCase.php
@@ -4,16 +4,13 @@
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\FeatureTestTrait;
-use Myth\Auth\Test\AuthTestTrait;
-use Tatter\Files\Models\FileModel;
 use Tests\Support\Models\UserModel;
 
 /**
  * @internal
  */
-abstract class FeatureTestCase extends FilesTestCase
+abstract class FeatureTestCase extends TestCase
 {
-    use AuthTestTrait;
     use FeatureTestTrait;
 
     /**
@@ -43,22 +40,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetAuthServices();
-
         // Make sure we use the correct UserModel for permissions
         Factories::injectMock('models', UserModel::class, new UserModel());
-    }
-
-    /**
-     * Injects a permission mode into the shared FileModel.
-     *
-     * @param int $mode Octal mode
-     */
-    protected function setMode(int $mode)
-    {
-        $model = new FileModel();
-        $model->setMode($mode);
 
-        Factories::injectMock('models', FileModel::class, $model);
+        // Make sure everything is published once
+        $this->publishAll();
     }
 }
diff --git a/tests/_support/FilesTestCase.php b/tests/_support/FilesTestCase.php
deleted file mode 100644
index 95e26c4..0000000
--- a/tests/_support/FilesTestCase.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Tests\Support;
-
-use CodeIgniter\Config\Factories;
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
-use Config\Services;
-use Myth\Auth\Entities\User;
-use Myth\Auth\Test\AuthTestTrait;
-use Myth\Auth\Test\Fakers\UserFaker;
-use org\bovigo\vfs\vfsStream;
-use org\bovigo\vfs\vfsStreamDirectory;
-use Tatter\Files\Config\Files;
-use Tests\Support\Fakers\FileFaker;
-
-/**
- * @internal
- */
-abstract class FilesTestCase extends CIUnitTestCase
-{
-    use AuthTestTrait;
-    use DatabaseTestTrait;
-
-    /**
-     * Should the database be refreshed before each test?
-     *
-     * @var bool
-     */
-    protected $refresh = true;
-
-    /**
-     * The namespace(s) to help us find the migration classes.
-     * Empty is equivalent to running `spark migrate -all`.
-     * Note that running "all" runs migrations in date order,
-     * but specifying namespaces runs them in namespace order (then date)
-     *
-     * @var array|string|null
-     */
-    protected $namespace;
-
-    /**
-     * The seed file(s) used for all tests within this test case.
-     * Should be fully-namespaced or relative to $basePath
-     *
-     * @var array|string
-     */
-    protected $seed = 'Tatter\Files\Database\Seeds\FileSeeder';
-
-    /**
-     * Configuration
-     *
-     * @var Files
-     */
-    protected $config;
-
-    /**
-     * @var FileFaker
-     */
-    protected $model;
-
-    /**
-     * @var vfsStreamDirectory|null
-     */
-    protected $root;
-
-    /**
-     * Path to a test file to work with
-     *
-     * @var string
-     */
-    protected $testPath;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        helper('auth');
-        $this->resetAuthServices();
-
-        $_REQUEST = [];
-        $_POST    = [];
-        $_GET     = [];
-
-        $this->model = new FileFaker();
-
-        // Start the virtual filesystem
-        $this->root = vfsStream::setup();
-        vfsStream::copyFromFileSystem(SUPPORTPATH . 'vfs/', $this->root);
-
-        // Force our config to the virtual path
-        $this->config              = new Files();
-        $this->config->storagePath = $this->root->url() . '/storage/';
-        Factories::injectMock('config', 'Files', $this->config);
-
-        $this->testPath = $this->config->storagePath . 'image.jpg';
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->root = null;
-    }
-
-    /**
-     * Login a user, optionally created at random.
-     *
-     * @param int $userId
-     *
-     * $return User
-     */
-    protected function login(?int $userId = null): User
-    {
-        // Get or create the user
-        $user = $userId ? model(Models\UserModel::class)->find($userId) : fake(UserFaker::class);
-
-        $_SESSION['logged_in'] = $user->id;
-
-        $auth = Services::authentication();
-        $auth->login($user);
-        Services::injectMock('authentication', $auth);
-
-        return $user;
-    }
-
-    /**
-     * Create a random user and give it some random files.
-     *
-     * @param array $data      Overriding array of user data for the faker
-     * @param int   $fileCount Number of files to create
-     */
-    protected function createUserWithFiles(array $data = [], int $fileCount = 2): User
-    {
-        // Create the user
-        $user = fake(UserFaker::class, $data);
-
-        // Create files and assign them to the user
-        for ($i = 0; $i < abs($fileCount); $i++) {
-            $file = fake(FileFaker::class);
-
-            $this->model->addToUser($file->id, $user->id);
-        }
-
-        return $user;
-    }
-}
diff --git a/tests/_support/Models/UserModel.php b/tests/_support/Models/UserModel.php
index fd9900f..152dba4 100644
--- a/tests/_support/Models/UserModel.php
+++ b/tests/_support/Models/UserModel.php
@@ -2,15 +2,17 @@
 
 namespace Tests\Support\Models;
 
-use Myth\Auth\Models\UserModel as MythModel;
+use CodeIgniter\Model;
 use Tatter\Permits\Interfaces\PermitsUserModelInterface;
 
 /**
- * An extension of Myth's UserModel that is
- * compatible with Tatter\Permits.
+ * A barebones UserModel that is compatible with Tatter\Permits.
  */
-class UserModel extends MythModel implements PermitsUserModelInterface
+class UserModel extends Model implements PermitsUserModelInterface
 {
+    protected $table      = 'users';
+    protected $primaryKey = 'id';
+
     /**
      * Returns an empty array since groups are
      * not currently implemented.
diff --git a/tests/_support/TestCase.php b/tests/_support/TestCase.php
new file mode 100644
index 0000000..de49c7f
--- /dev/null
+++ b/tests/_support/TestCase.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Support;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use org\bovigo\vfs\vfsStream;
+use Tatter\Assets\Test\AssetsTestTrait;
+use Tatter\Files\Config\Files;
+
+/**
+ * @internal
+ */
+abstract class TestCase extends CIUnitTestCase
+{
+    use AssetsTestTrait;
+    use DatabaseTestTrait;
+
+    protected $refresh = false;
+    protected $namespace;
+
+    /**
+     * Path to a test file to work with
+     *
+     * @var string
+     */
+    protected $testPath;
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        helper(['auth', 'files', 'preferences']);
+    }
+
+    protected function setUp(): void
+    {
+        $this->resetServices();
+
+        parent::setUp();
+
+        $_REQUEST = [];
+        $_POST    = [];
+        $_GET     = [];
+        $_FILES   = [];
+
+        // Copy the files to VFS
+        vfsStream::copyFromFileSystem(SUPPORTPATH . 'VFS', $this->root);
+
+        // "vendor" gets ignored by .gitignore so rename it after copying to VFS
+        $path = $this->root->url() . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR;
+        rename($this->root->url() . '/storage', $path);
+        $this->testPath = $path . 'image.jpg';
+
+        // Force Files config to the virtual path
+        $config = config('Files');
+        $config->setPath($path);
+        Factories::injectMock('config', 'Files', $config);
+    }
+}
diff --git a/tests/_support/vfs/file.txt b/tests/_support/VFS/file.txt
similarity index 100%
rename from tests/_support/vfs/file.txt
rename to tests/_support/VFS/file.txt
diff --git a/tests/_support/vfs/storage/image.jpg b/tests/_support/VFS/storage/image.jpg
similarity index 100%
rename from tests/_support/vfs/storage/image.jpg
rename to tests/_support/VFS/storage/image.jpg
diff --git a/tests/_support/app/Controllers/Widgets.php b/tests/_support/app/Controllers/Widgets.php
deleted file mode 100644
index 65e9997..0000000
--- a/tests/_support/app/Controllers/Widgets.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use CodeIgniter\HTTP\RedirectResponse;
-use Tatter\Files\Controllers\Files;
-
-/**
- * A simple class to test extended Controllers.
- */
-class Widgets extends Files
-{
-    /**
-     * Displays a list of odd files.
-     *
-     * @return RedirectResponse|string
-     */
-    public function files()
-    {
-        return '';
-    }
-}
diff --git a/tests/_support/app/Models/FileModel.php b/tests/_support/app/Models/FileModel.php
deleted file mode 100644
index d2de64c..0000000
--- a/tests/_support/app/Models/FileModel.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * A dummy class to prove that the Files controller
- * will prefer an external model.
- */
-class FileModel extends \Tatter\Files\Models\FileModel
-{
-}
diff --git a/tests/_support/chunks/0 b/tests/_support/chunks/0
new file mode 100644
index 0000000..519e95f
--- /dev/null
+++ b/tests/_support/chunks/0
@@ -0,0 +1 @@
+All your 
\ No newline at end of file
diff --git a/tests/_support/chunks/1 b/tests/_support/chunks/1
new file mode 100644
index 0000000..89a6f6e
--- /dev/null
+++ b/tests/_support/chunks/1
@@ -0,0 +1 @@
+base are 
\ No newline at end of file
diff --git a/tests/_support/chunks/2 b/tests/_support/chunks/2
new file mode 100644
index 0000000..ee9ae70
--- /dev/null
+++ b/tests/_support/chunks/2
@@ -0,0 +1 @@
+belong to 
\ No newline at end of file
diff --git a/tests/_support/chunks/3 b/tests/_support/chunks/3
new file mode 100644
index 0000000..bebdc4e
--- /dev/null
+++ b/tests/_support/chunks/3
@@ -0,0 +1 @@
+us.
\ No newline at end of file
diff --git a/tests/assets/BundlesTest.php b/tests/assets/BundlesTest.php
new file mode 100644
index 0000000..3fbf62d
--- /dev/null
+++ b/tests/assets/BundlesTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tatter\Files\Bundles;
+
+use Tatter\Assets\Test\BundlesTestCase;
+
+/**
+ * @internal
+ */
+final class BundlesTest extends BundlesTestCase
+{
+    public function bundleProvider(): array
+    {
+        return [
+            [
+                DropzoneBundle::class,
+                [
+                    'dropzone.css',
+                ],
+                [
+                    'dropzone-min.js',
+                ],
+            ],
+            [
+                FilesBundle::class,
+                [
+                    'all.min.css',
+                    'bootstrap.min.css',
+                    'dropzone.css',
+                    'jquery.min.js', // Note that unlike most JS files this goes in <head>
+                ],
+                [
+                    'bootstrap.bundle.min.js',
+                    'dropzone-min.js',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/tests/assets/PublishersTest.php b/tests/assets/PublishersTest.php
new file mode 100644
index 0000000..5bdfc5f
--- /dev/null
+++ b/tests/assets/PublishersTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tatter\Files\Publishers;
+
+use Tatter\Frontend\Test\PublishersTestCase;
+
+/**
+ * @internal
+ */
+final class PublishersTest extends PublishersTestCase
+{
+    public function publisherProvider(): array
+    {
+        return [
+            [
+                DropzonePublisher::class,
+                [
+                    'dropzone/basic.css',
+                    'dropzone/dropzone.css',
+                    'dropzone/dropzone.css.map',
+                    'dropzone/dropzone-min.js',
+                    'dropzone/dropzone.mjs',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/tests/feature/DisplayTest.php b/tests/feature/DisplayTest.php
index ef1d186..52a3ecb 100644
--- a/tests/feature/DisplayTest.php
+++ b/tests/feature/DisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Tests\Support\Fakers\FileFaker;
+use Tatter\Files\Models\FileModel;
 use Tests\Support\FeatureTestCase;
 
 /**
@@ -8,6 +8,8 @@
  */
 final class DisplayTest extends FeatureTestCase
 {
+    protected $refresh = true;
+
     public function testNoFiles()
     {
         $result = $this->get('files');
@@ -18,7 +20,7 @@ public function testNoFiles()
 
     public function testDefaultDisplaysCards()
     {
-        $file = fake(FileFaker::class);
+        $file = fake(FileModel::class);
 
         $result = $this->get('files');
 
@@ -26,13 +28,13 @@ public function testDefaultDisplaysCards()
         $result->assertSee($file->filename);
     }
 
-    public function testDataUsesSettings()
+    public function testDataUsesPreferences()
     {
-        service('settings')->filesSort   = 'type';
-        service('settings')->filesOrder  = 'asc';
-        service('settings')->filesFormat = 'cards';
+        preference('Files.sort', 'type');
+        preference('Files.order', 'asc');
+        preference('Files.format', 'cards');
 
-        $file   = fake(FileFaker::class);
+        $file   = fake(FileModel::class);
         $result = $this->get('files');
         $result->assertStatus(200);
         $result->assertSee($file->filename);
@@ -40,13 +42,12 @@ public function testDataUsesSettings()
 
     public function provideFormat()
     {
-        yield ['cards', 'cards'];
-
-        yield ['list', 'list'];
-
-        yield ['select', 'select'];
-
-        yield ['invalid', config('Files')->defaultFormat];
+        return [
+            ['cards', 'cards'],
+            ['list', 'list'],
+            ['select', 'select'],
+            ['invalid', config('Files')->format],
+        ];
     }
 
     /**
@@ -56,28 +57,24 @@ public function testFormat(string $format, string $configFormat)
     {
         $_REQUEST['format'] = $format;
 
-        $file   = fake(FileFaker::class);
+        $file   = fake(FileModel::class);
         $result = $this->get('files');
 
         $result->assertStatus(200);
-        $this->assertSame($configFormat, service('settings')->filesFormat);
+        $this->assertSame($configFormat, preference('Files.format'));
     }
 
     public function provideSort()
     {
-        yield ['filename', 'filename'];
-
-        yield ['localname', 'localname'];
-
-        yield ['clientname', 'clientname'];
-
-        yield ['type', 'type'];
-
-        yield ['size', 'size'];
-
-        yield ['thumbnail', 'thumbnail'];
-
-        yield ['invalidsort', 'filename'];
+        return [
+            ['filename', 'filename'],
+            ['localname', 'localname'],
+            ['clientname', 'clientname'],
+            ['type', 'type'],
+            ['size', 'size'],
+            ['thumbnail', 'filename'],
+            ['invalidsort', 'filename'],
+        ];
     }
 
     /**
@@ -87,20 +84,20 @@ public function testSorts(string $sort, string $configSort)
     {
         $_REQUEST['sort'] = $sort;
 
-        $file   = fake(FileFaker::class);
+        $file   = fake(FileModel::class);
         $result = $this->get('files');
 
         $result->assertStatus(200);
-        $this->assertSame($configSort, service('settings')->filesSort);
+        $this->assertSame($configSort, preference('Files.sort'));
     }
 
     public function provideOrder()
     {
-        yield ['asc', 'asc'];
-
-        yield ['desc', 'desc'];
-
-        yield ['invalid', 'asc'];
+        return [
+            ['asc', 'asc'],
+            ['desc', 'desc'],
+            ['invalid', 'asc'],
+        ];
     }
 
     /**
@@ -110,18 +107,19 @@ public function testOrders(string $order, string $configOrder)
     {
         $_REQUEST['order'] = $order;
 
-        $file   = fake(FileFaker::class);
+        $file   = fake(FileModel::class);
         $result = $this->get('files');
 
         $result->assertStatus(200);
-        $this->assertSame($configOrder, service('settings')->filesOrder);
+        $this->assertSame($configOrder, preference('Files.order'));
     }
 
     public function provideSearch()
     {
-        yield ['Heathcote'];
-
-        yield ['will never be found'];
+        return [
+            ['Heathcote'],
+            ['will never be found'],
+        ];
     }
 
     /**
@@ -131,7 +129,7 @@ public function testSearches(string $keyword)
     {
         $_REQUEST['search'] = $keyword;
 
-        $file   = fake(FileFaker::class);
+        $file   = fake(FileModel::class);
         $result = $this->get('files');
 
         $result->assertStatus(200);
@@ -146,17 +144,20 @@ public function testSearches(string $keyword)
 
     public function testPages()
     {
-        for ($i = 0; $i < 12; $i++) {
-            $file = fake(FileFaker::class);
+        $_REQUEST['perPage'] = 2;
+
+        for ($i = 0; $i < 2; $i++) {
+            $file = fake(FileModel::class);
         }
 
         // Make a file to be sorted last
-        $file = fake(FileFaker::class, [
+        $file = fake(FileModel::class, [
             'filename' => 'ZZZZZZZZZ',
         ]);
 
         // Last file should be on the next page
         $result = $this->get('files');
+
         $result->assertStatus(200);
         $result->assertDontSee($file->filename);
 
diff --git a/tests/feature/PermissionsTest.php b/tests/feature/PermissionsTest.php
index a12534a..7a9411e 100644
--- a/tests/feature/PermissionsTest.php
+++ b/tests/feature/PermissionsTest.php
@@ -1,51 +1,43 @@
 <?php
 
-require './vendor/antecedent/patchwork/Patchwork.php';
-
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\Files\UploadedFile;
-use Myth\Auth\Entities\User;
-use Patchwork as p;
 use Tatter\Files\Models\FileModel;
 use Tatter\Permits\Models\PermitModel;
-use Tests\Support\Fakers\FileFaker;
 use Tests\Support\FeatureTestCase;
 
 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- *
  * @internal
  */
 final class PermissionsTest extends FeatureTestCase
 {
     /**
-     * A User with files and no special permissions
-     *
-     * @var User
+     * A user with files and no special permissions.
      */
-    protected $user;
+    private const USER_ID = 101;
 
     /**
-     * A User with files and global read access
-     *
-     * @var User
+     * A user with files and global read access.
      */
-    protected $super;
+    private const SUPER_ID = 102;
 
     /**
-     * A User with files and full access
-     *
-     * @var User
+     * A user with files and full access.
      */
-    protected $admin;
+    private const ADMIN_ID = 103;
 
     /**
-     * A User without files but list access
-     *
-     * @var User
+     * A user without files but list access.
+     */
+    private const PROCTOR_ID = 104;
+
+    /**
+     * @var FileModel
      */
-    protected $proctor;
+    protected $model;
+
+    protected $seeded = false;
 
     /**
      * Creates some test files and users with different permissions.
@@ -54,35 +46,70 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // Create Users with their Files
-        $this->user    = $this->createUserWithFiles();
-        $this->super   = $this->createUserWithFiles();
-        $this->admin   = $this->createUserWithFiles();
-        $this->proctor = $this->createUserWithFiles([], 0);
-
-        // Set permissions
-        model(PermitModel::class)->insertBatch([
-            [
-                'name'    => 'listFiles',
-                'user_id' => $this->user->id,
-            ],
-            [
-                'name'    => 'listFiles',
-                'user_id' => $this->proctor->id,
-            ],
-            [
-                'name'    => 'listFiles',
-                'user_id' => $this->super->id,
-            ],
-            [
-                'name'    => 'readFiles',
-                'user_id' => $this->super->id,
-            ],
-            [
-                'name'    => 'adminFiles',
-                'user_id' => $this->admin->id,
-            ],
-        ]);
+        $this->model = model(FileModel::class); // @phpstan-ignore-line
+
+        if (! $this->seeded) {
+            // Set permissions
+            model(PermitModel::class)->insertBatch([
+                [
+                    'name'    => 'listFiles',
+                    'user_id' => self::USER_ID,
+                ],
+                [
+                    'name'    => 'listFiles',
+                    'user_id' => self::PROCTOR_ID,
+                ],
+                [
+                    'name'    => 'listFiles',
+                    'user_id' => self::SUPER_ID,
+                ],
+                [
+                    'name'    => 'readFiles',
+                    'user_id' => self::SUPER_ID,
+                ],
+                [
+                    'name'    => 'adminFiles',
+                    'user_id' => self::ADMIN_ID,
+                ],
+            ]);
+
+            foreach ([self::USER_ID, self::SUPER_ID, self::ADMIN_ID, self::PROCTOR_ID] as $userId) {
+                $this->createUserFiles($userId);
+            }
+
+            $this->seeded = true;
+        }
+
+        // Make sure all files are on a single page
+        $_REQUEST['perPage'] = 200;
+    }
+
+    /**
+     * Creates random files for a user.
+     *
+     * @param int $userId User ID to own the files
+     * @param int $count  Number of files to create
+     */
+    protected function createUserFiles(int $userId, int $count = 2)
+    {
+        // Create files and assign them to the user
+        for ($i = 0; $i < abs($count); $i++) {
+            $file = fake(FileModel::class);
+
+            $this->model->addToUser($file->id, $userId);
+        }
+    }
+
+    /**
+     * Injects a permission mode into the shared FileModel.
+     *
+     * @param int $mode Octal mode
+     */
+    protected function setMode(int $mode)
+    {
+        $this->model->setMode($mode);
+
+        Factories::injectMock('models', FileModel::class, $this->model);
     }
 
     //--------------------------------------------------------------------
@@ -93,10 +120,10 @@ public function testDefaultAccessListsAllFiles()
         $result = $this->get('files');
         $result->assertStatus(200);
 
-        $files = $this->model->getForUser($this->super->id);
+        $files = $this->model->getForUser(self::SUPER_ID);
         $result->assertSee($files[0]->filename);
 
-        $files = $this->model->getForUser($this->admin->id);
+        $files = $this->model->getForUser(self::ADMIN_ID);
         $result->assertSee($files[0]->filename);
     }
 
@@ -121,7 +148,7 @@ public function testDenyAjaxReturnsError()
     public function testAuthenticatedAddOnlyEmptyFile()
     {
         $this->setMode(04664);
-        $this->login($this->admin->id);
+        service('auth')->login(self::ADMIN_ID);
 
         $result = $this->withSession()
             ->withHeaders(['X-Requested-With' => 'XMLHttpRequest'])
@@ -132,7 +159,7 @@ public function testAuthenticatedAddOnlyEmptyFile()
     public function testAuthenticatedAddOnlyWithInvalidFile()
     {
         $this->setMode(04664);
-        $this->login($this->admin->id);
+        service('auth')->login(self::ADMIN_ID);
 
         $_FILES = [
             'file' => [
@@ -150,104 +177,105 @@ public function testAuthenticatedAddOnlyWithInvalidFile()
         $result->assertSee('The file uploaded with success.(0)');
     }
 
-    public function testAuthenticatedAddOnlyWithValidFile()
-    {
-        $this->setMode(04664);
-        $this->login($this->admin->id);
-
-        $_FILES = [
-            'file' => [
-                'name'     => 'file.txt',
-                'type'     => 'text/plain',
-                'size'     => '33',
-                'tmp_name' => 'tests/_support/vfs/file.txt',
-                'error'    => 0,
-            ],
-        ];
-
-        p\redefine(UploadedFile::class . '::isValid', static function () {
-            return true;
-        });
-
-        p\redefine(File::class . '::move', static function ($args) {
-            return new File('tests/_support/vfs/file.txt');
-        });
-
-        $modelClass = get_class($this->model);
-        p\redefine($modelClass . '::createFromPath', static function ($args) {
-            return fake(FileFaker::class);
-        });
-
-        $result = $this->withSession()
-            ->withHeaders(['X-Requested-With' => 'XMLHttpRequest'])
-            ->post('files/upload');
-
-        $this->assertSame('', $result->response()->getBody());
-    }
-
+    /*
+        public function testAuthenticatedAddOnlyWithValidFile()
+        {
+            $this->setMode(04664);
+            service('auth')->login(self::ADMIN_ID);
+
+            $_FILES = [
+                'file' => [
+                    'name'     => 'file.txt',
+                    'type'     => 'text/plain',
+                    'size'     => '33',
+                    'tmp_name' => 'tests/_support/vfs/file.txt',
+                    'error'    => 0,
+                ],
+            ];
+
+            p\redefine(UploadedFile::class . '::isValid', static function () {
+                return true;
+            });
+
+            p\redefine(File::class . '::move', static function ($args) {
+                return new File('tests/_support/vfs/file.txt');
+            });
+
+            $this->modelClass = get_class($this->model);
+            p\redefine($this->modelClass . '::createFromPath', static function ($args) {
+                return fake(FileModel::class);
+            });
+
+            $result = $this->withSession()
+                ->withHeaders(['X-Requested-With' => 'XMLHttpRequest'])
+                ->post('files/upload');
+
+            $this->assertSame('', $result->response()->getBody());
+        }
+    */
     public function testProctorListsAllFiles()
     {
+        $this->createUserFiles(self::ADMIN_ID);
+
         $this->setMode(00660);
-        $this->login($this->proctor->id);
+        service('auth')->login(self::PROCTOR_ID);
 
         $result = $this->withSession()->get('files');
         $result->assertStatus(200);
 
-        $files = $this->model->getForUser($this->admin->id);
+        $files = $this->model->getForUser(self::ADMIN_ID);
         $result->assertSee($files[0]->filename);
     }
 
     public function testAuthenticatedListOwnOnly()
     {
-        /** @var FileModel $model */
-        $model = model(FileModel::class);
-
         $this->setMode(00660);
-        $this->login($this->proctor->id);
+        service('auth')->login(self::PROCTOR_ID);
 
-        $fileOwnByProctor = fake(FileFaker::class);
-        $model->addToUser($fileOwnByProctor->id, $this->proctor->id);
+        $fileOwnByProctor = fake(FileModel::class);
+        $this->model->addToUser($fileOwnByProctor->id, self::PROCTOR_ID);
 
-        $fileOwnByProctor2 = fake(FileFaker::class);
-        $model->addToUser($fileOwnByProctor2->id, $this->proctor->id);
+        $fileOwnByProctor2 = fake(FileModel::class);
+        $this->model->addToUser($fileOwnByProctor2->id, self::PROCTOR_ID);
 
-        $fileOwnByAdmin = fake(FileFaker::class);
-        $model->addToUser($fileOwnByAdmin->id, $this->admin->id);
+        $fileOwnByAdmin = fake(FileModel::class);
+        $this->model->addToUser($fileOwnByAdmin->id, self::ADMIN_ID);
 
-        $result = $this->withSession()->get('files/user/' . $this->proctor->id);
+        $result = $this->withSession()->get('files/user/' . self::PROCTOR_ID);
         $result->assertStatus(200);
 
-        $files = $this->model->getForUser($this->proctor->id);
-        $result->assertSee($fileOwnByProctor->filename);
-        $result->assertSee($fileOwnByProctor2->filename);
-        $result->assertDontSee($fileOwnByAdmin->filename);
-    }
-
-    public function provideAccess()
-    {
-        yield ['read' => 00444];
-
-        yield ['write' => 00222];
-
-        yield ['execute' => 00111];
+        $files = $this->model->getForUser(self::PROCTOR_ID);
+        $result->assertSee($files[0]->filename);
+        $result->assertSee($files[1]->filename);
 
-        yield ['read write execute' => 00777];
+        $files = $this->model->getForUser(self::ADMIN_ID);
+        $result->assertDontSee($files[0]->filename);
     }
 
     /**
-     * @dataProvider provideAccess
-     *
-     * @param mixed $mode
+     * @dataProvider accessProvider
      */
-    public function testAdminAccess($mode)
+    public function testAdminAccess(int $mode)
     {
         $this->setMode($mode);
-        $this->login($this->admin->id);
+        service('auth')->login(self::ADMIN_ID);
 
         $result = $this->withSession()->get('files');
         $result->assertStatus(200);
 
-        $files = $this->model->getForUser($this->admin->id);
+        $files = $this->model->getForUser(self::ADMIN_ID);
         $result->assertSee($files[0]->filename);
+        $files = $this->model->getForUser(self::USER_ID);
+        $result->assertSee($files[0]->filename);
+    }
+
+    public function accessProvider()
+    {
+        return [
+            ['read' => 00444],
+            ['write'              => 00222],
+            ['execute'            => 00111],
+            ['read write execute' => 00777],
+        ];
     }
 }
diff --git a/tests/feature/UserTest.php b/tests/feature/UserTest.php
index b817f2d..af913a9 100644
--- a/tests/feature/UserTest.php
+++ b/tests/feature/UserTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use Tatter\Files\Models\FileModel;
-use Tests\Support\Fakers\FileFaker;
 use Tests\Support\FeatureTestCase;
 
 /**
@@ -11,26 +10,28 @@ final class UserTest extends FeatureTestCase
 {
     public function testShowsOwnFiles()
     {
+        $file   = fake(FileModel::class);
+        $userId = 7;
+        service('auth')->login($userId);
+
         /** @var FileModel $model */
         $model = model(FileModel::class);
-        $file  = fake(FileFaker::class);
-        $user  = $this->login();
-
-        $model->addToUser($file->id, $user->id);
+        $model->addToUser($file->id, $userId);
 
-        $result = $this->get('files/user/' . $user->id);
+        $result = $this->get('files/user/' . $userId);
         $result->assertSee('Manage My Files', 'h1');
         $result->assertSee($file->filename);
     }
 
     public function testShowsOtherFiles()
     {
+        $file   = fake(FileModel::class);
+        $userId = 13;
+        service('auth')->login($userId);
+
         /** @var FileModel $model */
         $model = model(FileModel::class);
-        $file  = fake(FileFaker::class);
-        $user  = $this->login();
-
-        $model->addToUser($file->id, $user->id);
+        $model->addToUser($file->id, $userId);
 
         $result = $this->get('files/user/1000');
         $result->assertSee('Browse User Files', 'h1');
diff --git a/tests/misc/ConfigTest.php b/tests/misc/ConfigTest.php
new file mode 100644
index 0000000..64656ca
--- /dev/null
+++ b/tests/misc/ConfigTest.php
@@ -0,0 +1,36 @@
+<?php
+
+use Tatter\Files\Exceptions\FilesException;
+use Tests\Support\TestCase;
+
+/**
+ * @internal
+ */
+final class ConfigTest extends TestCase
+{
+    protected $migrate = false;
+
+    public function testThrowsWithInvalidStoragePath()
+    {
+        $path = HOMEPATH . 'README.md';
+        config('Files')->setPath($path);
+
+        $this->expectException(FilesException::class);
+        $this->expectExceptionMessage(lang('Files.dirFail', [$path]));
+
+        config('Files')->getPath();
+    }
+
+    public function testCreatesMissingStoragePath()
+    {
+        $config = config('Files');
+
+        $path = $config->getPath() . 'subdirectory/';
+        $config->setPath($path);
+
+        $config->getPath();
+
+        $this->assertDirectoryExists($path);
+        $this->assertDirectoryIsWritable($path);
+    }
+}
diff --git a/tests/misc/ControllerTest.php b/tests/misc/ControllerTest.php
new file mode 100644
index 0000000..f17bb46
--- /dev/null
+++ b/tests/misc/ControllerTest.php
@@ -0,0 +1,103 @@
+<?php
+
+use CodeIgniter\HTTP\DownloadResponse;
+use CodeIgniter\Test\ControllerTestTrait;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Tatter\Files\Controllers\Files;
+use Tatter\Files\Models\FileModel;
+use Tests\Support\TestCase;
+
+/**
+ * @internal
+ */
+final class ControllerTest extends TestCase
+{
+    use ControllerTestTrait;
+    use DatabaseTestTrait;
+
+    /**
+     * Our Controller set by the trait
+     *
+     * @var Files|null
+     */
+    protected $controller;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->controller(Files::class);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->controller = null;
+    }
+
+    public function testSetPreferencesUsesValidInput()
+    {
+        $_REQUEST = [
+            'sort'    => 'size',
+            'order'   => 'desc',
+            'format'  => 'list',
+            'perPage' => '42',
+        ];
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'setPreferences');
+        $result = $method();
+
+        $this->assertSame('size', preference('Files.sort'));
+        $this->assertSame('desc', preference('Files.order'));
+        $this->assertSame('list', preference('Files.format'));
+        $this->assertSame('42', preference('Pager.perPage'));
+    }
+
+    public function testSetPreferencesIgnoreInvalidInput()
+    {
+        $config   = config('Files');
+        $_REQUEST = [
+            'sort'    => 'potato',
+            'order'   => 'up',
+            'format'  => 'banana',
+            'perPage' => '-10',
+        ];
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'setPreferences');
+        $result = $method();
+
+        $this->assertSame($config->sort, preference('Files.sort'));
+        $this->assertSame($config->order, preference('Files.order'));
+        $this->assertSame($config->format, preference('Files.format'));
+        $this->assertSame(config('Pager')->perPage, preference('Pager.perPage'));
+    }
+
+    public function testDataUsesVarWithFaker()
+    {
+        $file = fake(FileModel::class);
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'setData');
+        $method([
+            'files' => [
+                0 => $file,
+            ],
+        ]);
+
+        $result = $this->controller->display();
+        $this->assertStringContainsString($file->filename, $result);
+    }
+
+    public function testExportCreatesRecord()
+    {
+        $file = fake(FileModel::class, [
+            'localname' => 'image.jpg',
+        ]);
+
+        $this->controller(Files::class);
+        $result = $this->execute('export', 'download', $file->id);
+
+        $this->assertInstanceOf(DownloadResponse::class, $result->response());
+        $this->seeInDatabase('exports', ['file_id' => $file->id]);
+    }
+}
diff --git a/tests/unit/EntityTest.php b/tests/misc/EntityTest.php
similarity index 60%
rename from tests/unit/EntityTest.php
rename to tests/misc/EntityTest.php
index b9bbe1c..3202d46 100644
--- a/tests/unit/EntityTest.php
+++ b/tests/misc/EntityTest.php
@@ -1,18 +1,21 @@
 <?php
 
 use Tatter\Files\Entities\File;
-use Tests\Support\FilesTestCase;
+use Tatter\Files\Models\FileModel;
+use Tests\Support\TestCase;
 
 /**
  * @internal
  */
-final class EntityTest extends FilesTestCase
+final class EntityTest extends TestCase
 {
     public function testGetPathReturnsAbsolutePath()
     {
-        $file = $this->model->createFromPath($this->testPath);
+        /** @var FileModel $model */
+        $model = model(FileModel::class);
+        $file  = $model->createFromPath($this->testPath);
 
-        $expected = $this->config->storagePath . $file->localname;
+        $expected = config('Files')->getPath() . $file->localname;
 
         $this->assertSame($expected, $file->getPath());
     }
diff --git a/tests/unit/FileObjectTest.php b/tests/misc/FileObjectTest.php
similarity index 92%
rename from tests/unit/FileObjectTest.php
rename to tests/misc/FileObjectTest.php
index e5262fe..db79109 100644
--- a/tests/unit/FileObjectTest.php
+++ b/tests/misc/FileObjectTest.php
@@ -1,12 +1,12 @@
 <?php
 
 use Tatter\Files\Structures\FileObject;
-use Tests\Support\FilesTestCase;
+use Tests\Support\TestCase;
 
 /**
  * @internal
  */
-final class FileObjectTest extends FilesTestCase
+final class FileObjectTest extends TestCase
 {
     public function testSetBasename()
     {
diff --git a/tests/unit/HelperTest.php b/tests/misc/HelperTest.php
similarity index 70%
rename from tests/unit/HelperTest.php
rename to tests/misc/HelperTest.php
index 2d94ba0..94873e4 100644
--- a/tests/unit/HelperTest.php
+++ b/tests/misc/HelperTest.php
@@ -1,17 +1,17 @@
 <?php
 
-use Tests\Support\FilesTestCase;
+use CodeIgniter\Test\CIUnitTestCase;
 
 /**
  * @internal
  */
-final class HelperTest extends FilesTestCase
+final class HelperTest extends CIUnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
 
-        helper('files');
+        helper(['files']);
     }
 
     /**
@@ -63,4 +63,22 @@ public function iniProvider()
             ['1g', 1024 * 1024 * 1024],
         ];
     }
+
+    public function testMergeFileChunks()
+    {
+        $path = merge_file_chunks(
+            SUPPORTPATH . 'chunks/0',
+            SUPPORTPATH . 'chunks/1',
+            SUPPORTPATH . 'chunks/2',
+            SUPPORTPATH . 'chunks/3'
+        );
+
+        $this->assertIsString($path);
+        $this->assertFileExists($path);
+
+        $expected = 'All your base are belong to us.';
+        $result   = file_get_contents($path);
+
+        $this->assertSame($expected, $result);
+    }
 }
diff --git a/tests/unit/ModelTest.php b/tests/misc/ModelTest.php
similarity index 70%
rename from tests/unit/ModelTest.php
rename to tests/misc/ModelTest.php
index 1873f65..2744b65 100644
--- a/tests/unit/ModelTest.php
+++ b/tests/misc/ModelTest.php
@@ -1,14 +1,26 @@
 <?php
 
 use Tatter\Files\Entities\File;
-use Tests\Support\Fakers\FileFaker;
-use Tests\Support\FilesTestCase;
+use Tatter\Files\Models\FileModel;
+use Tests\Support\TestCase;
 
 /**
  * @internal
  */
-final class ModelTest extends FilesTestCase
+final class ModelTest extends TestCase
 {
+    /**
+     * @var FileModel
+     */
+    protected $model;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->model = model(FileModel::class); // @phpstan-ignore-line
+    }
+
     public function testAddToUser()
     {
         $this->model->addToUser(7, 42);
@@ -21,8 +33,8 @@ public function testAddToUser()
 
     public function testGetForUser()
     {
-        $file1 = fake(FileFaker::class);
-        $file2 = fake(FileFaker::class);
+        $file1 = fake(FileModel::class);
+        $file2 = fake(FileModel::class);
 
         $this->model->addToUser($file1->id, 10);
         $this->model->addToUser($file2->id, 10);
@@ -37,14 +49,14 @@ public function testGetForUser()
 
     public function testGetForUserBuildsOnModelMethods()
     {
-        $file1 = fake(FileFaker::class);
-        $file2 = fake(FileFaker::class);
+        $file1 = fake(FileModel::class);
+        $file2 = fake(FileModel::class);
 
-        $this->model->addToUser($file1->id, 10);
-        $this->model->addToUser($file2->id, 10);
+        $this->model->addToUser($file1->id, 11);
+        $this->model->addToUser($file2->id, 11);
 
         $this->model->where(['filename' => $file2->filename]);
-        $result = $this->model->getForUser(10);
+        $result = $this->model->getForUser(11);
 
         $this->assertCount(1, $result);
         $this->assertSame($file2->id, $result[0]->id);
@@ -66,11 +78,12 @@ public function testCreateFromPathAddsToDatabase()
 
     public function testCreateFromPathAssignsToUser()
     {
-        $user = $this->login();
+        $userId = 3;
+        service('auth')->login($userId);
 
         $this->model->createFromPath($this->testPath);
 
-        $result = $this->model->getForUser($user->id);
+        $result = $this->model->getForUser($userId);
 
         $this->assertCount(1, $result);
     }
@@ -84,7 +97,7 @@ public function testCreateAddsThumbnail()
         $array     = $file->toRawArray();
         $this->assertSame($thumbnail, $array['thumbnail']);
 
-        $path = FileFaker::storage() . 'thumbnails' . DIRECTORY_SEPARATOR . $thumbnail;
+        $path = config('Files')->getPath() . 'thumbnails' . DIRECTORY_SEPARATOR . $thumbnail;
         $this->assertFileExists($path);
     }
 
diff --git a/tests/unit/ControllerTest.php b/tests/unit/ControllerTest.php
deleted file mode 100644
index 5549417..0000000
--- a/tests/unit/ControllerTest.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-use CodeIgniter\Config\Factories;
-use CodeIgniter\HTTP\DownloadResponse;
-use CodeIgniter\Test\ControllerTestTrait;
-use Tatter\Files\Controllers\Files;
-use Tatter\Files\Entities\File;
-use Tatter\Files\Exceptions\FilesException;
-use Tests\Support\Fakers\FileFaker;
-use Tests\Support\FilesTestCase;
-
-/**
- * @internal
- */
-final class ControllerTest extends FilesTestCase
-{
-    use ControllerTestTrait;
-
-    /**
-     * Our Controller set by the trait
-     *
-     * @var Files|null
-     */
-    protected $controller;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->controller = null;
-    }
-
-    public function testThrowsWithInvalidStoragePath()
-    {
-        $this->config->storagePath = realpath(HOMEPATH . 'README.md') ?: HOMEPATH . 'README.md';
-
-        $this->expectException(FilesException::class);
-        $this->expectExceptionMessage(lang('Files.dirFail', [$this->config->storagePath]));
-
-        $controller = new Files($this->config);
-    }
-
-    //--------------------------------------------------------------------
-
-    public function testCreatesMissingStoragePath()
-    {
-        $this->config->storagePath .= 'subdirectory/';
-
-        $controller = new Files($this->config);
-
-        $this->assertDirectoryExists($this->config->storagePath);
-        $this->assertDirectoryIsWritable($this->config->storagePath);
-    }
-
-    //--------------------------------------------------------------------
-
-    public function testGetSortUsesInput()
-    {
-        $_REQUEST['sort']              = 'size';
-        service('settings')->filesSort = 'type';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getSort');
-        $result = $method();
-
-        $this->assertSame('size', $result);
-    }
-
-    public function testGetSortUsesSettings()
-    {
-        service('settings')->filesSort = 'type';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getSort');
-        $result = $method();
-
-        $this->assertSame('type', $result);
-    }
-
-    public function testGetSortIgnoresInvalid()
-    {
-        $_REQUEST['sort']              = 'foobar';
-        service('settings')->filesSort = 'bambaz';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getSort');
-        $result = $method();
-
-        $this->assertSame('filename', $result);
-    }
-
-    //--------------------------------------------------------------------
-
-    public function testGetOrderUsesInput()
-    {
-        $_REQUEST['order']              = 'desc';
-        service('settings')->filesOrder = 'asc';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getOrder');
-        $result = $method();
-
-        $this->assertSame('desc', $result);
-    }
-
-    public function testGetOrderUsesSettings()
-    {
-        service('settings')->filesOrder = 'desc';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getOrder');
-        $result = $method();
-
-        $this->assertSame('desc', $result);
-    }
-
-    public function testGetOrderIgnoresInvalid()
-    {
-        $_REQUEST['order'] = 'foobar';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getOrder');
-        $result = $method();
-
-        $this->assertSame('asc', $result);
-    }
-
-    //--------------------------------------------------------------------
-
-    public function testGetFormatUsesInput()
-    {
-        $_REQUEST['format']              = 'select';
-        service('settings')->filesFormat = 'list';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getFormat');
-        $result = $method();
-
-        $this->assertSame('select', $result);
-    }
-
-    public function testGetFormatUsesSettings()
-    {
-        service('settings')->filesFormat = 'list';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getFormat');
-        $result = $method();
-
-        $this->assertSame('list', $result);
-    }
-
-    public function testGetFormatUsesConfig()
-    {
-        service('settings')->filesFormat = 'foobar';
-
-        $this->config->defaultFormat = 'select';
-        Factories::injectMock('config', 'Files', $this->config);
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getFormat');
-        $result = $method();
-
-        $this->assertSame('select', $result);
-    }
-
-    public function testGetFormatIgnoresInvalid()
-    {
-        $_REQUEST['format'] = 'foobar';
-
-        $this->controller(Files::class);
-
-        $method = $this->getPrivateMethodInvoker($this->controller, 'getFormat');
-        $result = $method();
-
-        $this->assertSame('cards', $result);
-    }
-
-    public function testDataUsesVarWithFaker()
-    {
-        $file = fake(FileFaker::class);
-
-        $controller = new Files();
-        $controller->initController(service('request'), service('response'), service('logger'));
-
-        $method = $this->getPrivateMethodInvoker($controller, 'setData');
-        $method([
-            'files' => [
-                0 => $file,
-            ],
-        ]);
-
-        $result = $controller->display();
-        $this->assertStringContainsString($file->filename, $result);
-    }
-
-    public function testDataUsesVarViaPassEntity()
-    {
-        $controller = new Files();
-        $controller->initController(service('request'), service('response'), service('logger'));
-
-        $file             = new File();
-        $file->filename   = 'foo.txt';
-        $file->thumbnail  = '';
-        $file->type       = '';
-        $file->localname  = '';
-        $file->clientname = '';
-        $file->size       = 1;
-        $file->created_at = new class() {
-            public function humanize()
-            {
-                return '';
-            }
-        };
-
-        $method = $this->getPrivateMethodInvoker($controller, 'setData');
-        $method([
-            'files' => [
-                0 => $file,
-            ],
-        ]);
-
-        $result = $controller->display();
-        $this->assertStringContainsString($file->filename, $result);
-    }
-
-    //--------------------------------------------------------------------
-
-    public function testExportCreatesRecord()
-    {
-        $file = fake(FileFaker::class, [
-            'localname' => 'image.jpg',
-        ]);
-
-        $this->controller(Files::class);
-        $result = $this->execute('export', 'download', $file->id);
-
-        $this->assertInstanceOf(DownloadResponse::class, $result->response());
-        $this->seeInDatabase('exports', ['file_id' => $file->id]);
-    }
-}
diff --git a/tests/unit/SeederTest.php b/tests/unit/SeederTest.php
deleted file mode 100644
index b8a2408..0000000
--- a/tests/unit/SeederTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-use Tests\Support\FilesTestCase;
-
-/**
- * @internal
- */
-final class SeederTest extends FilesTestCase
-{
-    /**
-     * Note that the seeder has already been run during setUp()
-     *
-     * @dataProvider seederProvider
-     *
-     * @param mixed $key
-     * @param mixed $default
-     */
-    public function testSeederCreatesSettings($key, $default)
-    {
-        $result = service('settings')->{$key};
-
-        $this->assertSame($default, $result);
-    }
-
-    public function seederProvider()
-    {
-        return [
-            ['filesFormat', 'cards'],
-            ['filesSort', 'filename'],
-            ['filesOrder', 'asc'],
-        ];
-    }
-}