diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java
rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderException.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderException.java
rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java
rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java b/library/common/src/main/java/com/google/android/exoplayer2/text/Subtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/Subtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java b/library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java b/library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java b/library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java b/library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java