diff --git a/src/lib.rs b/src/lib.rs
index 69974498..f9c09c2d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,16 +6,16 @@
 //!
 //! # Supported Formats
 //!
-//! | File Format | Extensions                                      | Read | Write | Metadata Format(s)                                 |
-//! |-------------|-------------------------------------------------|------|-------|----------------------------------------------------|
-//! | APE         | `ape`                                           |**X** |**X**  |`APEv2`, `APEv1`, `ID3v2` (Not officially), `ID3v1` |
-//! | AIFF        | `aiff`, `aif`                                   |**X** |**X**  |`ID3v2`, `Text Chunks`                              |
-//! | FLAC        | `flac`                                          |**X** |**X**  |`Vorbis Comments`                                   |
-//! | MP3         | `mp3`                                           |**X** |**X**  |`ID3v2`, `ID3v1`, `APEv2`, `APEv1`                  |
-//! | MP4         | `mp4`, `m4a`, `m4b`, `m4p`, `m4r`, `m4v`, `3gp` |**X** |**X**  |`Atoms`                                             |
-//! | Opus        | `opus`                                          |**X** |**X**  |`Vorbis Comments`                                   |
-//! | Ogg Vorbis  | `ogg`                                           |**X** |**X**  |`Vorbis Comments`                                   |
-//! | WAV         | `wav`, `wave`                                   |**X** |**X**  |`ID3v2`, `RIFF INFO`                                |
+//! | File Format | Extensions                                      | Read | Write | Metadata Format(s)                            |
+//! |-------------|-------------------------------------------------|------|-------|-----------------------------------------------|
+//! | APE         | `ape`                                           |**X** |**X**  |`APEv2`, `APEv1`, `ID3v2` (Read only), `ID3v1` |
+//! | AIFF        | `aiff`, `aif`                                   |**X** |**X**  |`ID3v2`, `Text Chunks`                         |
+//! | FLAC        | `flac`                                          |**X** |**X**  |`Vorbis Comments`                              |
+//! | MP3         | `mp3`                                           |**X** |**X**  |`ID3v2`, `ID3v1`, `APEv2`, `APEv1`             |
+//! | MP4         | `mp4`, `m4a`, `m4b`, `m4p`, `m4r`, `m4v`, `3gp` |**X** |**X**  |`Atoms`                                        |
+//! | Opus        | `opus`                                          |**X** |**X**  |`Vorbis Comments`                              |
+//! | Ogg Vorbis  | `ogg`                                           |**X** |**X**  |`Vorbis Comments`                              |
+//! | WAV         | `wav`, `wave`                                   |**X** |**X**  |`ID3v2`, `RIFF INFO`                           |
 //!
 //! # Examples
 //!
diff --git a/src/logic/mp4/ilst/mod.rs b/src/logic/mp4/ilst/mod.rs
index 03b361ac..ba582795 100644
--- a/src/logic/mp4/ilst/mod.rs
+++ b/src/logic/mp4/ilst/mod.rs
@@ -1,9 +1,10 @@
 pub(in crate::logic::mp4) mod read;
 pub(in crate::logic) mod write;
 
-use crate::picture::Picture;
 use crate::types::item::{ItemKey, ItemValue, TagItem};
+use crate::types::picture::Picture;
 use crate::types::tag::{Tag, TagType};
+
 use std::convert::TryInto;
 
 #[derive(Default)]
@@ -23,7 +24,7 @@ impl From<Ilst> for Tag {
 				AtomData::Picture(pic) => {
 					tag.pictures.push(pic);
 					continue;
-				},
+				}
 				_ => continue,
 			};
 
@@ -32,10 +33,10 @@ impl From<Ilst> for Tag {
 				&match atom.ident {
 					AtomIdent::Fourcc(fourcc) => {
 						fourcc.iter().map(|b| *b as char).collect::<String>()
-					},
+					}
 					AtomIdent::Freeform { mean, name } => {
 						format!("----:{}:{}", mean, name)
-					},
+					}
 				},
 			);
 
diff --git a/src/logic/mp4/ilst/write.rs b/src/logic/mp4/ilst/write.rs
index 1ff7532a..db338432 100644
--- a/src/logic/mp4/ilst/write.rs
+++ b/src/logic/mp4/ilst/write.rs
@@ -4,7 +4,7 @@ use crate::logic::mp4::ilst::{AtomIdentRef, AtomRef};
 use crate::logic::mp4::moov::Moov;
 use crate::logic::mp4::read::nested_atom;
 use crate::logic::mp4::read::verify_mp4;
-use crate::picture::MimeType;
+use crate::types::picture::MimeType;
 use crate::types::picture::Picture;
 
 use std::fs::File;
diff --git a/src/logic/ogg/flac/read.rs b/src/logic/ogg/flac/read.rs
index 0983c461..3d7c5f5d 100644
--- a/src/logic/ogg/flac/read.rs
+++ b/src/logic/ogg/flac/read.rs
@@ -3,7 +3,7 @@ use super::FlacFile;
 use crate::error::{LoftyError, Result};
 use crate::logic::ogg::read::read_comments;
 use crate::logic::ogg::tag::VorbisComments;
-use crate::picture::Picture;
+use crate::types::picture::Picture;
 use crate::types::properties::FileProperties;
 
 use std::io::{Read, Seek, SeekFrom};
@@ -107,7 +107,7 @@ where
 			6 => tag
 				.pictures
 				.push(Picture::from_flac_bytes(&*block.content)?),
-			_ => {},
+			_ => {}
 		}
 	}
 
diff --git a/src/logic/ogg/read.rs b/src/logic/ogg/read.rs
index a4dce821..299d4881 100644
--- a/src/logic/ogg/read.rs
+++ b/src/logic/ogg/read.rs
@@ -1,7 +1,7 @@
 use super::tag::VorbisComments;
 use super::verify_signature;
 use crate::error::{LoftyError, Result};
-use crate::picture::Picture;
+use crate::types::picture::Picture;
 
 use std::io::{Read, Seek, SeekFrom};
 
diff --git a/tests/picture/format_parsers.rs b/tests/picture/format_parsers.rs
index ad6da11e..cafbc5dd 100644
--- a/tests/picture/format_parsers.rs
+++ b/tests/picture/format_parsers.rs
@@ -1,5 +1,5 @@
 use lofty::id3::v2::{Id3v2Version, TextEncoding};
-use lofty::picture::{Picture, PictureInformation, PictureType};
+use lofty::{Picture, PictureInformation, PictureType};
 
 use std::fs::File;
 use std::io::Read;
diff --git a/tests/picture/from_reader.rs b/tests/picture/from_reader.rs
index 011cdc84..339f5aff 100644
--- a/tests/picture/from_reader.rs
+++ b/tests/picture/from_reader.rs
@@ -1,4 +1,4 @@
-use lofty::picture::{MimeType, Picture};
+use lofty::{MimeType, Picture};
 
 use std::fs::File;
 use std::io::Read;
diff --git a/tests/picture/information.rs b/tests/picture/information.rs
index 85ee6d24..540940f0 100644
--- a/tests/picture/information.rs
+++ b/tests/picture/information.rs
@@ -1,4 +1,4 @@
-use lofty::picture::PictureInformation;
+use lofty::PictureInformation;
 
 use std::fs::File;
 use std::io::Read;