diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java