diff --git a/lib/music_library/records/music_brainz/api_behaviour.ex b/lib/music_brainz/api_behaviour.ex
similarity index 84%
rename from lib/music_library/records/music_brainz/api_behaviour.ex
rename to lib/music_brainz/api_behaviour.ex
index 1222a57a..117b622c 100644
--- a/lib/music_library/records/music_brainz/api_behaviour.ex
+++ b/lib/music_brainz/api_behaviour.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibrary.Records.MusicBrainz.APIBehaviour do
+defmodule MusicBrainz.APIBehaviour do
   @type musicbrainz_id :: String.t()
 
   @callback get_release_group(musicbrainz_id) :: {:ok, map()} | {:error, String.t()}
diff --git a/lib/music_library/records/music_brainz/api_impl.ex b/lib/music_brainz/api_impl.ex
similarity index 98%
rename from lib/music_library/records/music_brainz/api_impl.ex
rename to lib/music_brainz/api_impl.ex
index 76807cb5..39c75210 100644
--- a/lib/music_library/records/music_brainz/api_impl.ex
+++ b/lib/music_brainz/api_impl.ex
@@ -1,4 +1,4 @@
-defmodule MusicLibrary.Records.MusicBrainz.APIImpl do
+defmodule MusicBrainz.APIImpl do
   @moduledoc """
   The original data from Obsidian maps records to MusicBrainz release groups, so we can leverage the MusicBrainz API to:
 
@@ -6,7 +6,7 @@ defmodule MusicLibrary.Records.MusicBrainz.APIImpl do
   - Extend the metadata associated with existing records
   """
 
-  @behaviour MusicLibrary.Records.MusicBrainz.APIBehaviour
+  @behaviour MusicBrainz.APIBehaviour
 
   require Logger
 
diff --git a/lib/music_library/records.ex b/lib/music_library/records.ex
index 67f58a67..7334c792 100644
--- a/lib/music_library/records.ex
+++ b/lib/music_library/records.ex
@@ -191,6 +191,6 @@ defmodule MusicLibrary.Records do
   end
 
   defp musicbrainz do
-    Application.get_env(:music_library, :musicbrainz, MusicLibrary.Records.MusicBrainz.APIImpl)
+    Application.get_env(:music_library, :musicbrainz, MusicBrainz.APIImpl)
   end
 end
diff --git a/lib/music_library/records/importer.ex b/lib/music_library/records/importer.ex
index 46e8e49c..53afbab1 100644
--- a/lib/music_library/records/importer.ex
+++ b/lib/music_library/records/importer.ex
@@ -155,6 +155,6 @@ defmodule MusicLibrary.Records.Importer do
   end
 
   defp musicbrainz do
-    Application.get_env(:music_library, :musicbrainz, MusicLibrary.Records.MusicBrainz.APIImpl)
+    Application.get_env(:music_library, :musicbrainz, MusicBrainz.APIImpl)
   end
 end
diff --git a/test/test_helper.exs b/test/test_helper.exs
index ff692f28..c6c75cb9 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -1,4 +1,4 @@
-Mox.defmock(APIBehaviourMock, for: MusicLibrary.Records.MusicBrainz.APIBehaviour)
+Mox.defmock(APIBehaviourMock, for: MusicBrainz.APIBehaviour)
 Application.put_env(:music_library, :musicbrainz, APIBehaviourMock)
 
 ExUnit.start()