diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheWriter.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheWriter.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheWriter.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheWriter.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStream.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceContractTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactoryTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactoryTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactoryTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactoryTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheWriterTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheWriterTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheWriterTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheWriterTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/ReusableBufferedOutputStreamTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java