diff --git a/core/cache/build.gradle b/core/cache/build.gradle
index 4d5d617a..5c273b70 100644
--- a/core/cache/build.gradle
+++ b/core/cache/build.gradle
@@ -1,7 +1,7 @@
 apply from: bootstrap.kotlinModule
 
 dependencies {
-    api project(':domain')
+    api project(':core:domain')
     api other.twitterSerial
 
     testImplementation testing.junit
diff --git a/domain/build.gradle b/core/domain/build.gradle
similarity index 100%
rename from domain/build.gradle
rename to core/domain/build.gradle
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Bookmark.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Bookmark.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Bookmark.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Bookmark.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/ChatMessage.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ChatMessage.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/ChatMessage.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ChatMessage.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Indexes.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Indexes.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Indexes.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Indexes.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/JukeboxStatus.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/JukeboxStatus.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/JukeboxStatus.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/JukeboxStatus.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Lyrics.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Lyrics.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Lyrics.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Lyrics.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/PlayerState.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/PlayerState.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/PlayerState.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/PlayerState.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Playlist.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Playlist.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Playlist.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Playlist.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/PodcastsChannel.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/PodcastsChannel.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/PodcastsChannel.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/PodcastsChannel.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/RepeatMode.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/RepeatMode.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/RepeatMode.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/RepeatMode.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchCriteria.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchCriteria.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchCriteria.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchCriteria.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchResult.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchResult.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchResult.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchResult.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Share.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Share.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Share.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Share.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/UserInfo.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/UserInfo.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/UserInfo.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/UserInfo.kt
diff --git a/domain/src/main/kotlin/org/moire/ultrasonic/domain/Version.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Version.kt
similarity index 100%
rename from domain/src/main/kotlin/org/moire/ultrasonic/domain/Version.kt
rename to core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Version.kt
diff --git a/settings.gradle b/settings.gradle
index 086993e5..fe47db76 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 include ':library'
-include ':domain'
+include ':core:domain'
 include ':subsonic-api'
 include ':subsonic-api-image-loader'
 include ':core:cache'
diff --git a/subsonic-api-image-loader/build.gradle b/subsonic-api-image-loader/build.gradle
index a0840d23..3357408d 100644
--- a/subsonic-api-image-loader/build.gradle
+++ b/subsonic-api-image-loader/build.gradle
@@ -7,7 +7,7 @@ android {
 }
 
 dependencies {
-    api project(':domain')
+    api project(':core:domain')
     api project(':subsonic-api')
     api(other.picasso) {
         exclude group: "com.android.support"
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 98f916cd..711bfbd4 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation project(':menudrawer')
     implementation project(':pulltorefresh')
     implementation project(':library')
-    implementation project(':domain')
+    implementation project(':core:domain')
     implementation project(':subsonic-api')
     implementation project(':subsonic-api-image-loader')
     implementation project(':core:cache')