diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java b/library/extractor/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
similarity index 99%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
index 50810bc6a0..33db40b91d 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
+
 /**
  * Wraps a byte array, providing methods that allow it to be read as a NAL unit bitstream.
  *
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java