diff --git a/library/build.gradle b/core/library/build.gradle
similarity index 100%
rename from library/build.gradle
rename to core/library/build.gradle
diff --git a/library/lint-baseline.xml b/core/library/lint-baseline.xml
similarity index 100%
rename from library/lint-baseline.xml
rename to core/library/lint-baseline.xml
diff --git a/library/src/main/AndroidManifest.xml b/core/library/src/main/AndroidManifest.xml
similarity index 100%
rename from library/src/main/AndroidManifest.xml
rename to core/library/src/main/AndroidManifest.xml
diff --git a/library/src/main/java/com/mobeta/android/dslv/DragSortController.java b/core/library/src/main/java/com/mobeta/android/dslv/DragSortController.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/DragSortController.java
rename to core/library/src/main/java/com/mobeta/android/dslv/DragSortController.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java b/core/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java
rename to core/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/DragSortItemView.java b/core/library/src/main/java/com/mobeta/android/dslv/DragSortItemView.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/DragSortItemView.java
rename to core/library/src/main/java/com/mobeta/android/dslv/DragSortItemView.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java b/core/library/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java
rename to core/library/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/DragSortListView.java b/core/library/src/main/java/com/mobeta/android/dslv/DragSortListView.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/DragSortListView.java
rename to core/library/src/main/java/com/mobeta/android/dslv/DragSortListView.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java b/core/library/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java
rename to core/library/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java b/core/library/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java
rename to core/library/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java
diff --git a/library/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java b/core/library/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java
similarity index 100%
rename from library/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java
rename to core/library/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java
diff --git a/library/src/main/res/values/dslv_attrs.xml b/core/library/src/main/res/values/dslv_attrs.xml
similarity index 100%
rename from library/src/main/res/values/dslv_attrs.xml
rename to core/library/src/main/res/values/dslv_attrs.xml
diff --git a/library/.gitignore b/library/.gitignore
deleted file mode 100644
index e8fa30f8..00000000
--- a/library/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-*.iml
diff --git a/settings.gradle b/settings.gradle
index fe47db76..2a68d069 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':library'
+include ':core:library'
 include ':core:domain'
 include ':subsonic-api'
 include ':subsonic-api-image-loader'
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 711bfbd4..8811f245 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -52,7 +52,7 @@ android {
 dependencies {
     implementation project(':menudrawer')
     implementation project(':pulltorefresh')
-    implementation project(':library')
+    implementation project(':core:library')
     implementation project(':core:domain')
     implementation project(':subsonic-api')
     implementation project(':subsonic-api-image-loader')