diff --git a/beetsplug/albumtypes.py b/beetsplug/albumtypes.py
index b1e143a88..180773f58 100644
--- a/beetsplug/albumtypes.py
+++ b/beetsplug/albumtypes.py
@@ -14,10 +14,11 @@
 
 """Adds an album template field for formatted album types."""
 
-from beets.autotag.mb import VARIOUS_ARTISTS_ID
 from beets.library import Album
 from beets.plugins import BeetsPlugin
 
+from .musicbrainz import VARIOUS_ARTISTS_ID
+
 
 class AlbumTypesPlugin(BeetsPlugin):
     """Adds an album template field for formatted album types."""
diff --git a/beets/autotag/mb.py b/beetsplug/musicbrainz.py
similarity index 100%
rename from beets/autotag/mb.py
rename to beetsplug/musicbrainz.py
diff --git a/test/test_mb.py b/test/plugins/test_musicbrainz.py
similarity index 100%
rename from test/test_mb.py
rename to test/plugins/test_musicbrainz.py