diff --git a/app/Console/Commands/ParseCachedWebMentions.php b/app/Console/Commands/ParseCachedWebMentions.php
index caf244cd..960a1b9f 100644
--- a/app/Console/Commands/ParseCachedWebMentions.php
+++ b/app/Console/Commands/ParseCachedWebMentions.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\WebMention;
+use App\Models\WebMention;
 use Illuminate\Console\Command;
 use Illuminate\FileSystem\FileSystem;
 
diff --git a/app/Console/Commands/ReDownloadWebMentions.php b/app/Console/Commands/ReDownloadWebMentions.php
index da686229..6728284a 100644
--- a/app/Console/Commands/ReDownloadWebMentions.php
+++ b/app/Console/Commands/ReDownloadWebMentions.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\WebMention;
+use App\Models\WebMention;
 use Illuminate\Console\Command;
 use App\Jobs\DownloadWebMention;
 
diff --git a/app/Http/Controllers/Admin/ArticlesController.php b/app/Http/Controllers/Admin/ArticlesController.php
index 56d4b86c..1db84696 100644
--- a/app/Http/Controllers/Admin/ArticlesController.php
+++ b/app/Http/Controllers/Admin/ArticlesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Article;
+use App\Models\Article;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
diff --git a/app/Http/Controllers/Admin/ClientsController.php b/app/Http/Controllers/Admin/ClientsController.php
index 34994e78..366e0994 100644
--- a/app/Http/Controllers/Admin/ClientsController.php
+++ b/app/Http/Controllers/Admin/ClientsController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\MicropubClient;
 use Illuminate\Http\Request;
+use App\Models\MicropubClient;
 use App\Http\Controllers\Controller;
 
 class ClientsController extends Controller
diff --git a/app/Http/Controllers/Admin/ContactsController.php b/app/Http/Controllers/Admin/ContactsController.php
index 6e6b6927..82ec7e88 100644
--- a/app/Http/Controllers/Admin/ContactsController.php
+++ b/app/Http/Controllers/Admin/ContactsController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Contact;
 use GuzzleHttp\Client;
+use App\Models\Contact;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Filesystem\Filesystem;
diff --git a/app/Http/Controllers/Admin/NotesController.php b/app/Http/Controllers/Admin/NotesController.php
index 951e0841..44b4a30f 100644
--- a/app/Http/Controllers/Admin/NotesController.php
+++ b/app/Http/Controllers/Admin/NotesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use App\Jobs\SendWebMentions;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php
index f08b0c49..4bf54f4a 100644
--- a/app/Http/Controllers/Admin/PlacesController.php
+++ b/app/Http/Controllers/Admin/PlacesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Place;
+use App\Models\Place;
 use Illuminate\Http\Request;
 use App\Services\PlaceService;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/ArticlesController.php b/app/Http/Controllers/ArticlesController.php
index 127f7e3b..a778c5bc 100644
--- a/app/Http/Controllers/ArticlesController.php
+++ b/app/Http/Controllers/ArticlesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Article;
+use App\Models\Article;
 use Jonnybarnes\IndieWeb\Numbers;
 
 class ArticlesController extends Controller
diff --git a/app/Http/Controllers/BookmarksController.php b/app/Http/Controllers/BookmarksController.php
index d2d66888..a19bdeb6 100644
--- a/app/Http/Controllers/BookmarksController.php
+++ b/app/Http/Controllers/BookmarksController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Bookmark;
+use App\Models\Bookmark;
 
 class BookmarksController extends Controller
 {
diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index 6d07234f..c85e12a4 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Contact;
+use App\Models\Contact;
 use Illuminate\Filesystem\Filesystem;
 
 class ContactsController extends Controller
diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php
index 574ead24..2d6da628 100644
--- a/app/Http/Controllers/FeedsController.php
+++ b/app/Http/Controllers/FeedsController.php
@@ -2,8 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
-use App\Article;
+use App\Models\{Article, Note};
 
 class FeedsController extends Controller
 {
diff --git a/app/Http/Controllers/LikesController.php b/app/Http/Controllers/LikesController.php
index 02922e86..ea9e503b 100644
--- a/app/Http/Controllers/LikesController.php
+++ b/app/Http/Controllers/LikesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Like;
+use App\Models\Like;
 
 class LikesController extends Controller
 {
diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index c9572f14..a817526f 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -8,11 +8,11 @@ use App\Jobs\ProcessMedia;
 use App\Services\TokenService;
 use Illuminate\Http\UploadedFile;
 use Monolog\Handler\StreamHandler;
-use App\{Like, Media, Note, Place};
 use Intervention\Image\ImageManager;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Http\{Request, Response};
 use App\Exceptions\InvalidTokenException;
+use App\Models\{Like, Media, Note, Place};
 use Phaza\LaravelPostgis\Geometries\Point;
 use Intervention\Image\Exception\NotReadableException;
 use App\Services\Micropub\{HCardService, HEntryService, UpdateService};
diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php
index 9801c8ea..06ab3eb8 100644
--- a/app/Http/Controllers/NotesController.php
+++ b/app/Http/Controllers/NotesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use Jonnybarnes\IndieWeb\Numbers;
 use App\Services\ActivityStreamsService;
diff --git a/app/Http/Controllers/PlacesController.php b/app/Http/Controllers/PlacesController.php
index ba8d5b42..37ee61f7 100644
--- a/app/Http/Controllers/PlacesController.php
+++ b/app/Http/Controllers/PlacesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Place;
+use App\Models\Place;
 
 class PlacesController extends Controller
 {
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 92b7e767..6ef9af6c 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 
 class SearchController extends Controller
diff --git a/app/Http/Controllers/WebMentionsController.php b/app/Http/Controllers/WebMentionsController.php
index 281794eb..b9110f56 100644
--- a/app/Http/Controllers/WebMentionsController.php
+++ b/app/Http/Controllers/WebMentionsController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Jobs\ProcessWebMention;
diff --git a/app/Jobs/AddClientToDatabase.php b/app/Jobs/AddClientToDatabase.php
index 970f4c07..89e2cae5 100644
--- a/app/Jobs/AddClientToDatabase.php
+++ b/app/Jobs/AddClientToDatabase.php
@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\MicropubClient;
 use Illuminate\Bus\Queueable;
+use App\Models\MicropubClient;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/ProcessBookmark.php b/app/Jobs/ProcessBookmark.php
index 348564c0..14e4ac4c 100644
--- a/app/Jobs/ProcessBookmark.php
+++ b/app/Jobs/ProcessBookmark.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Bookmark;
+use App\Models\Bookmark;
 use Illuminate\Bus\Queueable;
 use App\Services\BookmarkService;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Jobs/ProcessLike.php b/app/Jobs/ProcessLike.php
index ef9f67c2..22a4eece 100644
--- a/app/Jobs/ProcessLike.php
+++ b/app/Jobs/ProcessLike.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Like;
+use App\Models\Like;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Jobs/ProcessWebMention.php b/app/Jobs/ProcessWebMention.php
index 392f36b0..61e13036 100644
--- a/app/Jobs/ProcessWebMention.php
+++ b/app/Jobs/ProcessWebMention.php
@@ -4,8 +4,8 @@ namespace App\Jobs;
 
 use Mf2;
 use GuzzleHttp\Client;
-use App\{Note, WebMention};
 use Illuminate\Bus\Queueable;
+use App\Models\{Note, WebMention};
 use Jonnybarnes\WebmentionsParser\Parser;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/SendWebMentions.php b/app/Jobs/SendWebMentions.php
index dd9d9a45..0635e117 100644
--- a/app/Jobs/SendWebMentions.php
+++ b/app/Jobs/SendWebMentions.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Note;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Jobs/SyndicateBookmarkToFacebook.php b/app/Jobs/SyndicateBookmarkToFacebook.php
index 3e09e432..dc555f8a 100644
--- a/app/Jobs/SyndicateBookmarkToFacebook.php
+++ b/app/Jobs/SyndicateBookmarkToFacebook.php
@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\Bookmark;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
diff --git a/app/Jobs/SyndicateBookmarkToTwitter.php b/app/Jobs/SyndicateBookmarkToTwitter.php
index e048186a..9bcebda2 100644
--- a/app/Jobs/SyndicateBookmarkToTwitter.php
+++ b/app/Jobs/SyndicateBookmarkToTwitter.php
@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\Bookmark;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
diff --git a/app/Jobs/SyndicateNoteToFacebook.php b/app/Jobs/SyndicateNoteToFacebook.php
index 34a2e3a2..82f1b555 100644
--- a/app/Jobs/SyndicateNoteToFacebook.php
+++ b/app/Jobs/SyndicateNoteToFacebook.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Note;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Jobs/SyndicateNoteToTwitter.php b/app/Jobs/SyndicateNoteToTwitter.php
index 97fa4cb5..611dd590 100644
--- a/app/Jobs/SyndicateNoteToTwitter.php
+++ b/app/Jobs/SyndicateNoteToTwitter.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Note;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Article.php b/app/Models/Article.php
similarity index 99%
rename from app/Article.php
rename to app/Models/Article.php
index 7a1d4c71..e68994ae 100644
--- a/app/Article.php
+++ b/app/Models/Article.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Cviebrock\EloquentSluggable\Sluggable;
diff --git a/app/Bookmark.php b/app/Models/Bookmark.php
similarity index 89%
rename from app/Bookmark.php
rename to app/Models/Bookmark.php
index d2446c7a..9b9ab747 100644
--- a/app/Bookmark.php
+++ b/app/Models/Bookmark.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -27,7 +27,7 @@ class Bookmark extends Model
      */
     public function tags()
     {
-        return $this->belongsToMany('App\Tag');
+        return $this->belongsToMany('App\Models\Tag');
     }
 
     /**
diff --git a/app/Contact.php b/app/Models/Contact.php
similarity index 94%
rename from app/Contact.php
rename to app/Models/Contact.php
index 7f31ad52..b77decc7 100644
--- a/app/Contact.php
+++ b/app/Models/Contact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Like.php b/app/Models/Like.php
similarity index 97%
rename from app/Like.php
rename to app/Models/Like.php
index 4fe353a9..54afba03 100644
--- a/app/Like.php
+++ b/app/Models/Like.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Mf2;
 use HTMLPurifier;
diff --git a/app/Media.php b/app/Models/Media.php
similarity index 96%
rename from app/Media.php
rename to app/Models/Media.php
index 83f8af4d..232d3132 100644
--- a/app/Media.php
+++ b/app/Models/Media.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -25,7 +25,7 @@ class Media extends Model
      */
     public function note()
     {
-        return $this->belongsTo('App\Note');
+        return $this->belongsTo('App\Models\Note');
     }
 
     /**
diff --git a/app/MicropubClient.php b/app/Models/MicropubClient.php
similarity index 82%
rename from app/MicropubClient.php
rename to app/Models/MicropubClient.php
index 449f0b29..d769b193 100644
--- a/app/MicropubClient.php
+++ b/app/Models/MicropubClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -27,6 +27,6 @@ class MicropubClient extends Model
      */
     public function notes()
     {
-        return $this->hasMany('App\Note', 'client_id', 'client_url');
+        return $this->hasMany('App\Models\Note', 'client_id', 'client_url');
     }
 }
diff --git a/app/Note.php b/app/Models/Note.php
similarity index 97%
rename from app/Note.php
rename to app/Models/Note.php
index ed9eda1a..256ed639 100644
--- a/app/Note.php
+++ b/app/Models/Note.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Cache;
 use Twitter;
@@ -69,7 +69,7 @@ class Note extends Model
      */
     public function tags()
     {
-        return $this->belongsToMany('App\Tag');
+        return $this->belongsToMany('App\Models\Tag');
     }
 
     /**
@@ -79,7 +79,7 @@ class Note extends Model
      */
     public function client()
     {
-        return $this->belongsTo('App\MicropubClient', 'client_id', 'client_url');
+        return $this->belongsTo('App\Models\MicropubClient', 'client_id', 'client_url');
     }
 
     /**
@@ -89,7 +89,7 @@ class Note extends Model
      */
     public function webmentions()
     {
-        return $this->morphMany('App\WebMention', 'commentable');
+        return $this->morphMany('App\Models\WebMention', 'commentable');
     }
 
     /**
@@ -99,7 +99,7 @@ class Note extends Model
      */
     public function place()
     {
-        return $this->belongsTo('App\Place');
+        return $this->belongsTo('App\Models\Place');
     }
 
     /**
@@ -109,7 +109,7 @@ class Note extends Model
      */
     public function media()
     {
-        return $this->hasMany('App\Media');
+        return $this->hasMany('App\Models\Media');
     }
 
     /**
diff --git a/app/Place.php b/app/Models/Place.php
similarity index 98%
rename from app/Place.php
rename to app/Models/Place.php
index 7937443b..1f09faea 100644
--- a/app/Place.php
+++ b/app/Models/Place.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
@@ -53,7 +53,7 @@ class Place extends Model
      */
     public function notes()
     {
-        return $this->hasMany('App\Note');
+        return $this->hasMany('App\Models\Note');
     }
 
     /**
diff --git a/app/Tag.php b/app/Models/Tag.php
similarity index 89%
rename from app/Tag.php
rename to app/Models/Tag.php
index 2168ed04..89e08ee5 100644
--- a/app/Tag.php
+++ b/app/Models/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -20,7 +20,7 @@ class Tag extends Model
      */
     public function notes()
     {
-        return $this->belongsToMany('App\Note');
+        return $this->belongsToMany('App\Models\Note');
     }
 
     /**
@@ -28,7 +28,7 @@ class Tag extends Model
      */
     public function bookmarks()
     {
-        return $this->belongsToMany('App\Bookmark');
+        return $this->belongsToMany('App\Models\Bookmark');
     }
 
     /**
diff --git a/app/User.php b/app/Models/User.php
similarity index 95%
rename from app/User.php
rename to app/Models/User.php
index bfd96a6a..6bd0f157 100644
--- a/app/User.php
+++ b/app/Models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
diff --git a/app/WebMention.php b/app/Models/WebMention.php
similarity index 99%
rename from app/WebMention.php
rename to app/Models/WebMention.php
index ca05bd73..8cbe6514 100644
--- a/app/WebMention.php
+++ b/app/Models/WebMention.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Cache;
 use Twitter;
diff --git a/app/Observers/NoteObserver.php b/app/Observers/NoteObserver.php
index 7bc061e0..945a02c9 100644
--- a/app/Observers/NoteObserver.php
+++ b/app/Observers/NoteObserver.php
@@ -2,7 +2,7 @@
 
 namespace App\Observers;
 
-use App\{Note, Tag};
+use App\Models\{Note, Tag};
 
 class NoteObserver
 {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 2fe35bbd..2e398e62 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace App\Providers;
 
-use App\Note;
+use App\Models\Note;
 use Illuminate\Http\Request;
 use App\Observers\NoteObserver;
 use Laravel\Dusk\DuskServiceProvider;
diff --git a/app/Services/ActivityStreamsService.php b/app/Services/ActivityStreamsService.php
index e3d88aae..04923d62 100644
--- a/app/Services/ActivityStreamsService.php
+++ b/app/Services/ActivityStreamsService.php
@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use App\Note;
+use App\Models\Note;
 
 class ActivityStreamsService
 {
diff --git a/app/Services/BookmarkService.php b/app/Services/BookmarkService.php
index 51e90a0f..b1dcaf50 100644
--- a/app/Services/BookmarkService.php
+++ b/app/Services/BookmarkService.php
@@ -4,12 +4,11 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Tag;
-use App\Bookmark;
 use Ramsey\Uuid\Uuid;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use App\Jobs\ProcessBookmark;
+use App\Models\{Bookmark, Tag};
 use Spatie\Browsershot\Browsershot;
 use App\Jobs\SyndicateBookmarkToTwitter;
 use App\Jobs\SyndicateBookmarkToFacebook;
diff --git a/app/Services/LikeService.php b/app/Services/LikeService.php
index de829f7c..fd43a37f 100644
--- a/app/Services/LikeService.php
+++ b/app/Services/LikeService.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Like;
+use App\Models\Like;
 use App\Jobs\ProcessLike;
 
 class LikeService
diff --git a/app/Services/Micropub/UpdateService.php b/app/Services/Micropub/UpdateService.php
index 77adbef2..45756584 100644
--- a/app/Services/Micropub/UpdateService.php
+++ b/app/Services/Micropub/UpdateService.php
@@ -2,8 +2,7 @@
 
 namespace App\Services\Micropub;
 
-use App\Note;
-use App\Media;
+use App\Models\{Media, Note};
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class UpdateService
diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php
index 6e529245..d4c95034 100644
--- a/app/Services/NoteService.php
+++ b/app/Services/NoteService.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\{Media, Note, Place};
+use App\Models\{Media, Note, Place};
 use App\Jobs\{SendWebMentions, SyndicateNoteToFacebook, SyndicateNoteToTwitter};
 
 class NoteService
diff --git a/app/Services/PlaceService.php b/app/Services/PlaceService.php
index ddce5cd6..f8a15de8 100644
--- a/app/Services/PlaceService.php
+++ b/app/Services/PlaceService.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Place;
+use App\Models\Place;
 use Phaza\LaravelPostgis\Geometries\Point;
 
 class PlaceService
diff --git a/tests/Feature/ActivityStreamTest.php b/tests/Feature/ActivityStreamTest.php
index 41ae1a75..be97dcb2 100644
--- a/tests/Feature/ActivityStreamTest.php
+++ b/tests/Feature/ActivityStreamTest.php
@@ -31,7 +31,7 @@ class ActivityStreamTest extends TestCase
      */
     public function test_single_note_returns_as_data()
     {
-        $note = \App\Note::find(11);
+        $note = \App\Models\Note::find(11);
         $response = $this->get('/notes/B', ['Accept' => 'application/activity+json']);
         $response->assertHeader('Content-Type', 'application/activity+json');
         $response->assertJson([
diff --git a/tests/Feature/Admin/ContactsTest.php b/tests/Feature/Admin/ContactsTest.php
index 8218309f..2921bc26 100644
--- a/tests/Feature/Admin/ContactsTest.php
+++ b/tests/Feature/Admin/ContactsTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Admin;
 
-use App\Contact;
 use Tests\TestCase;
 use GuzzleHttp\Client;
+use App\Models\Contact;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Http\UploadedFile;
diff --git a/tests/Feature/LikesTest.php b/tests/Feature/LikesTest.php
index 874b3b5d..ecc4fccf 100644
--- a/tests/Feature/LikesTest.php
+++ b/tests/Feature/LikesTest.php
@@ -3,8 +3,8 @@
 namespace Tests\Feature;
 
 use Queue;
-use App\Like;
 use Tests\TestCase;
+use App\Models\Like;
 use Tests\TestToken;
 use GuzzleHttp\Client;
 use App\Jobs\ProcessLike;
diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php
index d4e5f978..764410ed 100644
--- a/tests/Feature/MicropubControllerTest.php
+++ b/tests/Feature/MicropubControllerTest.php
@@ -2,14 +2,13 @@
 
 namespace Tests\Feature;
 
-use App\Media;
-use App\Place;
 use Carbon\Carbon;
 use Tests\TestCase;
 use Tests\TestToken;
 use Lcobucci\JWT\Builder;
 use App\Jobs\ProcessMedia;
 use App\Jobs\SendWebMentions;
+use App\Models\{Media, Place};
 use Illuminate\Http\UploadedFile;
 use App\Jobs\SyndicateNoteToTwitter;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
diff --git a/tests/Feature/NotesControllerTest.php b/tests/Feature/NotesControllerTest.php
index 7715c23a..38585638 100644
--- a/tests/Feature/NotesControllerTest.php
+++ b/tests/Feature/NotesControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 
 class NotesControllerTest extends TestCase
 {
diff --git a/tests/Feature/ParseCachedWebMentionsTest.php b/tests/Feature/ParseCachedWebMentionsTest.php
index 81c2d45d..0081dcfa 100644
--- a/tests/Feature/ParseCachedWebMentionsTest.php
+++ b/tests/Feature/ParseCachedWebMentionsTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\WebMention;
 use Tests\TestCase;
+use App\Models\WebMention;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
diff --git a/tests/Feature/PlacesTest.php b/tests/Feature/PlacesTest.php
index 87bc4d1e..64b34fd5 100644
--- a/tests/Feature/PlacesTest.php
+++ b/tests/Feature/PlacesTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Feature;
 
 use Tests\TestCase;
+use App\Models\Place;
 
 class PlacesTest extends TestCase
 {
@@ -24,7 +25,7 @@ class PlacesTest extends TestCase
      */
     public function test_single_place()
     {
-        $place = \App\Place::where('slug', 'the-bridgewater-pub')->first();
+        $place = Place::where('slug', 'the-bridgewater-pub')->first();
         $response = $this->get('/places/the-bridgewater-pub');
         $response->assertViewHas('place', $place);
     }
diff --git a/tests/Unit/ArticlesTest.php b/tests/Unit/ArticlesTest.php
index c4b1f364..3b896efe 100644
--- a/tests/Unit/ArticlesTest.php
+++ b/tests/Unit/ArticlesTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Article;
 use Tests\TestCase;
+use App\Models\Article;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ArticlesTest extends TestCase
diff --git a/tests/Unit/Jobs/ProcessBookmarkJobTest.php b/tests/Unit/Jobs/ProcessBookmarkJobTest.php
index df309a21..99204c9e 100644
--- a/tests/Unit/Jobs/ProcessBookmarkJobTest.php
+++ b/tests/Unit/Jobs/ProcessBookmarkJobTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Bookmark;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use GuzzleHttp\HandlerStack;
 use App\Jobs\ProcessBookmark;
 use GuzzleHttp\Psr7\Response;
diff --git a/tests/Unit/Jobs/ProcessWebMentionJobTest.php b/tests/Unit/Jobs/ProcessWebMentionJobTest.php
index a45c844a..f271cfc3 100644
--- a/tests/Unit/Jobs/ProcessWebMentionJobTest.php
+++ b/tests/Unit/Jobs/ProcessWebMentionJobTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
diff --git a/tests/Unit/Jobs/SendWebMentionJobTest.php b/tests/Unit/Jobs/SendWebMentionJobTest.php
index f83c87a3..42e46de0 100644
--- a/tests/Unit/Jobs/SendWebMentionJobTest.php
+++ b/tests/Unit/Jobs/SendWebMentionJobTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use App\Jobs\SendWebMentions;
diff --git a/tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php b/tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php
index 4e0795cb..682af20d 100644
--- a/tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php
+++ b/tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Bookmark;
 use Tests\TestCase;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Handler\MockHandler;
diff --git a/tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php b/tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php
index 6e81fbea..005a1d1b 100644
--- a/tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php
+++ b/tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Bookmark;
 use Tests\TestCase;
 use GuzzleHttp\Client;
+use App\Models\Bookmark;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Handler\MockHandler;
diff --git a/tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php b/tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php
index b9acb4f4..80c7801d 100644
--- a/tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php
+++ b/tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
diff --git a/tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php b/tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php
index 3381be9d..039384f2 100644
--- a/tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php
+++ b/tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Jobs;
 
-use App\Note;
 use Tests\TestCase;
+use App\Models\Note;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
diff --git a/tests/Unit/LikesTest.php b/tests/Unit/LikesTest.php
index 06ed09d4..75294244 100644
--- a/tests/Unit/LikesTest.php
+++ b/tests/Unit/LikesTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Like;
 use Tests\TestCase;
+use App\Models\Like;
 
 class LikesTest extends TestCase
 {
diff --git a/tests/Unit/MediaTest.php b/tests/Unit/MediaTest.php
index 06cf7c72..6adc3b88 100644
--- a/tests/Unit/MediaTest.php
+++ b/tests/Unit/MediaTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Media;
 use Tests\TestCase;
+use App\Models\Media;
 
 class MediaTest extends TestCase
 {
@@ -11,6 +11,6 @@ class MediaTest extends TestCase
     {
         $media = Media::find(1);
         $note = $media->note;
-        $this->assertInstanceOf('App\Note', $note);
+        $this->assertInstanceOf('App\Models\Note', $note);
     }
 }
diff --git a/tests/Unit/MicropbClientsTest.php b/tests/Unit/MicropbClientsTest.php
index bd851c8f..22f826bb 100644
--- a/tests/Unit/MicropbClientsTest.php
+++ b/tests/Unit/MicropbClientsTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit;
 
 use Tests\TestCase;
-use App\MicropubClient;
+use App\Models\MicropubClient;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php
index 5e1f2fc7..b8f584b2 100644
--- a/tests/Unit/NotesTest.php
+++ b/tests/Unit/NotesTest.php
@@ -2,9 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Tag;
-use App\Note;
 use Tests\TestCase;
+use App\Models\{Note, Tag};
 use Thujohn\Twitter\Facades\Twitter;
 
 class NotesTest extends TestCase
diff --git a/tests/Unit/PlacesTest.php b/tests/Unit/PlacesTest.php
index e7e3f4a3..45c33b2a 100644
--- a/tests/Unit/PlacesTest.php
+++ b/tests/Unit/PlacesTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\Place;
 use Tests\TestCase;
+use App\Models\Place;
 use App\Services\PlaceService;
 use Phaza\LaravelPostgis\Geometries\Point;
 use Illuminate\Database\Eloquent\Collection;
@@ -62,7 +62,7 @@ class PlacesTest extends TestCase
                 'url' => ['https://www.openstreetmap.org/way/1234'],
             ]
         ]);
-        $this->assertInstanceOf('App\Place', $ret); // a place was returned
+        $this->assertInstanceOf('App\Models\Place', $ret); // a place was returned
         $this->assertEquals(2, count(Place::all())); // still 2 places
     }
 
diff --git a/tests/Unit/TagsTest.php b/tests/Unit/TagsTest.php
index 3c8b77c0..79e2e1e5 100644
--- a/tests/Unit/TagsTest.php
+++ b/tests/Unit/TagsTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit;
 
-use App\Tag;
+use App\Models\Tag;
 use Tests\TestCase;
 
 class TagsTest extends TestCase
diff --git a/tests/Unit/WebMentionTest.php b/tests/Unit/WebMentionTest.php
index 86d5f384..ed7db628 100644
--- a/tests/Unit/WebMentionTest.php
+++ b/tests/Unit/WebMentionTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use App\WebMention;
 use Tests\TestCase;
+use App\Models\WebMention;
 use Thujohn\Twitter\Facades\Twitter;
 use Illuminate\Support\Facades\Cache;
 
@@ -12,7 +12,7 @@ class WebMentionTest extends TestCase
     public function test_commentable_method()
     {
         $webmention = WebMention::find(1);
-        $this->assertInstanceOf('App\Note', $webmention->commentable);
+        $this->assertInstanceOf('App\Models\Note', $webmention->commentable);
     }
     public function test_published_attribute_when_no_relavent_mf2()
     {