diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 13cd1fa..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-server
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0fe92be..92fd58d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,8 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel>
+      <module name="at.yeoman.photobackup.photobackup-server.main" target="1.8" />
+      <module name="at.yeoman.photobackup.photobackup-server.test" target="1.8" />
       <module name="at.yeoman.photobackup.server.main" target="1.8" />
       <module name="at.yeoman.photobackup.server.test" target="1.8" />
     </bytecodeTargetLevel>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 21db7a2..a1c9b55 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.server.iml" filepath="$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.server.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.server.main.iml" filepath="$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.server.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.server.test.iml" filepath="$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.server.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.photobackup-server.iml" filepath="$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.photobackup-server.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.photobackup-server.main.iml" filepath="$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.photobackup-server.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.photobackup-server.test.iml" filepath="$PROJECT_DIR$/.idea/modules/at.yeoman.photobackup.photobackup-server.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/at.yeoman.photobackup.server.iml b/.idea/modules/at.yeoman.photobackup.photobackup-server.iml
similarity index 57%
rename from .idea/modules/at.yeoman.photobackup.server.iml
rename to .idea/modules/at.yeoman.photobackup.photobackup-server.iml
index 7ee2cd4..d1b852a 100644
--- a/.idea/modules/at.yeoman.photobackup.server.iml
+++ b/.idea/modules/at.yeoman.photobackup.photobackup-server.iml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="at.yeoman.photobackup" externalSystemModuleVersion="1.0-SNAPSHOT" linkedProjectId="server" linkedProjectPath="$MODULE_DIR$/../.." rootProjectPath="$MODULE_DIR$/../.." />
+<module external.linked.project.id="photobackup-server" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="at.yeoman.photobackup" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
       <excludeFolder url="file://$MODULE_DIR$/../../out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../photos" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/modules/at.yeoman.photobackup.server.main.iml b/.idea/modules/at.yeoman.photobackup.photobackup-server.main.iml
similarity index 89%
rename from .idea/modules/at.yeoman.photobackup.server.main.iml
rename to .idea/modules/at.yeoman.photobackup.photobackup-server.main.iml
index a0bd234..c77c9a2 100644
--- a/.idea/modules/at.yeoman.photobackup.server.main.iml
+++ b/.idea/modules/at.yeoman.photobackup.photobackup-server.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="server:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="at.yeoman.photobackup" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="photobackup-server:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="at.yeoman.photobackup" external.system.module.type="sourceSet" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
@@ -19,11 +19,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-gradle-plugin:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.8" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:27.0.1-jre" level="project" />
     <orderEntry type="library" name="Gradle: org.webjars.npm:js-joda:1.8.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-loader-tools:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Gradle: io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-compress:1.14" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
@@ -46,13 +50,13 @@
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-context:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-aop:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-beans:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-expression:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-core:5.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-logging:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.19" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
diff --git a/.idea/modules/at.yeoman.photobackup.server.test.iml b/.idea/modules/at.yeoman.photobackup.photobackup-server.test.iml
similarity index 90%
rename from .idea/modules/at.yeoman.photobackup.server.test.iml
rename to .idea/modules/at.yeoman.photobackup.photobackup-server.test.iml
index 17f8bb4..e432f2c 100644
--- a/.idea/modules/at.yeoman.photobackup.server.test.iml
+++ b/.idea/modules/at.yeoman.photobackup.photobackup-server.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="server:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="at.yeoman.photobackup" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="photobackup-server:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="at.yeoman.photobackup" external.system.module.type="sourceSet" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
@@ -19,7 +19,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="at.yeoman.photobackup.server.main" />
+    <orderEntry type="module" module-name="at.yeoman.photobackup.photobackup-server.main" />
+    <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-gradle-plugin:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-thymeleaf:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.8" level="project" />
@@ -27,6 +28,9 @@
     <orderEntry type="library" name="Gradle: org.webjars.npm:js-joda:1.8.2" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-test:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-loader-tools:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Gradle: io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-compress:1.14" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
@@ -95,5 +99,5 @@
     <orderEntry type="library" name="Gradle: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.4" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="at.yeoman.photobackup.server.main" />
+  <component name="TestModuleProperties" production-module="at.yeoman.photobackup.photobackup-server.main" />
 </module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2638b17..b9f9533 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,18 @@
-plugins {
-    id 'java'
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    ext {
+        springBootVersion = '2.0.4.RELEASE'
+    }
+    dependencies {
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+    }
 }
 
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+
 compileJava {
     options.compilerArgs += ["-h", file("generated_headers")]
 //    options.verbose = true
@@ -12,7 +23,7 @@ dependencies {
 }
 
 group 'at.yeoman.photobackup'
-version '1.0-SNAPSHOT'
+version '1.0.0-SNAPSHOT'
 
 sourceCompatibility = 1.8
 
@@ -25,7 +36,7 @@ repositories {
 }
 
 dependencies {
-    def springBootVersion = '2.0.4.RELEASE'
+    compile group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: springBootVersion
 
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: springBootVersion
@@ -45,3 +56,7 @@ task run(type: JavaExec) {
 
     main = 'at.yeoman.photobackup.server.Server'
 }
+
+bootJar {
+    launchScript()
+}
diff --git a/settings.gradle b/settings.gradle
index c9d3ca4..8b13789 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-rootProject.name = 'server'
 
diff --git a/src/test/java/jackson/BasicSerialization.java b/src/test/java/jackson/BasicSerialization.java
index ad12d7c..010e71b 100644
--- a/src/test/java/jackson/BasicSerialization.java
+++ b/src/test/java/jackson/BasicSerialization.java
@@ -9,7 +9,7 @@
 public class BasicSerialization {
     @Test
     public void deserializeAssetReport() throws IOException {
-        String json = "{\"descriptions\":[{\"name\":\"hello\"}]}";
+        String json = "{\"descriptions\":[{\"name\":\"hello\", \"resourceDescriptions\": []}]}";
         System.out.println(json);
         AssetReport result = new ObjectMapper().readValue(json, AssetReport.class);
         System.out.println(result);