diff --git a/.project b/.project
index 1f6c4db..e824f9f 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>rest</name>
+	<name>ch.psi.daq.rest</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
index 342c291..202253d 100644
--- a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
+++ b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
@@ -1,5 +1,5 @@
 #org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
-#Tue May 26 17:48:59 CEST 2015
+#Wed Jun 10 13:28:05 CEST 2015
 build.family.org.gradle.tooling.model.eclipse.HierarchicalEclipseProject=;
 org.springsource.ide.eclipse.gradle.linkedresources=
-org.springsource.ide.eclipse.gradle.rootprojectloc=
+org.springsource.ide.eclipse.gradle.rootprojectloc=../ch.psi.daq.buildall
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index fe60f11..0cc2534 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Wed May 27 10:41:51 CEST 2015
+#Wed Jun 10 14:12:23 CEST 2015
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/build.gradle b/build.gradle
index 6885fa5..22cfe27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,49 +1,15 @@
-apply plugin: 'java'
-apply plugin: 'eclipse'
-
-sourceCompatibility = 1.8
 version = '1.0.0'
-group = 'ch.psi.daq'
-
-repositories {
-	mavenLocal()
-    mavenCentral()
-    maven { url "http://slsyoke4.psi.ch:8081/artifactory/libs-releases" }
-    maven { url "http://slsyoke4.psi.ch:8081/artifactory/libs-snapshots" }
-}
 
 dependencies {
-    compile 'ch.psi.daq:cassandra:1.0.0'
+    compile project(':ch.psi.daq.cassandra')
     compile 'org.springframework.boot:spring-boot-starter-web:1.2.3.RELEASE'
     compile 'org.apache.commons:commons-lang3:3.4'
-    testCompile group: 'junit', name: 'junit', version: '4.+'
-}
-
-apply plugin: 'maven'
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
 }
 
 uploadArchives {
     repositories {
         mavenDeployer {
-            repository(url: "http://slsyoke4.psi.ch:8081/artifactory/libs-snapshots-local"){
-            	authentication(userName: "upload", password: "{DESede}eWKHxAtQ2Dc=")
-            }
-            pom.groupId = 'ch.psi.daq'
             pom.artifactId = 'rest'
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/ch/psi/daq/rest/DaqRestApplication.java b/src/main/java/ch/psi/daq/rest/DaqRestApplication.java
index 4d15523..05ad357 100644
--- a/src/main/java/ch/psi/daq/rest/DaqRestApplication.java
+++ b/src/main/java/ch/psi/daq/rest/DaqRestApplication.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.ComponentScan;
  * Finally, the main() method consists of single static call to
  * SpringApplication.run().
  * <p>
- * Methods annotated with {@link @Bean} are Java beans that are
+ * Methods annotated with @Bean are Java beans that are
  * container-managed, i.e. managed by Spring. Whenever there are @Autowire, @Inject
  * or similar annotations found in the code (which is being scanned through the @ComponentScan
  * annotation), the container then knows how to create those beans and inject