diff --git a/cache/build.gradle b/core/cache/build.gradle
similarity index 100%
rename from cache/build.gradle
rename to core/cache/build.gradle
diff --git a/cache/src/main/kotlin/org/moire/ultrasonic/cache/Directories.kt b/core/cache/src/main/kotlin/org/moire/ultrasonic/cache/Directories.kt
similarity index 100%
rename from cache/src/main/kotlin/org/moire/ultrasonic/cache/Directories.kt
rename to core/cache/src/main/kotlin/org/moire/ultrasonic/cache/Directories.kt
diff --git a/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt b/core/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt
similarity index 100%
rename from cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt
rename to core/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt
diff --git a/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializer.kt b/core/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializer.kt
similarity index 100%
rename from cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializer.kt
rename to core/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializer.kt
diff --git a/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializer.kt b/core/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializer.kt
similarity index 100%
rename from cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializer.kt
rename to core/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializer.kt
diff --git a/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializer.kt b/core/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializer.kt
similarity index 100%
rename from cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializer.kt
rename to core/cache/src/main/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializer.kt
diff --git a/cache/src/test/kotlin/org/moire/ultrasonic/cache/BaseStorageTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/BaseStorageTest.kt
similarity index 100%
rename from cache/src/test/kotlin/org/moire/ultrasonic/cache/BaseStorageTest.kt
rename to core/cache/src/test/kotlin/org/moire/ultrasonic/cache/BaseStorageTest.kt
diff --git a/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
similarity index 100%
rename from cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
rename to core/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
diff --git a/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt
similarity index 100%
rename from cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt
rename to core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/ArtistSerializerTest.kt
diff --git a/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt
similarity index 100%
rename from cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt
rename to core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/IndexesSerializerTest.kt
diff --git a/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt b/core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt
similarity index 100%
rename from cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt
rename to core/cache/src/test/kotlin/org/moire/ultrasonic/cache/serializers/MusicFolderSerializerTest.kt
diff --git a/settings.gradle b/settings.gradle
index eb222b3d..086993e5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ include ':library'
 include ':domain'
 include ':subsonic-api'
 include ':subsonic-api-image-loader'
-include ':cache'
+include ':core:cache'
 include ':menudrawer'
 include ':pulltorefresh'
 include ':ultrasonic'
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index aa7a2ff5..98f916cd 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     implementation project(':domain')
     implementation project(':subsonic-api')
     implementation project(':subsonic-api-image-loader')
-    implementation project(':cache')
+    implementation project(':core:cache')
 
     implementation androidSupport.support
     implementation androidSupport.design