diff --git a/lib/music_library/artists.ex b/lib/music_library/artists.ex
index 4b9702ac..d78c23c9 100644
--- a/lib/music_library/artists.ex
+++ b/lib/music_library/artists.ex
@@ -2,7 +2,8 @@ defmodule MusicLibrary.Artists do
   import Ecto.Query, warn: false
   alias MusicLibrary.Repo
 
-  alias MusicLibrary.Records.{ArtistInfo, ArtistRecord, Record}
+  alias MusicLibrary.Artists.ArtistInfo
+  alias MusicLibrary.Records.{ArtistRecord, Record}
   alias MusicLibrary.{BackgroundRepo, Worker}
 
   def get_artist!(musicbrainz_id) do
diff --git a/lib/music_library/records/artist.ex b/lib/music_library/artists/artist.ex
similarity index 91%
rename from lib/music_library/records/artist.ex
rename to lib/music_library/artists/artist.ex
index 72910b52..68b2bf64 100644
--- a/lib/music_library/records/artist.ex
+++ b/lib/music_library/artists/artist.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibrary.Records.Artist do
+defmodule MusicLibrary.Artists.Artist do
   use Ecto.Schema
 
   import Ecto.Changeset
diff --git a/lib/music_library/records/artist_info.ex b/lib/music_library/artists/artist_info.ex
similarity index 97%
rename from lib/music_library/records/artist_info.ex
rename to lib/music_library/artists/artist_info.ex
index dc3eb069..33f71bee 100644
--- a/lib/music_library/records/artist_info.ex
+++ b/lib/music_library/artists/artist_info.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibrary.Records.ArtistInfo do
+defmodule MusicLibrary.Artists.ArtistInfo do
   use Ecto.Schema
   import Ecto.Changeset
 
diff --git a/lib/music_library/records/artist_records.ex b/lib/music_library/records/artist_records.ex
index 9e7d52df..94e7d8b0 100644
--- a/lib/music_library/records/artist_records.ex
+++ b/lib/music_library/records/artist_records.ex
@@ -4,7 +4,7 @@ defmodule MusicLibrary.Records.ArtistRecord do
   """
   use Ecto.Schema
 
-  alias MusicLibrary.Records.Artist
+  alias MusicLibrary.Artists.Artist
 
   @primary_key false
   schema "artist_records" do
diff --git a/lib/music_library/records/record.ex b/lib/music_library/records/record.ex
index 73fb4702..960bb36a 100644
--- a/lib/music_library/records/record.ex
+++ b/lib/music_library/records/record.ex
@@ -3,7 +3,8 @@ defmodule MusicLibrary.Records.Record do
   import Ecto.Changeset
 
   alias MusicBrainz.{Release, ReleaseGroup}
-  alias MusicLibrary.Records.{Artist, Cover}
+  alias MusicLibrary.Artists.Artist
+  alias MusicLibrary.Records.Cover
 
   @formats [:cd, :backup, :vinyl, :blu_ray, :dvd, :multi]
   @types [:album, :ep, :live, :compilation, :single, :other]
diff --git a/lib/music_library/records/search_index.ex b/lib/music_library/records/search_index.ex
index e14cebd3..857add93 100644
--- a/lib/music_library/records/search_index.ex
+++ b/lib/music_library/records/search_index.ex
@@ -11,7 +11,8 @@ defmodule MusicLibrary.Records.SearchIndex do
   """
   use Ecto.Schema
 
-  alias MusicLibrary.Records.{Artist, Record}
+  alias MusicLibrary.Artists.Artist
+  alias MusicLibrary.Records.Record
 
   @primary_key {:id, :binary_id, autogenerate: false}
   schema "records_search_index" do
diff --git a/lib/music_library_web/live/artist_live/show.ex b/lib/music_library_web/live/artist_live/show.ex
index 95925c2c..29f50e3d 100644
--- a/lib/music_library_web/live/artist_live/show.ex
+++ b/lib/music_library_web/live/artist_live/show.ex
@@ -1,8 +1,8 @@
 defmodule MusicLibraryWeb.ArtistLive.Show do
   use MusicLibraryWeb, :live_view
 
+  alias MusicLibrary.Artists.ArtistInfo
   alias MusicLibrary.{Artists, Records}
-  alias MusicLibrary.Records.ArtistInfo
 
   import MusicLibraryWeb.RecordComponents,
     only: [record_grid: 1, toggle_actions_menu: 1, close_actions_menu: 1, country_label: 1]
diff --git a/test/music_library_web/live/collection_live/index_test.exs b/test/music_library_web/live/collection_live/index_test.exs
index 4b176aa4..bd0d638a 100644
--- a/test/music_library_web/live/collection_live/index_test.exs
+++ b/test/music_library_web/live/collection_live/index_test.exs
@@ -315,7 +315,7 @@ defmodule MusicLibraryWeb.CollectionLive.IndexTest do
 
       [marillion] = record.artists
 
-      assert %MusicLibrary.Records.Artist{
+      assert %MusicLibrary.Artists.Artist{
                name: "Marillion",
                sort_name: "Marillion",
                disambiguation: "British progressive rock band",
@@ -420,7 +420,7 @@ defmodule MusicLibraryWeb.CollectionLive.IndexTest do
 
     [marillion] = record.artists
 
-    assert %MusicLibrary.Records.Artist{
+    assert %MusicLibrary.Artists.Artist{
              name: "Marillion",
              sort_name: "Marillion",
              disambiguation: "British progressive rock band",