diff --git a/service/README.md b/core/README.md
similarity index 100%
rename from service/README.md
rename to core/README.md
diff --git a/service/build.gradle b/core/build.gradle
similarity index 100%
rename from service/build.gradle
rename to core/build.gradle
diff --git a/service/database.json b/core/database.json
similarity index 100%
rename from service/database.json
rename to core/database.json
diff --git a/service/src/main/groovy/com/jdbernard/wdiwtlt/MediaLibrary.groovy b/core/src/main/groovy/com/jdbernard/wdiwtlt/MediaLibrary.groovy
similarity index 100%
rename from service/src/main/groovy/com/jdbernard/wdiwtlt/MediaLibrary.groovy
rename to core/src/main/groovy/com/jdbernard/wdiwtlt/MediaLibrary.groovy
diff --git a/service/src/main/groovy/com/jdbernard/wdiwtlt/db/ORM.groovy b/core/src/main/groovy/com/jdbernard/wdiwtlt/db/ORM.groovy
similarity index 100%
rename from service/src/main/groovy/com/jdbernard/wdiwtlt/db/ORM.groovy
rename to core/src/main/groovy/com/jdbernard/wdiwtlt/db/ORM.groovy
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Album.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Album.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Album.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Album.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Artist.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Artist.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Artist.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Artist.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Bookmark.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Bookmark.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Bookmark.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Bookmark.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Image.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Image.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Image.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Image.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/MediaFile.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/MediaFile.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/MediaFile.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/MediaFile.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Model.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Model.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Model.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Model.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Playlist.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Playlist.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Playlist.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Playlist.java
diff --git a/service/src/main/java/com/jdbernard/wdiwtlt/db/models/Tag.java b/core/src/main/java/com/jdbernard/wdiwtlt/db/models/Tag.java
similarity index 100%
rename from service/src/main/java/com/jdbernard/wdiwtlt/db/models/Tag.java
rename to core/src/main/java/com/jdbernard/wdiwtlt/db/models/Tag.java
diff --git a/service/src/main/sql/migrations/20151209054632-initial-schema-down.sql b/core/src/main/sql/migrations/20151209054632-initial-schema-down.sql
similarity index 100%
rename from service/src/main/sql/migrations/20151209054632-initial-schema-down.sql
rename to core/src/main/sql/migrations/20151209054632-initial-schema-down.sql
diff --git a/service/src/main/sql/migrations/20151209054632-initial-schema-up.sql b/core/src/main/sql/migrations/20151209054632-initial-schema-up.sql
similarity index 100%
rename from service/src/main/sql/migrations/20151209054632-initial-schema-up.sql
rename to core/src/main/sql/migrations/20151209054632-initial-schema-up.sql
diff --git a/service/test.groovy b/core/test.groovy
similarity index 100%
rename from service/test.groovy
rename to core/test.groovy