diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Clock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/Clock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java b/library/common/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ListenerSet.java b/library/common/src/main/java/com/google/android/exoplayer2/util/ListenerSet.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/ListenerSet.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/ListenerSet.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java b/library/common/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java b/library/common/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ListenerSetTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/ListenerSetTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/ListenerSetTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/util/ListenerSetTest.java