Rename modules for consistency

src/audio_metadata/formats/__init__.py

@@ -1,26 +1,26 @@
 from .flac import *
 from .id3v1 import *
 from .id3v2 import *
-from .id3v2_frames import *
+from .id3v2frames import *
 from .mp3 import *
 from .ogg import *
 from .oggopus import *
 from .oggvorbis import *
 from .tables import *
-from .vorbis_comments import *
+from .vorbiscomments import *
 from .wave import *
 
 
 __all__ = [
 	*flac.__all__,
 	*id3v1.__all__,
-	*id3v2_frames.__all__,
 	*id3v2.__all__,
+	*id3v2frames.__all__,
 	*mp3.__all__,
 	*ogg.__all__,
 	*oggopus.__all__,
 	*oggvorbis.__all__,
 	*tables.__all__,
-	*vorbis_comments.__all__,
+	*vorbiscomments.__all__,
 	*wave.__all__,
 ]

src/audio_metadata/formats/flac.py

@@ -34,7 +34,7 @@
 	FLACMetadataBlockType,
 	ID3PictureType,
 )
-from .vorbis_comments import VorbisComments
+from .vorbiscomments import VorbisComments
 from ..exceptions import FormatError
 from ..models import (
 	Format,

src/audio_metadata/formats/id3v2.py

@@ -20,7 +20,7 @@
 	datareader,
 )
 
-from .id3v2_frames import (
+from .id3v2frames import (
 	ID3v2Frame,
 	ID3v2GenreFrame,
 	ID3v2NumericTextFrame,

src/audio_metadata/formats/oggopus.py

@@ -16,7 +16,7 @@
 
 from .flac import FLACPicture
 from .ogg import Ogg
-from .vorbis_comments import VorbisComments
+from .vorbiscomments import VorbisComments
 from ..exceptions import FormatError
 from ..models import StreamInfo
 

src/audio_metadata/formats/oggvorbis.py

@@ -17,7 +17,7 @@
 
 from .flac import FLACPicture
 from .ogg import Ogg
-from .vorbis_comments import VorbisComments
+from .vorbiscomments import VorbisComments
 from ..exceptions import FormatError
 from ..models import StreamInfo