diff --git a/interface/Makefile b/interface/Makefile
index 249e021a78c4997d1b31331bc1fe5435a79ecab5..2edcb96c7a6965521ff61880ab275377ecbca520 100644
--- a/interface/Makefile
+++ b/interface/Makefile
@@ -6,14 +6,14 @@ PROTOBUF_INCLUDE=../cpp/thirdparty/protobuf-2.5.0/src
PBRPC_PLUGIN=../bin/protoc-gen-pbrpc
PBRPCCPP_PLUGIN=../bin/protoc-gen-pbrpccpp
-TARGET_DIR_JAVA_FOUNDATION=../java/foundation/src/
-GENERATED_DIR_JAVA_FOUNDATION=$(TARGET_DIR_JAVA_FOUNDATION)org/xtreemfs/foundation/pbrpc/generatedinterfaces/
+TARGET_DIR_JAVA_FOUNDATION=../java/foundation/src/main/java
+GENERATED_DIR_JAVA_FOUNDATION=$(TARGET_DIR_JAVA_FOUNDATION)/org/xtreemfs/foundation/pbrpc/generatedinterfaces/
-TARGET_DIR_JAVA_PBRPCGEN=../java/pbrpcgen/src/
-GENERATED_DIR_JAVA_PBRPCGEN=$(TARGET_DIR_JAVA_PBRPCGEN)org/xtreemfs/foundation/pbrpc/generatedinterfaces/
+TARGET_DIR_JAVA_PBRPCGEN=../java/pbrpcgen/src/main/java
+GENERATED_DIR_JAVA_PBRPCGEN=$(TARGET_DIR_JAVA_PBRPCGEN)/org/xtreemfs/foundation/pbrpc/generatedinterfaces/
-TARGET_DIR_JAVA_SERVERS=../java/servers/src/
-GENERATED_DIR_JAVA_SERVERS=$(TARGET_DIR_JAVA_SERVERS)org/xtreemfs/pbrpc/generatedinterfaces/
+TARGET_DIR_JAVA_SERVERS=../java/servers/src/main/java
+GENERATED_DIR_JAVA_SERVERS=$(TARGET_DIR_JAVA_SERVERS)/org/xtreemfs/pbrpc/generatedinterfaces/
TARGET_DIR_CPP_CLIENT=../cpp/generated/
TARGET_DIR_H_CLIENT=../client/include/generated/
@@ -41,17 +41,17 @@ servers:
$(PROTOC) --plugin=$(PBRPC_PLUGIN) -I$(PROTOBUF_INCLUDE) -I. -I$(@D)/xtreemfs/ $(PROTOS_SERVERS) --pbrpc_out=$(TARGET_DIR_JAVA_SERVERS)
servers_clean:
- @rm -r $(GENERATED_DIR_JAVA_SERVERS)*.java
+ @rm -r $(GENERATED_DIR_JAVA_SERVERS)/*.java
foundation: pbrpc/*.proto
$(PROTOC) -I$(PROTOBUF_INCLUDE) -I. -I$(@D)/pbrpc/ $(PROTOS_FOUNDATION) --java_out=$(TARGET_DIR_JAVA_FOUNDATION)
$(PROTOC) --plugin=$(PBRPC_PLUGIN) -I$(PROTOBUF_INCLUDE) -I. -I$(@D)/pbrpc/ $(PROTOS_FOUNDATION) --pbrpc_out=$(TARGET_DIR_JAVA_FOUNDATION)
foundation_clean:
- @rm -r $(GENERATED_DIR_JAVA_FOUNDATION)*.java
+ @rm -r $(GENERATED_DIR_JAVA_FOUNDATION)/*.java
pbrpcgen: include/PBRPC.proto
$(PROTOC) -I$(PROTOBUF_INCLUDE) -Iinclude/ $< --java_out=$(TARGET_DIR_JAVA_PBRPCGEN)
pbrpcgen_clean:
- @rm -r $(GENERATED_DIR_JAVA_PBRPCGEN)*.java
+ @rm -r $(GENERATED_DIR_JAVA_PBRPCGEN)/*.java
diff --git a/java/flease/.gitignore b/java/flease/.gitignore
deleted file mode 100644
index 7c07e878ea3f7e72f387b5e94a45dcf10e516f20..0000000000000000000000000000000000000000
--- a/java/flease/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/dist
-/build
-/.classpath
-/.project
-/bin/
-/.settings/
diff --git a/java/flease/build-1.6.5.xml b/java/flease/build-1.6.5.xml
deleted file mode 100644
index fe9bf3a5a9683ccf9f2427d9524b6e8585d28c87..0000000000000000000000000000000000000000
--- a/java/flease/build-1.6.5.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project Flease.
-
-
-
-
diff --git a/java/flease/build.xml b/java/flease/build.xml
deleted file mode 100644
index b69101e10324ff3bbb6e4d64bcc53749c81aaf7d..0000000000000000000000000000000000000000
--- a/java/flease/build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project Flease.
-
-
-
-
diff --git a/java/flease/eclipse-project/.classpath b/java/flease/eclipse-project/.classpath
deleted file mode 100644
index 242f08e7f97df5cb2ad92bc785e0662c256a4948..0000000000000000000000000000000000000000
--- a/java/flease/eclipse-project/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/java/flease/eclipse-project/.project b/java/flease/eclipse-project/.project
deleted file mode 100644
index 372a047b9150eabb9ae7eb2917243dae58ab9d7a..0000000000000000000000000000000000000000
--- a/java/flease/eclipse-project/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- xtreemfs_flease
-
-
- xtreemfs_foundation
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/java/flease/manifest.mf b/java/flease/manifest.mf
deleted file mode 100644
index 328e8e5bc3b7f1f7bad2bc0751a933e00c801983..0000000000000000000000000000000000000000
--- a/java/flease/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/java/flease/nbproject/build-impl-1.6.5.xml b/java/flease/nbproject/build-impl-1.6.5.xml
deleted file mode 100644
index 3a1ab627d583319b16ed69746bdde19d71a9a970..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/build-impl-1.6.5.xml
+++ /dev/null
@@ -1,892 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/flease/nbproject/build-impl.xml b/java/flease/nbproject/build-impl.xml
deleted file mode 100644
index acc75ede515aad476891ccadf8a31de72652fa40..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1054 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/flease/nbproject/genfiles.properties b/java/flease/nbproject/genfiles.properties
deleted file mode 100644
index b812a41847261f9320a6af86f7669e1178fd34fe..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/genfiles.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-build.xml.data.CRC32=3d699ec7
-build.xml.script.CRC32=d8a5a904
-build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d06e30bd
-nbproject/build-impl.xml.script.CRC32=318c6c3f
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
-nbproject/profiler-build-impl.xml.data.CRC32=3d699ec7
-nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
-nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf@1.6.1
diff --git a/java/flease/nbproject/private/private.properties b/java/flease/nbproject/private/private.properties
deleted file mode 100644
index ba93c2bc7e762c6d558dcabaaa368f4c1e3a25e0..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/private/private.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=/home/kleineweber/.netbeans/7.0/build.properties
diff --git a/java/flease/nbproject/private/private.xml b/java/flease/nbproject/private/private.xml
deleted file mode 100644
index e571abfbb1e7da2cfe3921d794a6289b21aa33b0..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/private/private.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/java/flease/nbproject/private/profiler/configurations.xml b/java/flease/nbproject/private/profiler/configurations.xml
deleted file mode 100644
index 692945ad951a6d8e2c079df7943d707aef7b17c1..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/private/profiler/configurations.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-1000
-false
-profiler.simple.filter
-false
-
-
-8
-true
-
-false
-false
-0
-0
-false
-2
-true
-false
-false
-
-profiler.simple.filter
-1
-32
-1
-false
-3
-true
-true
-3
-10
-1
-true
-New CPU Analysis
-false
-1
-true
-Quick filter...
-10
-0
-false
-0
-profiler.simple.filter
-0
-false
-true
-
-
-
-1
-
-
-false
-false
-false
-true
-false
-false
-32
-Quick filter...
-0
-false
-0
-0
-
-profiler.simple.filter
-10
-0
-true
-true
-Profile all classes
-true
-10
-true
-
-1000
-0
-true
-1000
-0
-profiler.simple.filter
-false
-10
-Analyze Performance
-
-1
-0
-
-0
-false
-profiler.simple.filter
-true
-Quick filter...
-false
-false
-false
-0
-
-
-false
-0
-32
-
-0
-32
-0
-profiler.simple.filter
-Analyze Memory
-2
-false
-Profile all classes
-0
-0
-10
-profiler.simple.filter
-true
-1
-true
-false
-10
-
-false
-10
-false
-true
-false
-true
-false
-Quick filter...
-0
-false
-false
-
-false
-8
-Monitor Application
-1000
-true
-true
-
diff --git a/java/flease/nbproject/profiler-build-impl.xml b/java/flease/nbproject/profiler-build-impl.xml
deleted file mode 100644
index 7c8995daf1d34abbd91341a73cfa5b9339bce187..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/profiler-build-impl.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/flease/nbproject/project.properties b/java/flease/nbproject/project.properties
deleted file mode 100644
index 0c6fd61ac19e97170c52849084f310f4f7340936..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/project.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-application.title=Flease
-application.vendor=bjko
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/Flease.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-includes=**
-jar.compress=false
-javac.classpath=\
- ${reference.XtreemFS-foundation.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-project.XtreemFS-foundation=../foundation
-reference.XtreemFS-foundation.jar=${project.XtreemFS-foundation}/dist/Foundation.jar
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-ea
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/java/flease/nbproject/project.xml b/java/flease/nbproject/project.xml
deleted file mode 100644
index 48b1ff46cc1adfb4fccba8922a61f2813cec7701..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/project.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- org.netbeans.modules.java.j2seproject
-
-
- Flease
-
-
-
-
-
-
-
-
-
- XtreemFS-foundation
- jar
-
- jar
- clean
- jar
-
-
-
-
diff --git a/java/flease/nbproject/protobuf-build.cfg.xml b/java/flease/nbproject/protobuf-build.cfg.xml
deleted file mode 100644
index fe07f640916a8975e70337227eb06690827e1fd4..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/protobuf-build.cfg.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/java/flease/nbproject/protobuf-build.xml b/java/flease/nbproject/protobuf-build.xml
deleted file mode 100644
index 4bd04501b5481d2a9587b64489cef3eaeb550ee0..0000000000000000000000000000000000000000
--- a/java/flease/nbproject/protobuf-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/foundation/.gitignore b/java/foundation/.gitignore
deleted file mode 100644
index 774fe5c9720783424e4b6563d31e247336d63de8..0000000000000000000000000000000000000000
--- a/java/foundation/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/build
-/dist
-/bin/
-/.classpath
-/.project
-/.settings/
diff --git a/java/foundation/build-1.6.5.xml b/java/foundation/build-1.6.5.xml
deleted file mode 100644
index ddf49efe0a0960d206cabb9f2ae94f839f3e167c..0000000000000000000000000000000000000000
--- a/java/foundation/build-1.6.5.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project Foundation as part of the XtreemFS project.
-
-
-
-
diff --git a/java/foundation/build-before-profiler.xml b/java/foundation/build-before-profiler.xml
deleted file mode 100644
index da1b38743d5a1c0fcd8cee3a561ed840c5b9eefa..0000000000000000000000000000000000000000
--- a/java/foundation/build-before-profiler.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project Foundation as part of the XtreemFS project.
-
-
-
diff --git a/java/foundation/build.xml b/java/foundation/build.xml
deleted file mode 100644
index 1e864f62232bb10b8c657b197a529bc1f28c4b38..0000000000000000000000000000000000000000
--- a/java/foundation/build.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project Foundation as part of the XtreemFS project.
-
-
-
-
-
-
- Creating PBRPC.jar.
-
-
-
-
-
-
-
diff --git a/java/foundation/eclipse-project/.classpath b/java/foundation/eclipse-project/.classpath
deleted file mode 100644
index 7ee5d18ae6904137063fea431018c2862079acc2..0000000000000000000000000000000000000000
--- a/java/foundation/eclipse-project/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/foundation/eclipse-project/.project b/java/foundation/eclipse-project/.project
deleted file mode 100644
index 1447dce11d918374b3ad39b55468e348a5fa4ebb..0000000000000000000000000000000000000000
--- a/java/foundation/eclipse-project/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- xtreemfs_foundation
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/java/foundation/nbproject/.gitignore b/java/foundation/nbproject/.gitignore
deleted file mode 100644
index cbd3c3abb085546cef6fe771094647f8bf2fd07b..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/private
diff --git a/java/foundation/nbproject/build-impl-1.6.5.xml b/java/foundation/nbproject/build-impl-1.6.5.xml
deleted file mode 100644
index 8ba3c0557c5ce67fae571821a5f9c3b29b918769..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/build-impl-1.6.5.xml
+++ /dev/null
@@ -1,682 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/foundation/nbproject/build-impl.xml b/java/foundation/nbproject/build-impl.xml
deleted file mode 100644
index b66e0b7f5c25f0ae24b6b3f0954dddddf9dc3d23..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/build-impl.xml
+++ /dev/null
@@ -1,687 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/foundation/nbproject/genfiles.properties b/java/foundation/nbproject/genfiles.properties
deleted file mode 100644
index 57493021045aee62916c2ef3b691ca79f33959a9..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/genfiles.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-build.xml.data.CRC32=4a9eff70
-build.xml.script.CRC32=ce2ddeb0
-build.xml.stylesheet.CRC32=958a1d3e
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=beaaf17a
-nbproject/build-impl.xml.script.CRC32=3e4625c6
-nbproject/build-impl.xml.stylesheet.CRC32=78c6a6ee@1.38.1.45
-nbproject/profiler-build-impl.xml.data.CRC32=4a9eff70
-nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
-nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf
diff --git a/java/foundation/nbproject/profiler-build-impl.xml b/java/foundation/nbproject/profiler-build-impl.xml
deleted file mode 100644
index 7c8995daf1d34abbd91341a73cfa5b9339bce187..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/profiler-build-impl.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/foundation/nbproject/project.properties b/java/foundation/nbproject/project.properties
deleted file mode 100644
index e72205a5dc0e2650aa4bb916c0554715a620d1c6..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/project.properties
+++ /dev/null
@@ -1,82 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-application.args=
-application.title=Foundation
-application.vendor=flangner
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/Foundation.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.bcprov-jdk16-139.jar=lib/bcprov-jdk16-139.jar
-file.reference.cdaclient.jar=lib/cdaclient.jar
-file.reference.junit-4.11.jar=../lib/test/junit-4.11.jar
-file.reference.config.jar=lib/config.jar
-file.reference.je-3.2.13.jar=lib/je-3.2.13.jar
-file.reference.protobuf-java-2.5.0.jar=../lib/protobuf-java-2.5.0.jar
-file.reference.xbean.jar=lib/xbean.jar
-file.reference.commons-codec-1.3.jar=../lib/commons-codec-1.3.jar
-includes=**
-jar.compress=true
-javac.classpath=\
- ${file.reference.commons-codec-1.3.jar}:\
- ${file.reference.protobuf-java-2.5.0.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=local
-jnlp.enabled=false
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-ea
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test
diff --git a/java/foundation/nbproject/project.xml b/java/foundation/nbproject/project.xml
deleted file mode 100644
index 489d87eac2c1d02370250ca159bc43b4a6ee448c..0000000000000000000000000000000000000000
--- a/java/foundation/nbproject/project.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- org.netbeans.modules.java.j2seproject
-
-
-
-
-
-
-
- XtreemFS-foundation
- 1.6.5
-
-
-
-
-
-
-
-
-
-
diff --git a/java/init_eclipse_projects_linux.sh b/java/init_eclipse_projects_linux.sh
deleted file mode 100755
index 4b8cd5417263cfecb49ad21966e564cc1a79004d..0000000000000000000000000000000000000000
--- a/java/init_eclipse_projects_linux.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-for p in flease foundation pbrpcgen servers
-do
- for f in .classpath .project
- do
- dest="${p}/${f}"
-
- if [ ! -f "$dest" ]
- then
- source="${p}/eclipse-project/${f}"
-
- if [ -f "$source" ]
- then
- cp "$source" "$dest"
- else
- echo "$source not found and therefore not copied."
- fi
- fi
- done
-done
-
-echo Finished.
-echo Press any key to continue...
-read
diff --git a/java/init_eclipse_projects_windows.bat b/java/init_eclipse_projects_windows.bat
deleted file mode 100644
index fae1741ea518d4d95a036acbff580ffeab0177ed..0000000000000000000000000000000000000000
--- a/java/init_eclipse_projects_windows.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-
-Setlocal EnableDelayedExpansion
-
-FOR %%p IN (flease foundation pbrpcgen servers) DO (
- FOR %%f IN (.classpath .project) DO (
- set dest=%CD%\%%p\%%f
-
- IF not exist !dest! (
- set source=%cd%\%%p\eclipse-project\%%f
-
- if exist !source! (
- copy "!source!" "!dest!"
- ) else (
- echo !source! not found and therefore not copied.
- )
- )
- )
-)
-
-echo Finished.
-pause
diff --git a/java/pbrpcgen/.gitignore b/java/pbrpcgen/.gitignore
deleted file mode 100644
index fe0266d96e1f37ccba57b81e121d796c32db7db6..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/build
-/.classpath
-/.project
-/.settings/
diff --git a/java/pbrpcgen/build.xml b/java/pbrpcgen/build.xml
deleted file mode 100644
index b6233fdf55f852e887427d73793b4d45d8012084..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project pbrpcgen.
-
-
-
diff --git a/java/pbrpcgen/dist/.gitignore b/java/pbrpcgen/dist/.gitignore
deleted file mode 100644
index 5630f257849162dddb793e5ab50a2ce37af56607..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/dist/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pbrpcgen.jar
-/javadoc/
diff --git a/java/pbrpcgen/eclipse-project/.classpath b/java/pbrpcgen/eclipse-project/.classpath
deleted file mode 100644
index 137c0564460367834cca1d5eb4222ff1d579253f..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/eclipse-project/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/java/pbrpcgen/eclipse-project/.project b/java/pbrpcgen/eclipse-project/.project
deleted file mode 100644
index 558879e484f8386ec35e998d984ffcfde5ed35f1..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/eclipse-project/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- xtreemfs_pbrpcgen
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/java/pbrpcgen/manifest.mf b/java/pbrpcgen/manifest.mf
deleted file mode 100644
index 328e8e5bc3b7f1f7bad2bc0751a933e00c801983..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/java/pbrpcgen/nbproject/build-impl.xml b/java/pbrpcgen/nbproject/build-impl.xml
deleted file mode 100644
index a5239809da3895ece15fda5ffe8ada75db24e968..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1040 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/pbrpcgen/nbproject/genfiles.properties b/java/pbrpcgen/nbproject/genfiles.properties
deleted file mode 100644
index 5e10c1765c2f41c7a7185cdb25417d3d229edc19..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=ab7e35e7
-build.xml.script.CRC32=3c7d4959
-build.xml.stylesheet.CRC32=28e38971@1.38.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ab7e35e7
-nbproject/build-impl.xml.script.CRC32=64bc69d8
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/java/pbrpcgen/nbproject/private/private.properties b/java/pbrpcgen/nbproject/private/private.properties
deleted file mode 100644
index ba93c2bc7e762c6d558dcabaaa368f4c1e3a25e0..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/nbproject/private/private.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=/home/kleineweber/.netbeans/7.0/build.properties
diff --git a/java/pbrpcgen/nbproject/private/private.xml b/java/pbrpcgen/nbproject/private/private.xml
deleted file mode 100644
index e396670755784287fca586bf48b84fa77d30799a..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/nbproject/private/private.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/java/pbrpcgen/nbproject/project.properties b/java/pbrpcgen/nbproject/project.properties
deleted file mode 100644
index 268b2afeff37d37f00885a9293720603e53298fe..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/nbproject/project.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=pbrpcgen
-application.vendor=kleineweber
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/pbrpcgen.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.protobuf-java-2.5.0.jar=../lib/protobuf-java-2.5.0.jar
-includes=**
-jar.compress=false
-javac.classpath=\
- ${file.reference.protobuf-java-2.5.0.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
-javac.test.processorpath=\
- ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/java/pbrpcgen/nbproject/project.xml b/java/pbrpcgen/nbproject/project.xml
deleted file mode 100644
index 96393cbf25609110747c82da06c26716017d63bd..0000000000000000000000000000000000000000
--- a/java/pbrpcgen/nbproject/project.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- org.netbeans.modules.java.j2seproject
-
-
- pbrpcgen
-
-
-
-
-
-
-
-
-
diff --git a/java/pom.xml b/java/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d76c1591afe3ae473ef6700d545eb643fb05402a
--- /dev/null
+++ b/java/pom.xml
@@ -0,0 +1,40 @@
+
+ 4.0.0
+
+ org.xtreemfs
+ xtreemfs-parent
+ 1.5.1-SNAPSHOT
+
+ xtreemfs
+ pom
+ http://xtreemfs.org
+ 2006
+
+
+
+ The New BSD License
+ https://raw.githubusercontent.com/xtreemfs/xtreemfs/master/LICENSE
+ repo
+
+
+
+
+ https://github.com/xtreemfs/xtreemfs
+ git@github.com:xtreemfs/xtreemfs.git
+ scm:git:https://github.com/xtreemfs/xtreemfs.git
+
+
+
+ xtreemfs-foundation
+ xtreemfs-flease
+ xtreemfs-pbrpcgen
+ xtreemfs-servers
+
+
+
+ 1.3
+ 2.5.0
+ 4.12
+
+
diff --git a/java/servers/.gitignore b/java/servers/.gitignore
deleted file mode 100644
index 8ab0d42fa43730e5ef06b2f32ce5f7b98402a5d6..0000000000000000000000000000000000000000
--- a/java/servers/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/build
-/dist
-/*.classpath
-/*.project
-/bin/
-/.settings/
diff --git a/java/servers/build-1.6.5.xml b/java/servers/build-1.6.5.xml
deleted file mode 100644
index d29dbe032e1f43a7e2548424a6a9a0fcf973de8e..0000000000000000000000000000000000000000
--- a/java/servers/build-1.6.5.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project XtreemFS.
-
-
-
-
-
- Creating XtreemFS-tests.jar.
-
-
-
-
-
-
-
-
diff --git a/java/servers/build-before-profiler.xml b/java/servers/build-before-profiler.xml
deleted file mode 100644
index edc846a978b9ce55f96db756469d10b1e401e5af..0000000000000000000000000000000000000000
--- a/java/servers/build-before-profiler.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project XtreemFS.
-
-
-
diff --git a/java/servers/build.xml b/java/servers/build.xml
deleted file mode 100644
index 4b2982bba1ab478727ad5f19eb48b99ccb5c1509..0000000000000000000000000000000000000000
--- a/java/servers/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project XtreemFS.
-
-
-
-
-
- Creating XtreemFS-tests.jar.
-
-
-
-
-
-
-
-
diff --git a/java/servers/eclipse-project/.classpath b/java/servers/eclipse-project/.classpath
deleted file mode 100644
index a1ecfe095da4e044ff37fe0530ea400396886c49..0000000000000000000000000000000000000000
--- a/java/servers/eclipse-project/.classpath
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/servers/eclipse-project/.classpath_WITH_BabuDB_project_reference b/java/servers/eclipse-project/.classpath_WITH_BabuDB_project_reference
deleted file mode 100644
index cc974c5e867aeae9db92ade0269979c4b6d27f9b..0000000000000000000000000000000000000000
--- a/java/servers/eclipse-project/.classpath_WITH_BabuDB_project_reference
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/servers/eclipse-project/.project b/java/servers/eclipse-project/.project
deleted file mode 100644
index 340689237bd2091c3f1610e3971f27f56a02993f..0000000000000000000000000000000000000000
--- a/java/servers/eclipse-project/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- xtreemfs_server
-
-
- xtreemfs_foundation
- xtreemfs_flease
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/java/servers/nbproject/.gitignore b/java/servers/nbproject/.gitignore
deleted file mode 100644
index 9fc4f782a14b382837a566736c3faade619884f8..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/private
-/configs
diff --git a/java/servers/nbproject/build-impl-1.6.5.xml b/java/servers/nbproject/build-impl-1.6.5.xml
deleted file mode 100644
index 7cba3bbcac5c725be87687ceb16dfd21e88279b5..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/build-impl-1.6.5.xml
+++ /dev/null
@@ -1,682 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/servers/nbproject/build-impl.xml b/java/servers/nbproject/build-impl.xml
deleted file mode 100644
index 6b17438b4478bc49588c46e7f5ab169f46ab409e..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1068 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/servers/nbproject/genfiles.properties b/java/servers/nbproject/genfiles.properties
deleted file mode 100644
index 3dc30e2493c63a9ad554abf8685e4d8fdcf12274..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/genfiles.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-build.xml.data.CRC32=4a9eff70
-build.xml.script.CRC32=ce2ddeb0
-build.xml.stylesheet.CRC32=958a1d3e
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=53818f37
-nbproject/build-impl.xml.script.CRC32=42a9c2ae
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
-nbproject/profiler-build-impl.xml.data.CRC32=4a9eff70
-nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
-nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf
diff --git a/java/servers/nbproject/profiler-build-impl.xml b/java/servers/nbproject/profiler-build-impl.xml
deleted file mode 100644
index 7c8995daf1d34abbd91341a73cfa5b9339bce187..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/profiler-build-impl.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/servers/nbproject/project.properties b/java/servers/nbproject/project.properties
deleted file mode 100644
index e0ed1d9309f390c20041111e3e551cdf492606ee..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/project.properties
+++ /dev/null
@@ -1,103 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-application.args=
-application.title=XtreemFS
-application.vendor=bjko
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/XtreemFS.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.BabuDB.jar-1=../lib/BabuDB.jar
-file.reference.bcprov-jdk16-139.jar=lib/bcprov-jdk16-139.jar
-file.reference.cdaclient.jar=lib/cdaclient.jar
-file.reference.junit-4.11.jar=../lib/test/junit-4.11.jar
-file.reference.config.jar=lib/config.jar
-file.reference.je-3.2.13.jar=lib/je-3.2.13.jar
-file.reference.protobuf-java-2.5.0.jar=../lib/protobuf-java-2.5.0.jar
-file.reference.xbean.jar=lib/xbean.jar
-file.reference.jdmkrt.jar=../lib/jdmkrt.jar
-file.reference.jdmktk.jar=../lib/jdmktk.jar
-file.reference.rabbitmq-client.jar=../lib/rabbitmq-client.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
- ${file.reference.BabuDB.jar-1}:\
- ${file.reference.protobuf-java-2.5.0.jar}:\
- ${reference.XtreemFS-foundation.jar}:\
- ${reference.Flease.jar}:\
- ${file.reference.junit-4.11.jar}:\
- ${file.reference.jdmkrt.jar}:\
- ${file.reference.jdmktk.jar}:\
- ${file.reference.rabbitmq-client.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/home/bjko/xtreemos/xtreemfs/googlecode/servers/dist
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=org.xtreemfs.mrc.MRC
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-project.Flease=../flease
-project.XtreemFS-foundation=../foundation
-reference.Flease.jar=${project.Flease}/dist/Flease.jar
-reference.XtreemFS-foundation.jar=${project.XtreemFS-foundation}/dist/Foundation.jar
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-ea
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test
diff --git a/java/servers/nbproject/project.xml b/java/servers/nbproject/project.xml
deleted file mode 100644
index f108ba503983306eeb683bf9ca8369b724f75c93..0000000000000000000000000000000000000000
--- a/java/servers/nbproject/project.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
- org.netbeans.modules.java.j2seproject
-
-
- XtreemFS
- 1.6.5
-
-
-
-
-
-
-
-
-
- Flease
- jar
-
- jar
- clean
- jar
-
-
- XtreemFS-foundation
- jar
-
- jar
- clean
- jar
-
-
-
-
diff --git a/java/xtreemfs-flease/pom.xml b/java/xtreemfs-flease/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1bc35bb03fd78edeb7929a8e73b0a0f8ce7d172a
--- /dev/null
+++ b/java/xtreemfs-flease/pom.xml
@@ -0,0 +1,31 @@
+
+ 4.0.0
+
+
+ org.xtreemfs
+ xtreemfs-parent
+ 1.5.1-SNAPSHOT
+ ..
+
+
+ xtreemfs-flease
+ xtreemfs-flease
+
+ jar
+
+
+
+ org.xtreemfs
+ xtreemfs-foundation
+ ${project.version}
+
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/Flease.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/Flease.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/Flease.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/Flease.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseConfig.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseConfig.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseConfig.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseConfig.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseFuture.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseFuture.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseFuture.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseFuture.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseStage.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStage.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseStage.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStage.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseStats.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStats.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseStats.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStats.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseStatusListener.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStatusListener.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseStatusListener.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStatusListener.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/FleaseMessage.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/FleaseMessage.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/FleaseMessage.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/FleaseMessage.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/ProposalNumber.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/ProposalNumber.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/ProposalNumber.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/ProposalNumber.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/proposer/CellAction.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/CellAction.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/proposer/CellAction.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/CellAction.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseException.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseException.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseException.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseException.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseListener.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseListener.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseListener.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseListener.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseProposer.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposer.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseProposer.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposer.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/sim/Communicator.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/Communicator.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/sim/Communicator.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/Communicator.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/sim/DelayedDelivery.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/DelayedDelivery.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/sim/DelayedDelivery.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/DelayedDelivery.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/sim/FleaseMultiSim.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/FleaseMultiSim.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/sim/FleaseMultiSim.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/FleaseMultiSim.java
diff --git a/java/flease/src/org/xtreemfs/foundation/flease/sim/FleaseSim.java b/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/FleaseSim.java
similarity index 100%
rename from java/flease/src/org/xtreemfs/foundation/flease/sim/FleaseSim.java
rename to java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/FleaseSim.java
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/Flease.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/Flease.class
new file mode 100644
index 0000000000000000000000000000000000000000..b7f0cd5aa7e17266e8d9c50d979ca2566a1b0be1
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/Flease.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseConfig.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseConfig.class
new file mode 100644
index 0000000000000000000000000000000000000000..d76474794ddcee8fbe0c798db3925c029b490e78
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseConfig.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseFuture.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseFuture.class
new file mode 100644
index 0000000000000000000000000000000000000000..2866967b225d3c5122659f6011719f8358d88c39
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseFuture.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..1875c027dce2d320924077784e6b132b13d4e72c
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..f2c7f541a46764b38ebe7988e12315d82edc7f0c
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$2.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..d5217ccf66d3d3a2b7c97d488efb4f8be3038b02
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$2.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$3.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$3.class
new file mode 100644
index 0000000000000000000000000000000000000000..8e3839c69a82f4227d8bd84c8ab60f7abdba7e4e
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$3.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$4.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$4.class
new file mode 100644
index 0000000000000000000000000000000000000000..99cb615ff11f2394111d8dc599a87b4f03377a15
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$4.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$5.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$5.class
new file mode 100644
index 0000000000000000000000000000000000000000..4a59873832f6e194cd8530754fbfae7722b70c19
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$5.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$6.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$6.class
new file mode 100644
index 0000000000000000000000000000000000000000..9c0c646e51dd7dba5d35666b8f2d895f2d6c5d6c
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$6.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$FleaseStateCallback.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$FleaseStateCallback.class
new file mode 100644
index 0000000000000000000000000000000000000000..5a5ca82755cbb727d81870f7d16a212031f7273d
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$FleaseStateCallback.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$Request$RequestType.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$Request$RequestType.class
new file mode 100644
index 0000000000000000000000000000000000000000..aa848a4f359a1dcd00dff9d32511b12c9c448564
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$Request$RequestType.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$Request.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$Request.class
new file mode 100644
index 0000000000000000000000000000000000000000..7e3086ac6e2c287770abc4702c6adce0604971a0
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$Request.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$TimerEntry.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$TimerEntry.class
new file mode 100644
index 0000000000000000000000000000000000000000..fd9a106929f3a9466a38a1696322307de0314e81
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage$TimerEntry.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage.class
new file mode 100644
index 0000000000000000000000000000000000000000..4640c81cf07f1d9dc42f7f23ceed7e249160afad
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStage.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStats.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStats.class
new file mode 100644
index 0000000000000000000000000000000000000000..f93f9f1980e1fc61dd9f2f34d0a54728fb50062d
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStats.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStatusListener.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStatusListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..3ed5c768409b53b0c2790e0031200829466198cc
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseStatusListener.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..3c973c2c3e26d257cf46cc0447b9bfad911cb29f
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface$Continuation.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface$Continuation.class
new file mode 100644
index 0000000000000000000000000000000000000000..dda8cf33d7eb473dcbe25425185f1d242c755ea7
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface$Continuation.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..c29762e8134b4cf377205bd89978b126275f2b3c
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..8cbd5434e24d6ee773b839aebc90da7803a29a38
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request$RequestType.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request$RequestType.class
new file mode 100644
index 0000000000000000000000000000000000000000..b548d1af17d3d7bec70538481cac01084d99bd7e
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request$RequestType.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request.class
new file mode 100644
index 0000000000000000000000000000000000000000..4fe290983a1130b1dbdaa3dff02215f3445b5520
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.class
new file mode 100644
index 0000000000000000000000000000000000000000..6905dc345db3c2abf361a722e34b03c3c01ce3a5
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.class
new file mode 100644
index 0000000000000000000000000000000000000000..bcf982e613c25ed3c9d3a403214bdfb998d7b621
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.class
new file mode 100644
index 0000000000000000000000000000000000000000..085793ed688fb1e71e981f87aba0190f1b84ba43
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.class
new file mode 100644
index 0000000000000000000000000000000000000000..40a0503207d61717629357de796b46c3a0da3af7
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.class
new file mode 100644
index 0000000000000000000000000000000000000000..2ffcc06e400d669182e7c55f5828994eda67de60
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..997ce42d11a12c9eccdc4d43a24f179345349237
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..6daf7e2ae8667da0226ad7ffe0c6382f4f974301
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseMessage$MsgType.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseMessage$MsgType.class
new file mode 100644
index 0000000000000000000000000000000000000000..a3695b5139d7fb46c6f3fff6043202b7ef0b6607
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseMessage$MsgType.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseMessage.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseMessage.class
new file mode 100644
index 0000000000000000000000000000000000000000..a661ec378e4b92127253b2acc514f343b6ce213b
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/FleaseMessage.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/ProposalNumber.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/ProposalNumber.class
new file mode 100644
index 0000000000000000000000000000000000000000..f2ef50c48ee0273992e67c970d143249d8a094f8
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/ProposalNumber.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoClient$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoClient$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..81e974a3ca2671490ff3729f2736e36d66c25ab5
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoClient$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.class
new file mode 100644
index 0000000000000000000000000000000000000000..eb97c90af00c6795b1f616de2737555adb69d57d
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.class
new file mode 100644
index 0000000000000000000000000000000000000000..6fc0709b9458bae3321a12bf23efcb03c6764d9f
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.class
new file mode 100644
index 0000000000000000000000000000000000000000..05236b0c19a0cc84d14a5b8c08d231311d1b97c7
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.class
new file mode 100644
index 0000000000000000000000000000000000000000..0c78d6347fa33c00d4e49c2f6f301f0bad5631b6
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..d6a8fb545b0c105735ffeb0c647b689b02d093b0
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient$ClientConnection.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient$ClientConnection.class
new file mode 100644
index 0000000000000000000000000000000000000000..9081da083c3b7e6b1251b353ed095b073513f7c9
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient$ClientConnection.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.class
new file mode 100644
index 0000000000000000000000000000000000000000..8302518a135b997ad463c9db4267c4888d9adf40
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.class
new file mode 100644
index 0000000000000000000000000000000000000000..32dd0b0c4e72933e521cd35a93677e4a0c792dda
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection$SendRequest.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection$SendRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..3723912c22a28a0ea537a662ed6ea368a17802a1
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection$SendRequest.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.class
new file mode 100644
index 0000000000000000000000000000000000000000..a6708e003a8a5e85dbc9c3db4395737d3b13d5f8
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..43a6115c74adca34ffa616b051bdf052d27ce5d7
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$Connection.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$Connection.class
new file mode 100644
index 0000000000000000000000000000000000000000..29aa089ea2fe1663abf0cfc635fdbe696608c2ec
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$Connection.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.class
new file mode 100644
index 0000000000000000000000000000000000000000..2df3b3f85ec5c5eda46b52143244fb5459eb1554
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction$ActionName.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction$ActionName.class
new file mode 100644
index 0000000000000000000000000000000000000000..2b14799985dc2458cd93c866c25d3b85b0de13f8
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction$ActionName.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction$CellActionList.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction$CellActionList.class
new file mode 100644
index 0000000000000000000000000000000000000000..5e55735745d5589c6767839dd0b9550dc853d2a6
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction$CellActionList.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction.class
new file mode 100644
index 0000000000000000000000000000000000000000..f38ab039c3635f547be9f52f2a557feb8f7b31bd
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/CellAction.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseException.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseException.class
new file mode 100644
index 0000000000000000000000000000000000000000..298fc3a42c8568585add09b11b3dbd9b1f9188e4
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseException.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseListener.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..60653c015c1a04dff918f5b7b88d1816d89d28f1
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseListener.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..67a12bc7d205e36a01f3718ce91e57ebd1d5c282
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..a489b20b12439508720851fe44cb64fab05ef88a
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$2.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..ae22960be3333b43a241f21fafd666974d187ad4
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$2.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$3.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$3.class
new file mode 100644
index 0000000000000000000000000000000000000000..033b948d7fa6f6652e1dc57b8c5494e7217b2588
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer$3.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer.class
new file mode 100644
index 0000000000000000000000000000000000000000..64d27654b82f6ab917f1c821daa9d02a3f13104d
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposer.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell$State.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell$State.class
new file mode 100644
index 0000000000000000000000000000000000000000..171fefabe787827277f92253e2beb1842c2b977d
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell$State.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.class
new file mode 100644
index 0000000000000000000000000000000000000000..e510e984fed2d243faeff2745ff5eaf214530787
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/Communicator$Packet.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/Communicator$Packet.class
new file mode 100644
index 0000000000000000000000000000000000000000..326c8966f128401137d4b3825c7aa33d5f22c5ea
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/Communicator$Packet.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/Communicator.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/Communicator.class
new file mode 100644
index 0000000000000000000000000000000000000000..9c42b1e4f463179d03df814a703471fb0e69b8d2
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/Communicator.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/DelayedDelivery$DelayPacket.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/DelayedDelivery$DelayPacket.class
new file mode 100644
index 0000000000000000000000000000000000000000..22910c8592422d69aa6ae60a6f7ce94915c3e37c
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/DelayedDelivery$DelayPacket.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/DelayedDelivery.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/DelayedDelivery.class
new file mode 100644
index 0000000000000000000000000000000000000000..9a38044cf239ecc269f4cc94f572392aab2944c3
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/DelayedDelivery.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$1.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..87e295815a93a3d546a81f25ce9783bb8c94b0ee
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$1.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$2.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..a8d720d286549f47184a3e20523ebde7990c3adb
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$2.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$3.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$3.class
new file mode 100644
index 0000000000000000000000000000000000000000..5e9e4185da131c4f48fe4312a1b8fc1ab4609ba8
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$3.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$4.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$4.class
new file mode 100644
index 0000000000000000000000000000000000000000..f51f661dba63ec583baa9e434558aaf98e7104f5
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$4.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$5.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$5.class
new file mode 100644
index 0000000000000000000000000000000000000000..b3b029b4d6723098432f9ee154031c51e2aef546
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim$5.class differ
diff --git a/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim.class b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim.class
new file mode 100644
index 0000000000000000000000000000000000000000..4931edd0ebd3fd02f72fb5ddb70956af7122ee09
Binary files /dev/null and b/java/xtreemfs-flease/target/classes/org/xtreemfs/foundation/flease/sim/FleaseSim.class differ
diff --git a/java/xtreemfs-flease/target/maven-archiver/pom.properties b/java/xtreemfs-flease/target/maven-archiver/pom.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4824cd5be984e43653cc63cda81178eaf743fb00
--- /dev/null
+++ b/java/xtreemfs-flease/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Jun 28 10:11:06 CEST 2016
+version=1.5.1-SNAPSHOT
+groupId=org.xtreemfs
+artifactId=xtreemfs-flease
diff --git a/java/xtreemfs-flease/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/java/xtreemfs-flease/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..4d79c63e0cb7e85562ddea6fd5754b2a47823eda
--- /dev/null
+++ b/java/xtreemfs-flease/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,69 @@
+org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.class
+org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$1.class
+org/xtreemfs/foundation/flease/proposer/FleaseProposer.class
+org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.class
+org/xtreemfs/foundation/flease/proposer/FleaseProposer$1.class
+org/xtreemfs/foundation/flease/proposer/FleaseProposer$2.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPClient.class
+org/xtreemfs/foundation/flease/proposer/CellAction.class
+org/xtreemfs/foundation/flease/FleaseStage.class
+org/xtreemfs/foundation/flease/FleaseStage$3.class
+org/xtreemfs/foundation/flease/UDPFleaseCommunicator.class
+org/xtreemfs/foundation/flease/sim/DelayedDelivery.class
+org/xtreemfs/foundation/flease/sim/FleaseSim$5.class
+org/xtreemfs/foundation/flease/proposer/FleaseException.class
+org/xtreemfs/foundation/flease/comm/tcp/EchoClient.class
+org/xtreemfs/foundation/flease/comm/ProposalNumber.class
+org/xtreemfs/foundation/flease/sim/FleaseSim$2.class
+org/xtreemfs/foundation/flease/acceptor/FleaseInstance.class
+org/xtreemfs/foundation/flease/comm/tcp/EchoClient$1.class
+org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.class
+org/xtreemfs/foundation/flease/sim/FleaseSim$4.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.class
+org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPClient$ClientConnection.class
+org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.class
+org/xtreemfs/foundation/flease/acceptor/LearnEventListener.class
+org/xtreemfs/foundation/flease/Flease.class
+org/xtreemfs/foundation/flease/comm/FleaseMessage.class
+org/xtreemfs/foundation/flease/FleaseFuture.class
+org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.class
+org/xtreemfs/foundation/flease/sim/Communicator.class
+org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request.class
+org/xtreemfs/foundation/flease/FleaseStage$6.class
+org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.class
+org/xtreemfs/foundation/flease/sim/DelayedDelivery$DelayPacket.class
+org/xtreemfs/foundation/flease/proposer/FleaseListener.class
+org/xtreemfs/foundation/flease/comm/tcp/EchoServer.class
+org/xtreemfs/foundation/flease/FleaseStage$Request$RequestType.class
+org/xtreemfs/foundation/flease/MasterEpochHandlerInterface$Continuation.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPClient$1.class
+org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.class
+org/xtreemfs/foundation/flease/FleaseStats.class
+org/xtreemfs/foundation/flease/FleaseStage$Request.class
+org/xtreemfs/foundation/flease/sim/FleaseSim$1.class
+org/xtreemfs/foundation/flease/FleaseStage$5.class
+org/xtreemfs/foundation/flease/FleaseConfig.class
+org/xtreemfs/foundation/flease/proposer/CellAction$CellActionList.class
+org/xtreemfs/foundation/flease/proposer/CellAction$ActionName.class
+org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$Connection.class
+org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator$1.class
+org/xtreemfs/foundation/flease/SimpleMasterEpochHandler$Request$RequestType.class
+org/xtreemfs/foundation/flease/comm/tcp/NIOServer.class
+org/xtreemfs/foundation/flease/proposer/FleaseProposer$3.class
+org/xtreemfs/foundation/flease/FleaseStage$2.class
+org/xtreemfs/foundation/flease/FleaseStage$TimerEntry.class
+org/xtreemfs/foundation/flease/sim/Communicator$Packet.class
+org/xtreemfs/foundation/flease/FleaseStatusListener.class
+org/xtreemfs/foundation/flease/FleaseStage$4.class
+org/xtreemfs/foundation/flease/comm/tcp/TCPConnection$SendRequest.class
+org/xtreemfs/foundation/flease/sim/FleaseSim.class
+org/xtreemfs/foundation/flease/FleaseStage$1.class
+org/xtreemfs/foundation/flease/FleaseStage$FleaseStateCallback.class
+org/xtreemfs/foundation/flease/comm/FleaseMessage$MsgType.class
+org/xtreemfs/foundation/flease/sim/FleaseSim$3.class
+org/xtreemfs/foundation/flease/proposer/FleaseProposerCell$State.class
diff --git a/java/xtreemfs-flease/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/java/xtreemfs-flease/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..ab7a7578ce905353b1d3b2490e1461fd40fd478e
--- /dev/null
+++ b/java/xtreemfs-flease/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,36 @@
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseViewChangeListenerInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/FleaseSim.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/FleaseMessage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseMessageSenderInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/NIOServer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPCommunicator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/EchoServer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStatusListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/DelayedDelivery.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/SimpleMasterEpochHandler.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseInstance.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseStats.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/CellAction.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseLocalQueueInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/ProposalNumber.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/FleaseMultiSim.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/sim/Communicator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseFuture.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/MasterEpochHandlerInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/EchoClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/FleaseCommunicationInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/NIOConnection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorCell.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPConnection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/LearnEventListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/UDPFleaseCommunicator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/comm/tcp/TCPFleaseCommunicator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/Flease.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/FleaseConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposerCell.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-flease/src/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptor.java
diff --git a/java/xtreemfs-flease/target/xtreemfs-flease-1.5.1-SNAPSHOT.jar b/java/xtreemfs-flease/target/xtreemfs-flease-1.5.1-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d01a85289fc8715aea343b8c2b92294588fd42a6
Binary files /dev/null and b/java/xtreemfs-flease/target/xtreemfs-flease-1.5.1-SNAPSHOT.jar differ
diff --git a/java/flease/test/org/xtreemfs/foundation/flease/FleaseStageTest.java b/java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/FleaseStageTest.java
similarity index 100%
rename from java/flease/test/org/xtreemfs/foundation/flease/FleaseStageTest.java
rename to java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/FleaseStageTest.java
diff --git a/java/flease/test/org/xtreemfs/foundation/flease/MasterEpochTest.java b/java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/MasterEpochTest.java
similarity index 100%
rename from java/flease/test/org/xtreemfs/foundation/flease/MasterEpochTest.java
rename to java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/MasterEpochTest.java
diff --git a/java/flease/test/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorTest.java b/java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorTest.java
similarity index 100%
rename from java/flease/test/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorTest.java
rename to java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/acceptor/FleaseAcceptorTest.java
diff --git a/java/flease/test/org/xtreemfs/foundation/flease/comm/FleaseMessageTest.java b/java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/comm/FleaseMessageTest.java
similarity index 100%
rename from java/flease/test/org/xtreemfs/foundation/flease/comm/FleaseMessageTest.java
rename to java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/comm/FleaseMessageTest.java
diff --git a/java/flease/test/org/xtreemfs/foundation/flease/proposer/FleaseProposerTest.java b/java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposerTest.java
similarity index 100%
rename from java/flease/test/org/xtreemfs/foundation/flease/proposer/FleaseProposerTest.java
rename to java/xtreemfs-flease/test/main/java/org/xtreemfs/foundation/flease/proposer/FleaseProposerTest.java
diff --git a/java/xtreemfs-foundation/pom.xml b/java/xtreemfs-foundation/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..45290610bf87cf4d552eae5bca91e1821358f0bd
--- /dev/null
+++ b/java/xtreemfs-foundation/pom.xml
@@ -0,0 +1,37 @@
+
+ 4.0.0
+
+
+ org.xtreemfs
+ xtreemfs-parent
+ 1.5.1-SNAPSHOT
+ ..
+
+
+ xtreemfs-foundation
+ xtreemfs-foundation
+
+ jar
+
+
+
+ commons-codec
+ commons-codec
+ ${commons-codec.version}
+
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf-java.version}
+
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+
diff --git a/java/foundation/src/org/xtreemfs/foundation/CrashReporter.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/CrashReporter.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/CrashReporter.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/CrashReporter.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/LRUCache.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LRUCache.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/LRUCache.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LRUCache.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/LifeCycleListener.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LifeCycleListener.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/LifeCycleListener.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LifeCycleListener.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/LifeCycleThread.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LifeCycleThread.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/LifeCycleThread.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LifeCycleThread.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/SSLOptions.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/SSLOptions.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/SSLOptions.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/SSLOptions.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/TimeServerClient.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/TimeServerClient.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/TimeServerClient.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/TimeServerClient.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/TimeSync.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/TimeSync.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/TimeSync.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/TimeSync.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/VersionManagement.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/VersionManagement.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/VersionManagement.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/VersionManagement.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/buffer/ASCIIString.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/ASCIIString.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/buffer/ASCIIString.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/ASCIIString.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/buffer/BufferPool.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/BufferPool.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/buffer/BufferPool.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/BufferPool.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/buffer/ReusableBuffer.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/ReusableBuffer.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/buffer/ReusableBuffer.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/ReusableBuffer.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/ChecksumFactory.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumFactory.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/ChecksumFactory.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumFactory.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/ChecksumProvider.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumProvider.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/ChecksumProvider.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumProvider.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/Adler32.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/Adler32.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/Adler32.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/Adler32.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/CRC32.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/CRC32.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/CRC32.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/CRC32.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/JavaHash.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/JavaHash.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/JavaHash.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/JavaHash.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/SDBM.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/SDBM.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/algorithms/SDBM.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/SDBM.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/json/JSONCharBufferString.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONCharBufferString.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/json/JSONCharBufferString.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONCharBufferString.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/json/JSONException.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONException.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/json/JSONException.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONException.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/json/JSONInput.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONInput.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/json/JSONInput.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONInput.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/json/JSONParser.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONParser.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/json/JSONParser.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONParser.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/json/JSONString.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONString.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/json/JSONString.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONString.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/logging/Logging.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/logging/Logging.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/logging/Logging.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/logging/Logging.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/logging/Utils.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/logging/Utils.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/logging/Utils.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/logging/Utils.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/monitoring/ListMonitoring.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/ListMonitoring.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/monitoring/ListMonitoring.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/ListMonitoring.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/monitoring/Monitoring.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/Monitoring.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/monitoring/Monitoring.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/Monitoring.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/monitoring/MonitoringEvent.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringEvent.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/monitoring/MonitoringEvent.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringEvent.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/monitoring/MonitoringListener.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringListener.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/monitoring/MonitoringListener.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringListener.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/monitoring/MonitoringLog.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringLog.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/monitoring/MonitoringLog.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringLog.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/monitoring/NumberMonitoring.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/NumberMonitoring.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/monitoring/NumberMonitoring.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/NumberMonitoring.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/Schemes.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/Schemes.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/Schemes.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/Schemes.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/PBRPCException.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/PBRPCException.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/PBRPCException.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/PBRPCException.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCResponse.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponse.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCResponse.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponse.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/server/UDPMessage.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/UDPMessage.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/server/UDPMessage.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/UDPMessage.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/trace/Tracer.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/trace/Tracer.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/trace/Tracer.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/trace/Tracer.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/CLIParser.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLIParser.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/CLIParser.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLIParser.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/CLOption.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLOption.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/CLOption.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLOption.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/CLOptionParser.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLOptionParser.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/CLOptionParser.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLOptionParser.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/FSUtils.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/FSUtils.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/FSUtils.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/FSUtils.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/InvalidUsageException.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/InvalidUsageException.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/InvalidUsageException.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/InvalidUsageException.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/OutputUtils.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/OutputUtils.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/OutputUtils.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/OutputUtils.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/PBRPCServiceURL.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/PBRPCServiceURL.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/PBRPCServiceURL.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/PBRPCServiceURL.java
diff --git a/java/foundation/src/org/xtreemfs/foundation/util/PingServer.java b/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/PingServer.java
similarity index 100%
rename from java/foundation/src/org/xtreemfs/foundation/util/PingServer.java
rename to java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/PingServer.java
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/CrashReporter.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/CrashReporter.class
new file mode 100644
index 0000000000000000000000000000000000000000..f18c613d34bccd1ad29ec7b6d33ce15c0d14b865
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/CrashReporter.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LRUCache.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LRUCache.class
new file mode 100644
index 0000000000000000000000000000000000000000..f1e770f5f18a355e9a1b3eb290bd74fe23bc840f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LRUCache.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LifeCycleListener.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LifeCycleListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..6e4056d4d3f92cd53218b3d24a6b9b06ed8f0cef
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LifeCycleListener.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LifeCycleThread.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LifeCycleThread.class
new file mode 100644
index 0000000000000000000000000000000000000000..227943585239d29c6beb21eff98888134ec739b0
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/LifeCycleThread.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..52e1e27c1ffbc62cbfc88dac90c220b8e038c968
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$NoAuthTrustStore.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$NoAuthTrustStore.class
new file mode 100644
index 0000000000000000000000000000000000000000..b82d0d7602ab79ebaf5d096fa364a10f1c9e3d26
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$NoAuthTrustStore.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$TrustManager.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$TrustManager.class
new file mode 100644
index 0000000000000000000000000000000000000000..bec1fcfc758115028b87fea14d2eba603ac1dcc4
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions$TrustManager.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions.class
new file mode 100644
index 0000000000000000000000000000000000000000..b6bebcad9725be8e2e870c905119f680c126638f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/SSLOptions.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeServerClient.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeServerClient.class
new file mode 100644
index 0000000000000000000000000000000000000000..5ef1be2674c561bf20f2feeea265a7f11ca859f5
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeServerClient.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..539f1bc8b290fd7ad1ab03f40b3c693300ff3041
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync$ExtSyncSource.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync$ExtSyncSource.class
new file mode 100644
index 0000000000000000000000000000000000000000..df982df1b694f513cc45673e82c7a5197cca8c80
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync$ExtSyncSource.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync.class
new file mode 100644
index 0000000000000000000000000000000000000000..516f6d2129f0417db75b190890201e8630db8e22
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/TimeSync.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/VersionManagement.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/VersionManagement.class
new file mode 100644
index 0000000000000000000000000000000000000000..793d9e1dd56c16ca26ac82287277d8a1e30eafdf
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/VersionManagement.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/ASCIIString.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/ASCIIString.class
new file mode 100644
index 0000000000000000000000000000000000000000..c1fbfaa9a08d2ed8d6d566315ea2807ca49cbcf3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/ASCIIString.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/BufferPool.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/BufferPool.class
new file mode 100644
index 0000000000000000000000000000000000000000..7f79faf740cc571600ea781d6e73a0dc5c4ef8c9
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/BufferPool.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/ReusableBuffer.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/ReusableBuffer.class
new file mode 100644
index 0000000000000000000000000000000000000000..06ebbc16dfe5486774c43883a1d1f15b1c273d58
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/buffer/ReusableBuffer.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.class
new file mode 100644
index 0000000000000000000000000000000000000000..2fcc5f6fa15e9f16fa0cab67d1ed69306b747d44
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumFactory.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumFactory.class
new file mode 100644
index 0000000000000000000000000000000000000000..6d0fd8b6ffceb32ff5ecf662d06641a38db10df8
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumFactory.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumProvider.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..18dfb5215549ff6659c2612159e5f1172ec2ac89
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/ChecksumProvider.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.class
new file mode 100644
index 0000000000000000000000000000000000000000..cae076d337bad97657aebbd17138e56bb60efffa
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/Adler32.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/Adler32.class
new file mode 100644
index 0000000000000000000000000000000000000000..eba943c417f148ce5096f606c97bd57091803767
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/Adler32.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/CRC32.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/CRC32.class
new file mode 100644
index 0000000000000000000000000000000000000000..ed88610c89fad004d43c6023f64f593cf5f44872
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/CRC32.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.class
new file mode 100644
index 0000000000000000000000000000000000000000..4d24c21898dd3c4841c60ee6074bca1d4aec62f8
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/JavaHash.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/JavaHash.class
new file mode 100644
index 0000000000000000000000000000000000000000..6766925e81b0c43d61002b34264144f2fd4ae12d
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/JavaHash.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/SDBM.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/SDBM.class
new file mode 100644
index 0000000000000000000000000000000000000000..f88c1f3fee84eff4be59b0803ade5f5308009047
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/algorithms/SDBM.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..48a4f861e2f4dc28c96e42a0f929a2c659dac7eb
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONCharBufferString.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONCharBufferString.class
new file mode 100644
index 0000000000000000000000000000000000000000..99722963cdb99161b5c7b27f571396b0e2ca6fb7
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONCharBufferString.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONException.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONException.class
new file mode 100644
index 0000000000000000000000000000000000000000..e862ec5e5b0b8c0f1a243dd805254d4082d1aa84
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONException.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONInput.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONInput.class
new file mode 100644
index 0000000000000000000000000000000000000000..49f6938465c8a95c21f916ded63a28f5f0a18162
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONInput.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONParser.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONParser.class
new file mode 100644
index 0000000000000000000000000000000000000000..7ba64c4d36c6533888ed677cace9a9776add4ea8
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONParser.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONString.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONString.class
new file mode 100644
index 0000000000000000000000000000000000000000..f5a6150176f5b338f68edf979a66dfdb52ee9a5a
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/json/JSONString.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Logging$Category.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Logging$Category.class
new file mode 100644
index 0000000000000000000000000000000000000000..a186dc1bfd34e39e30eb838aa32f0d2a39edeaac
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Logging$Category.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Logging.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Logging.class
new file mode 100644
index 0000000000000000000000000000000000000000..ff5f1714c5acd18dd3e90b94a7a3436b4bb91607
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Logging.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Utils.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Utils.class
new file mode 100644
index 0000000000000000000000000000000000000000..89efa5fca9b4ffb53a5053a19d5c3f733e411cdc
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/logging/Utils.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/ListMonitoring.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/ListMonitoring.class
new file mode 100644
index 0000000000000000000000000000000000000000..f3e85fc4b6d36818618dd17ebbabe0e7db7fc8da
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/ListMonitoring.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/Monitoring.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/Monitoring.class
new file mode 100644
index 0000000000000000000000000000000000000000..f3bc8c26bc78594d8d9d4699a7e3e5038e93ebba
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/Monitoring.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringEvent.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringEvent.class
new file mode 100644
index 0000000000000000000000000000000000000000..1260124a2760dc48526d16526e0c82b3a3fd7e60
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringEvent.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringListener.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..3b6607728e82b992bf8d849753d2201ee936afa4
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringListener.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringLog.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringLog.class
new file mode 100644
index 0000000000000000000000000000000000000000..998630d2b3e1841d3c6d16ee2bcaeee4f6d76393
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/MonitoringLog.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/NumberMonitoring.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/NumberMonitoring.class
new file mode 100644
index 0000000000000000000000000000000000000000..e0b27e3a5f9c2f991cc5595022bfe39170db3813
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/monitoring/NumberMonitoring.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/Schemes.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/Schemes.class
new file mode 100644
index 0000000000000000000000000000000000000000..d39d0f3e7fb15f48cd47d802c3683b39b6e05493
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/Schemes.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.class
new file mode 100644
index 0000000000000000000000000000000000000000..67db879a7669ae65248a1868923740af1fd1994e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..6779873cd18281f8f52e179afe4890325f9062ec
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.class
new file mode 100644
index 0000000000000000000000000000000000000000..b2b99ec2c5fb629f72ee4d9eeff3027a156ef96c
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..282550d0470c695038f70ac659195424f2f58d2e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.class
new file mode 100644
index 0000000000000000000000000000000000000000..a4e8ef038d5346d68d5b43bbd28430655ef406d6
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/PBRPCException.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/PBRPCException.class
new file mode 100644
index 0000000000000000000000000000000000000000..b5d2244ff19d4de44fc8a43e53810aa6916d3c22
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/PBRPCException.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.class
new file mode 100644
index 0000000000000000000000000000000000000000..e9bc04698ead3d965a759e1c66fe39061da30cde
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.class
new file mode 100644
index 0000000000000000000000000000000000000000..86195e6ca671b0002dc9b8cded952e47c53fbaf3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..004dd7adb8437833130784136d90d4b8b4f8ff27
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..975ef756fff5d9ecc333f18bb203d2486106071b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.class
new file mode 100644
index 0000000000000000000000000000000000000000..819fa9f161b17a36e9c0a6273fd1141da486c5bf
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponse.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponse.class
new file mode 100644
index 0000000000000000000000000000000000000000..954a7241ff1a6db53c622509363188ecfe72f81f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponse.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..79a8570ce49b3189025c83d3d0b4b2c95a4c4739
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..7914f5b15139622937b580abc11338601adfba26
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..8f7c5517b973353fd3c2ab5cc14d701226ab009b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class
new file mode 100644
index 0000000000000000000000000000000000000000..8d7efea2739984bfc152c08422365a903a3bf743
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..429462736d0246782421319479083d6c5bc77d1e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..1972bde1704b0a4c61ef747f8ed3f52e728ba3e4
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..0147a62998af92af9905c298f623f17f8fbb9e5e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..b0cdcee6a763783f6c0fc10a068c9860ffef43f3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequestOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequestOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..d661bfeb23a271e523cd1cb83dae426afc933d8c
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequestOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..b87f294592812a690a23cb2d7fe4176dfea7721d
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..dc5dd71d86577675b4fb0159db36010de4304fcb
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..27a0bec492b3a28669e10287023c05b17fe94462
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..1418ccb60fb688c8d78cf8565df17814e2c97af5
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError.class
new file mode 100644
index 0000000000000000000000000000000000000000..14afbd3d21fbf5e946315a7bad6147020ed43669
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingErrorOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingErrorOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..a503ceeace80f87a9c1f6c1febdebee1cdeae533
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingErrorOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..51f9d7a7479e2f5f42f6fa901ee75e59ffeec98b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..0fa930c95c0389f16f792d0289357e53e13bb91f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult.class
new file mode 100644
index 0000000000000000000000000000000000000000..2d2068e53148d0e74fe90cf0e8610d2b45617498
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResultOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResultOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..8bf506959212098e1ba3a9a0acf28fca82577bcc
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResultOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse.class
new file mode 100644
index 0000000000000000000000000000000000000000..ce9d9efc2b954ac3e082b194c3ff498e1bb4d0c2
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponseOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponseOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..564e4cfe5ecff1abb1f4b4695a49dd3043b220e7
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponseOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..b13c61b0c25d9001bfe04d8108023b94fc66e539
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..5c75d1eb6eb7e3b39b3d55fa5d159ba36fe14d99
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..ab810f0041f59b49aa94b9f4d9c6c434f4a9a031
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequestOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequestOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..59ee761b0350b36ffc47081ea08962b152727f5e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequestOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..3e1db870301968dda596ee9662d40bfb280dfdff
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..c28bb027d14a752de15236cef2fd7618f076ebcc
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse.class
new file mode 100644
index 0000000000000000000000000000000000000000..12cf1a83f404389ab723f6287d3a151f54021c9e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponseOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponseOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..3edf2bd52bdeb56603b55c8d92ae35598a55abf4
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponseOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.class
new file mode 100644
index 0000000000000000000000000000000000000000..a91c0147dfb601a60f0dd7d6206bb9176778ef0a
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.class
new file mode 100644
index 0000000000000000000000000000000000000000..baab661b420458f693349a3ca1f28b87dd3c5afe
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.class
new file mode 100644
index 0000000000000000000000000000000000000000..2f88de33d11d3ca032ca1985c88697a073efafca
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..1e97b448d52fb99f0b5956c1f8d1d44f4aa7ed77
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..7bf61ac124cb9dfd957a5a8df7087d6921970334
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..b43fa84756796bc1774408549c47b18bc39c3a2e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth.class
new file mode 100644
index 0000000000000000000000000000000000000000..e4af5580a042d443a10b0854f740bafe24ce742b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..423040aec0436c243596d57afd0ad939f6e7b5b3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..9ec6be6a6bb722ac24cb9589b4fd0cc4ed2a229d
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..d0c7e8d072ea7316fa23c9bcc430ae680e085cd0
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword.class
new file mode 100644
index 0000000000000000000000000000000000000000..e7e05d2b9c880535fd77fc594d4131941a27eed2
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPasswordOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPasswordOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..47a6716c89e50890d579a09e5b919106973b0c04
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPasswordOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..597a9fe0591c61ff28101fef59a7c7536d5c7617
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType.class
new file mode 100644
index 0000000000000000000000000000000000000000..5fc6849ec5912145a0b04f86f067bf6f87f3174a
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..123db0cb7394651db224005708885ca80eb54437
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType.class
new file mode 100644
index 0000000000000000000000000000000000000000..7fd6ce36fe5ec09f37f3bf9a12dc34bc4d57b30f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..8f61dc14367650a625c0fb8260040c52edba6ccf
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType.class
new file mode 100644
index 0000000000000000000000000000000000000000..fc9b79d7c0582f4de8481a0469ad6ff80da8e68a
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..0a1dbdfad549f2517793e3d8ac9a752c73f135da
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno.class
new file mode 100644
index 0000000000000000000000000000000000000000..15cae2967388a85c7b37bec3f5665ad46b9def26
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..74ab607572925b16b2e275c6daddddbb1a3ac66c
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..8e997c8bf040bdfdfcf6304a4a7d76efa4070811
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..68a54ae1a1aa5c2e73d37efb11589b8c75e333e4
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..bda43a90a3ba01ea90ed4962df659260a06294ee
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse.class
new file mode 100644
index 0000000000000000000000000000000000000000..d44b75f1eda2d0350480f6764bc45fbbc9e3cb36
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponseOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponseOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..aa3412764b1894201be637513ea037b057fa26b0
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponseOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..ade69086344470ae16c28599ee5575fded0e4769
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..c7f99f1dd52c3e6ec7d5f10d512066859cd24dd1
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader.class
new file mode 100644
index 0000000000000000000000000000000000000000..4d06ca35dd999aa70a71dd87b188220bdcf7f273
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeaderOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeaderOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..04723426d8595d6927bd64e4b18664ee6f8ddf95
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeaderOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader.class
new file mode 100644
index 0000000000000000000000000000000000000000..67e2be27a839587e3bc7c2531a0cd95c1e434aa3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeaderOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeaderOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..5c99b761a0683f3400c130d5737aded6f7483a51
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeaderOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..25fde30a6e04e915e5707edf685811cd7dc3bbe7
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$Builder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..3164ec62d914a67e5dfb3976c0c569e1ac97ca2b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$Builder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials.class
new file mode 100644
index 0000000000000000000000000000000000000000..62a5781d60b839affa2c655809db29f3691a7d13
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentialsOrBuilder.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentialsOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..4b52173827fd104e62fa2750253b7ca32432f0ab
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentialsOrBuilder.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.class
new file mode 100644
index 0000000000000000000000000000000000000000..aa842d7ce9781234f9a353d9c6210645cdbb17b7
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..fab7f65b5000d3865bdfbea7b7ee135b7a82b919
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.class
new file mode 100644
index 0000000000000000000000000000000000000000..ae0b6f245c34397759c6f9d1260b90699c67ca87
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection$ReceiveState.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection$ReceiveState.class
new file mode 100644
index 0000000000000000000000000000000000000000..be2a04aded3eca7232629b020e346e27e842c8e3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection$ReceiveState.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.class
new file mode 100644
index 0000000000000000000000000000000000000000..cdf24107b00d0b0326f6eaaff6d2970e6f544133
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..664b821dd0fa38f589b85934a7459e9a95a93bbc
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.class
new file mode 100644
index 0000000000000000000000000000000000000000..cf7e6b341ba606c9d4772efc5b9f11495ca5dac3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..5941abec45bb2d277e38132b1a8851b25f31cc84
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.class
new file mode 100644
index 0000000000000000000000000000000000000000..9914e7553f119734be6866543e67e1a7dd30819c
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.class
new file mode 100644
index 0000000000000000000000000000000000000000..0c4de5bdce6cb2bbfe488cdf161d7b0969bdc0e1
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.class
new file mode 100644
index 0000000000000000000000000000000000000000..8c2ed5e2b4982937998bd7e84f53ac0ce75d8b5d
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/UDPMessage.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/UDPMessage.class
new file mode 100644
index 0000000000000000000000000000000000000000..dd254df27ff8207ad81224e260cb0066441920d4
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/server/UDPMessage.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.class
new file mode 100644
index 0000000000000000000000000000000000000000..9886e097f91f3f4da86508604cefe6e9f401147d
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.class
new file mode 100644
index 0000000000000000000000000000000000000000..7372a5aeaa2835154f1892dbfa017a6a117a62ad
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.class
new file mode 100644
index 0000000000000000000000000000000000000000..f1236c3ad37471e73a8bda98bcae5e1be9467209
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.class
new file mode 100644
index 0000000000000000000000000000000000000000..f3cf11143886c8fe286b98cf1397dbd923f28b2b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.class
new file mode 100644
index 0000000000000000000000000000000000000000..34409029542919c22e9375fb5a27f34f2b8eed8b
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/trace/Tracer$TraceEvent.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/trace/Tracer$TraceEvent.class
new file mode 100644
index 0000000000000000000000000000000000000000..a7ff73246bac43136d8271197b1a4350a917e1b3
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/trace/Tracer$TraceEvent.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/trace/Tracer.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/trace/Tracer.class
new file mode 100644
index 0000000000000000000000000000000000000000..2f1fcb87a15390ee6cb7f435826f5b537c2e7883
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/trace/Tracer.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..3be8f13520e982552ce3e59175708861a6d6a6cf
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$CliOption$OPTIONTYPE.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$CliOption$OPTIONTYPE.class
new file mode 100644
index 0000000000000000000000000000000000000000..ba6c1c1cd1bf93436e54d59eb97351d14b92fbaf
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$CliOption$OPTIONTYPE.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$CliOption.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$CliOption.class
new file mode 100644
index 0000000000000000000000000000000000000000..91d1608ba9861116ee6a7c6808f333a29c6b4e8f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser$CliOption.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser.class
new file mode 100644
index 0000000000000000000000000000000000000000..678c603e1691e5cdf13e789b24fe51d37cd617e2
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLIParser.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$IntegerValue.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$IntegerValue.class
new file mode 100644
index 0000000000000000000000000000000000000000..8e8e3b7d6bd83b9d337ca4bf3fdc0a45e324439e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$IntegerValue.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$StringValue.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$StringValue.class
new file mode 100644
index 0000000000000000000000000000000000000000..a7211182fd2c39f07d268ccb5e553b21d9feea03
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$StringValue.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$Switch.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$Switch.class
new file mode 100644
index 0000000000000000000000000000000000000000..54f03925d63bd8fa567d8d7e75079a38725cae44
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$Switch.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$URLValue.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$URLValue.class
new file mode 100644
index 0000000000000000000000000000000000000000..82af6f302b65cf909e229a88c17236927890ea00
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption$URLValue.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption.class
new file mode 100644
index 0000000000000000000000000000000000000000..3ea98ab50f6dcaf8418307fab3bba43d685f306f
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOption.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOptionParser.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOptionParser.class
new file mode 100644
index 0000000000000000000000000000000000000000..c0b9fa5627669edf2826d5e4585b8fbd2764782e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/CLOptionParser.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/FSUtils$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/FSUtils$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..bcc4ce3f4a7277599d73f18a2e02f44f38b7847e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/FSUtils$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/FSUtils.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/FSUtils.class
new file mode 100644
index 0000000000000000000000000000000000000000..733989b7bb96ebc4660c53f1cd69ae03b34ac132
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/FSUtils.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/InvalidUsageException.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/InvalidUsageException.class
new file mode 100644
index 0000000000000000000000000000000000000000..3c5cdbed780e5bf535e4178a10d4a180a1e16a17
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/InvalidUsageException.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/OutputUtils.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/OutputUtils.class
new file mode 100644
index 0000000000000000000000000000000000000000..564c718868bb5cb628f108d30cdc56fd3a455a5e
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/OutputUtils.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PBRPCServiceURL.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PBRPCServiceURL.class
new file mode 100644
index 0000000000000000000000000000000000000000..0af00abe67d4cf472abf68a228f288f55a3a68b0
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PBRPCServiceURL.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PingServer$1.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PingServer$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..030f9bb6d62d7c59f468de1467866be7518cbddb
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PingServer$1.class differ
diff --git a/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PingServer.class b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PingServer.class
new file mode 100644
index 0000000000000000000000000000000000000000..490d8f3adbdf75e7a939f71ad222bf99a438fe14
Binary files /dev/null and b/java/xtreemfs-foundation/target/classes/org/xtreemfs/foundation/util/PingServer.class differ
diff --git a/java/xtreemfs-foundation/target/maven-archiver/pom.properties b/java/xtreemfs-foundation/target/maven-archiver/pom.properties
new file mode 100644
index 0000000000000000000000000000000000000000..831c334740399235db132e311b8b2c31df9da8d9
--- /dev/null
+++ b/java/xtreemfs-foundation/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Jun 28 10:11:04 CEST 2016
+version=1.5.1-SNAPSHOT
+groupId=org.xtreemfs
+artifactId=xtreemfs-foundation
diff --git a/java/xtreemfs-foundation/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/java/xtreemfs-foundation/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..83cc65b911867426a1f5154474e794d4dc2175ad
--- /dev/null
+++ b/java/xtreemfs-foundation/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,154 @@
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingErrorOrBuilder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeaderOrBuilder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse.class
+org/xtreemfs/foundation/util/PingServer$1.class
+org/xtreemfs/foundation/pbrpc/client/PBRPCException.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeaderOrBuilder.class
+org/xtreemfs/foundation/monitoring/MonitoringListener.class
+org/xtreemfs/foundation/checksums/ChecksumFactory.class
+org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$1.class
+org/xtreemfs/foundation/TimeServerClient.class
+org/xtreemfs/foundation/trace/Tracer.class
+org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentialsOrBuilder.class
+org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection$ReceiveState.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$Builder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$Builder.class
+org/xtreemfs/foundation/TimeSync$ExtSyncSource.class
+org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.class
+org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.class
+org/xtreemfs/foundation/monitoring/ListMonitoring.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$1.class
+org/xtreemfs/foundation/pbrpc/client/RPCResponse.class
+org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.class
+org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.class
+org/xtreemfs/foundation/pbrpc/server/UDPMessage.class
+org/xtreemfs/foundation/TimeSync.class
+org/xtreemfs/foundation/util/CLOption$URLValue.class
+org/xtreemfs/foundation/checksums/algorithms/Adler32.class
+org/xtreemfs/foundation/SSLOptions.class
+org/xtreemfs/foundation/VersionManagement.class
+org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$Builder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$1.class
+org/xtreemfs/foundation/util/PBRPCServiceURL.class
+org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$1.class
+org/xtreemfs/foundation/LifeCycleListener.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$Builder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResultOrBuilder.class
+org/xtreemfs/foundation/json/JSONException.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class
+org/xtreemfs/foundation/json/JSONString.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader.class
+org/xtreemfs/foundation/util/CLIParser$CliOption$OPTIONTYPE.class
+org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient$1.class
+org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword.class
+org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$1.class
+org/xtreemfs/foundation/monitoring/NumberMonitoring.class
+org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$1.class
+org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.class
+org/xtreemfs/foundation/util/CLOptionParser.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequestOrBuilder.class
+org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponse$Builder.class
+org/xtreemfs/foundation/CrashReporter.class
+org/xtreemfs/foundation/logging/Logging.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$MessageType$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponseOrBuilder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$ErrorResponseOrBuilder.class
+org/xtreemfs/foundation/checksums/algorithms/CRC32.class
+org/xtreemfs/foundation/logging/Logging$Category.class
+org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.class
+org/xtreemfs/foundation/checksums/algorithms/SDBM.class
+org/xtreemfs/foundation/util/CLIParser$1.class
+org/xtreemfs/foundation/util/InvalidUsageException.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingError$Builder.class
+org/xtreemfs/foundation/util/OutputUtils.class
+org/xtreemfs/foundation/checksums/algorithms/JavaHash.class
+org/xtreemfs/foundation/monitoring/Monitoring.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$1.class
+org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.class
+org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthType$1.class
+org/xtreemfs/foundation/util/CLOption$StringValue.class
+org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno$1.class
+org/xtreemfs/foundation/json/JSONCharBufferString.class
+org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.class
+org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.class
+org/xtreemfs/foundation/buffer/ReusableBuffer.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPasswordOrBuilder.class
+org/xtreemfs/foundation/checksums/ChecksumProvider.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$POSIXErrno.class
+org/xtreemfs/foundation/util/CLOption$IntegerValue.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthOrBuilder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$Builder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType$1.class
+org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.class
+org/xtreemfs/foundation/pbrpc/utils/RecordMarker.class
+org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.class
+org/xtreemfs/foundation/monitoring/MonitoringEvent.class
+org/xtreemfs/foundation/SSLOptions$TrustManager.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequestOrBuilder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponse$Builder.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$Auth$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$AuthPassword$1.class
+org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$ErrorType.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$Builder.class
+org/xtreemfs/foundation/LRUCache.class
+org/xtreemfs/foundation/json/JSONInput.class
+org/xtreemfs/foundation/buffer/BufferPool.class
+org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$UserCredentials$Builder.class
+org/xtreemfs/foundation/TimeSync$1.class
+org/xtreemfs/foundation/util/CLOption.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse.class
+org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.class
+org/xtreemfs/foundation/logging/Utils.class
+org/xtreemfs/foundation/pbrpc/Schemes.class
+org/xtreemfs/foundation/json/JSONParser.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingResponse$PingResult.class
+org/xtreemfs/foundation/util/CLIParser$CliOption.class
+org/xtreemfs/foundation/trace/Tracer$TraceEvent.class
+org/xtreemfs/foundation/util/PingServer.class
+org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO$1.class
+org/xtreemfs/foundation/util/CLIParser.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC$RPCHeader$RequestHeader$Builder.class
+org/xtreemfs/foundation/checksums/ChecksumAlgorithm.class
+org/xtreemfs/foundation/buffer/ASCIIString.class
+org/xtreemfs/foundation/SSLOptions$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$PingRequest$1.class
+org/xtreemfs/foundation/util/FSUtils$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyRequest$Builder.class
+org/xtreemfs/foundation/util/CLOption$Switch.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping$Ping_emptyResponseOrBuilder.class
+org/xtreemfs/foundation/monitoring/MonitoringLog.class
+org/xtreemfs/foundation/pbrpc/channels/ChannelIO.class
+org/xtreemfs/foundation/util/FSUtils.class
+org/xtreemfs/foundation/LifeCycleThread.class
+org/xtreemfs/foundation/SSLOptions$NoAuthTrustStore.class
+org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.class
diff --git a/java/xtreemfs-foundation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/java/xtreemfs-foundation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..00ada5be84a5217e6294fa8e3442b1b89ee25939
--- /dev/null
+++ b/java/xtreemfs-foundation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,74 @@
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/NumberMonitoring.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerConnectionInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCClientRequest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/Monitoring.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferOutputStream.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/JavaHash.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringEvent.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONCharBufferString.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/PBRPCDatagramPacket.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/ReusableBuffer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponse.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONParser.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponseListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCNIOSocketClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/SSLHandshakeOnlyChannelIO.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LRUCache.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerRequest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/VersionManagement.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/SSLOptions.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/Schemes.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONString.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ErrorUtils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LifeCycleThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/ListMonitoring.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/monitoring/MonitoringLog.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/provider/JavaChecksumProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/BufferPool.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/SSLChannelIO.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/TimeServerClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONInput.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/logging/Logging.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLOptionParser.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/StringChecksumAlgorithm.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/trace/Tracer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/channels/ChannelIO.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/PBRPCException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/InvalidUsageException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCAuthentication.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/PBRPCServiceURL.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/OutputUtils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/logging/Utils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/FSUtils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/RecordMarker.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/CrashReporter.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/buffer/ASCIIString.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/LifeCycleListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/CRC32.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumAlgorithm.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/RPC.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCUDPSocketServer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/Adler32.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/utils/ReusableBufferInputStream.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLIParser.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/ChecksumFactory.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PingServiceConstants.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/PingServer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCResponseAvailableListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerResponse.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/client/RPCClientConnection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCServerRequestListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/util/CLOption.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServerConnection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/JavaChecksumAlgorithm.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/checksums/algorithms/SDBM.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/Ping.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/RPCNIOSocketServer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/json/JSONException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/pbrpc/server/UDPMessage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-foundation/src/main/java/org/xtreemfs/foundation/TimeSync.java
diff --git a/java/xtreemfs-foundation/target/xtreemfs-foundation-1.5.1-SNAPSHOT.jar b/java/xtreemfs-foundation/target/xtreemfs-foundation-1.5.1-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3c74a7190cec2ff98702f4bba25003de95c44bcd
Binary files /dev/null and b/java/xtreemfs-foundation/target/xtreemfs-foundation-1.5.1-SNAPSHOT.jar differ
diff --git a/java/foundation/test/org/xtreemfs/foundation/buffer/BufferPoolTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/foundation/buffer/BufferPoolTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/foundation/buffer/BufferPoolTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/foundation/buffer/BufferPoolTest.java
diff --git a/java/foundation/test/org/xtreemfs/foundation/buffer/ReusableBufferTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/foundation/buffer/ReusableBufferTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/foundation/buffer/ReusableBufferTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/foundation/buffer/ReusableBufferTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/checksums/ChecksumFactoryTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/checksums/ChecksumFactoryTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/checksums/ChecksumFactoryTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/checksums/ChecksumFactoryTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/checksums/StringChecksumAlgorithmTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/checksums/StringChecksumAlgorithmTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/checksums/StringChecksumAlgorithmTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/checksums/StringChecksumAlgorithmTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/pbrpc/PBRPCClientServerTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/PBRPCClientServerTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/pbrpc/PBRPCClientServerTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/PBRPCClientServerTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/pbrpc/PBRPCDatagramPacketTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/PBRPCDatagramPacketTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/pbrpc/PBRPCDatagramPacketTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/PBRPCDatagramPacketTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/pbrpc/PBRPCTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/PBRPCTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/pbrpc/PBRPCTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/PBRPCTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/pbrpc/RPCNIOSocketServerTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/RPCNIOSocketServerTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/pbrpc/RPCNIOSocketServerTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/RPCNIOSocketServerTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/pbrpc/RPCUDPSocketServerTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/RPCUDPSocketServerTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/pbrpc/RPCUDPSocketServerTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/pbrpc/RPCUDPSocketServerTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/util/OutputUtilsTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/util/OutputUtilsTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/util/OutputUtilsTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/util/OutputUtilsTest.java
diff --git a/java/foundation/test/org/xtreemfs/test/foundation/util/PBRPCServiceURLTest.java b/java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/util/PBRPCServiceURLTest.java
similarity index 100%
rename from java/foundation/test/org/xtreemfs/test/foundation/util/PBRPCServiceURLTest.java
rename to java/xtreemfs-foundation/test/main/java/org/xtreemfs/test/foundation/util/PBRPCServiceURLTest.java
diff --git a/java/xtreemfs-pbrpcgen/pom.xml b/java/xtreemfs-pbrpcgen/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c3428a840e504be8978fe774845b7e8e73d8d2e0
--- /dev/null
+++ b/java/xtreemfs-pbrpcgen/pom.xml
@@ -0,0 +1,24 @@
+
+ 4.0.0
+
+
+ org.xtreemfs
+ xtreemfs-parent
+ 1.5.1-SNAPSHOT
+ ..
+
+
+ xtreemfs-pbrpcgen
+ xtreemfs-pbrpcgen
+
+ jar
+
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf-java.version}
+
+
+
diff --git a/java/pbrpcgen/src/com/google/protobuf/compiler/PluginProtos.java b/java/xtreemfs-pbrpcgen/src/main/java/com/google/protobuf/compiler/PluginProtos.java
similarity index 100%
rename from java/pbrpcgen/src/com/google/protobuf/compiler/PluginProtos.java
rename to java/xtreemfs-pbrpcgen/src/main/java/com/google/protobuf/compiler/PluginProtos.java
diff --git a/java/pbrpcgen/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java b/java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
similarity index 100%
rename from java/pbrpcgen/src/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
rename to java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
diff --git a/java/pbrpcgen/src/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.java b/java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.java
similarity index 100%
rename from java/pbrpcgen/src/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.java
rename to java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.java
diff --git a/java/pbrpcgen/src/org/xtreemfs/pbrpcgen/RPCSourceGenerator.java b/java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/pbrpcgen/RPCSourceGenerator.java
similarity index 100%
rename from java/pbrpcgen/src/org/xtreemfs/pbrpcgen/RPCSourceGenerator.java
rename to java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/pbrpcgen/RPCSourceGenerator.java
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$1.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..df5c24407e7307e2b7ff92625acfaa91fc5ef2e0
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$1.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..71fcb32a4ef47da01a731c267c045e0602480c7b
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$Builder.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..df0565f3b4e92b6bb9d7251588b96a7efcb98e05
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$Builder.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..b195cb49f48c649522f19af834b5dcd6e4ad01f7
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequestOrBuilder.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequestOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..fa0975887dd518c884a5d0555f8f0a007849339c
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequestOrBuilder.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$1.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..cd05b9031a016d666018e9987c60d39f237c84ca
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$Builder.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..0cba62298c1a325aa3595a2ec144dff2419126d3
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$Builder.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$1.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..bba95a355628a0c660ddf4db6502aca0c3733200
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$Builder.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..48c0f97d2c564350230abfd3e9797503a22fd188
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$Builder.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File.class
new file mode 100644
index 0000000000000000000000000000000000000000..88cdbb669a3b113275db963e4150907f3e0f99e8
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$FileOrBuilder.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$FileOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..5454a7f66cc55e2ee918a5a51be95a09baad48f9
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$FileOrBuilder.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse.class
new file mode 100644
index 0000000000000000000000000000000000000000..2e2083b6d318197cdcbd0316bd591b23e5049912
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponseOrBuilder.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponseOrBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..0307a9cea6a5994b5b5ac838c302547c83f74323
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponseOrBuilder.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos.class b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos.class
new file mode 100644
index 0000000000000000000000000000000000000000..39330f27ac3921197043f317fabcca64d6e08691
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/com/google/protobuf/compiler/PluginProtos.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..8f7c5517b973353fd3c2ab5cc14d701226ab009b
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class
new file mode 100644
index 0000000000000000000000000000000000000000..2e5497143f25ade61a92b6448015fa46a06659c2
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$1.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..5d9a7a01a70d9bfd7de2abda93b03dbbb93f73b7
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$TypeDef.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$TypeDef.class
new file mode 100644
index 0000000000000000000000000000000000000000..8664af80b657d2bc068d156a4b33c8cdd5994fa9
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$TypeDef.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.class
new file mode 100644
index 0000000000000000000000000000000000000000..7f24a3ab687d6f19edd903bf2cab4345a8749184
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator$1.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..286ada28afc219ed8b843ace2fd83ee186cb7602
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator$1.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator$TypeDef.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator$TypeDef.class
new file mode 100644
index 0000000000000000000000000000000000000000..e2954720f96e74aa3b963dbceaf4ca1b61851952
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator$TypeDef.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator.class b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator.class
new file mode 100644
index 0000000000000000000000000000000000000000..c1f7d4d7b32979f18d698f5e5a9b8d4cdafee62d
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/classes/org/xtreemfs/pbrpcgen/RPCSourceGenerator.class differ
diff --git a/java/xtreemfs-pbrpcgen/target/maven-archiver/pom.properties b/java/xtreemfs-pbrpcgen/target/maven-archiver/pom.properties
new file mode 100644
index 0000000000000000000000000000000000000000..0015fa426c2fb1bd4046166795449f385707e231
--- /dev/null
+++ b/java/xtreemfs-pbrpcgen/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Jun 28 10:11:07 CEST 2016
+version=1.5.1-SNAPSHOT
+groupId=org.xtreemfs
+artifactId=xtreemfs-pbrpcgen
diff --git a/java/xtreemfs-pbrpcgen/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/java/xtreemfs-pbrpcgen/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..a90b006934a183c961fd48d26c4801e37e81656e
--- /dev/null
+++ b/java/xtreemfs-pbrpcgen/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,22 @@
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponseOrBuilder.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$1.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse.class
+org/xtreemfs/pbrpcgen/RPCSourceGenerator$TypeDef.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$Builder.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$FileOrBuilder.class
+com/google/protobuf/compiler/PluginProtos.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest$Builder.class
+org/xtreemfs/pbrpcgen/RPCSourceGenerator.class
+org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest.class
+com/google/protobuf/compiler/PluginProtos$1.class
+org/xtreemfs/pbrpcgen/RPCSourceGenerator$1.class
+org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC$1.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$1.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$Builder.class
+org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$1.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorRequestOrBuilder.class
+org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator$TypeDef.class
+com/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse$File$1.class
diff --git a/java/xtreemfs-pbrpcgen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/java/xtreemfs-pbrpcgen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..4fcbd92b87bc5b2302084c8edfc458db7debbaeb
--- /dev/null
+++ b/java/xtreemfs-pbrpcgen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,4 @@
+/home/robert/workspace/xtreemfs/java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/foundation/pbrpc/generatedinterfaces/PBRPC.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/pbrpcgen/RPCSourceGenerator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-pbrpcgen/src/main/java/com/google/protobuf/compiler/PluginProtos.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-pbrpcgen/src/main/java/org/xtreemfs/pbrpcgen/RPCCPPSourceGenerator.java
diff --git a/java/xtreemfs-pbrpcgen/target/xtreemfs-pbrpcgen-1.5.1-SNAPSHOT.jar b/java/xtreemfs-pbrpcgen/target/xtreemfs-pbrpcgen-1.5.1-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..3689b547ef29087ed03e3846f913816afda75c06
Binary files /dev/null and b/java/xtreemfs-pbrpcgen/target/xtreemfs-pbrpcgen-1.5.1-SNAPSHOT.jar differ
diff --git a/java/xtreemfs-servers/pom.xml b/java/xtreemfs-servers/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7819190a505b45d9e96716cc254ed864381bd1b
--- /dev/null
+++ b/java/xtreemfs-servers/pom.xml
@@ -0,0 +1,60 @@
+
+ 4.0.0
+
+
+ org.xtreemfs
+ xtreemfs-parent
+ 1.5.1-SNAPSHOT
+ ..
+
+
+ xtreemfs-servers
+ xtreemfs-servers
+
+ jar
+
+
+
+ xtreemfs-opendmk
+
+ https://xtreemfs.github.io/opendmk
+
+ true
+
+
+
+
+
+
+ org.xtreemfs
+ xtreemfs-foundation
+ ${project.version}
+
+
+
+ org.xtreemfs
+ xtreemfs-flease
+ ${project.version}
+
+
+
+ org.xtreemfs.opendmk
+ jdmkrt
+ 1.0-b02-SNAPSHOT
+
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf-java.version}
+
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+
diff --git a/java/servers/src/org/xtreemfs/common/Capability.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/Capability.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/Capability.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/Capability.java
diff --git a/java/servers/src/org/xtreemfs/common/GlobalConstants.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/GlobalConstants.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/GlobalConstants.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/GlobalConstants.java
diff --git a/java/servers/src/org/xtreemfs/common/HeartbeatThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/HeartbeatThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/HeartbeatThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/HeartbeatThread.java
diff --git a/java/servers/src/org/xtreemfs/common/KeyValuePairs.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/KeyValuePairs.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/KeyValuePairs.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/KeyValuePairs.java
diff --git a/java/servers/src/org/xtreemfs/common/ReplicaUpdatePolicies.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/ReplicaUpdatePolicies.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/ReplicaUpdatePolicies.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/ReplicaUpdatePolicies.java
diff --git a/java/servers/src/org/xtreemfs/common/ServiceAvailability.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/ServiceAvailability.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/ServiceAvailability.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/ServiceAvailability.java
diff --git a/java/servers/src/org/xtreemfs/common/auth/AuthenticationException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/AuthenticationException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/auth/AuthenticationException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/AuthenticationException.java
diff --git a/java/servers/src/org/xtreemfs/common/auth/AuthenticationProvider.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/AuthenticationProvider.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/auth/AuthenticationProvider.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/AuthenticationProvider.java
diff --git a/java/servers/src/org/xtreemfs/common/auth/FederationIdX509AuthProvider.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/FederationIdX509AuthProvider.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/auth/FederationIdX509AuthProvider.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/FederationIdX509AuthProvider.java
diff --git a/java/servers/src/org/xtreemfs/common/auth/NullAuthProvider.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/NullAuthProvider.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/auth/NullAuthProvider.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/NullAuthProvider.java
diff --git a/java/servers/src/org/xtreemfs/common/auth/SimpleX509AuthProvider.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/SimpleX509AuthProvider.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/auth/SimpleX509AuthProvider.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/SimpleX509AuthProvider.java
diff --git a/java/servers/src/org/xtreemfs/common/auth/UserCredentials.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/UserCredentials.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/auth/UserCredentials.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/UserCredentials.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/AbstractBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/AbstractBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/AbstractBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/AbstractBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/BenchmarkConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/BenchmarkConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkConfig.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/BenchmarkFactory.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkFactory.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/BenchmarkFactory.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkFactory.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/BenchmarkFailedException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkFailedException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/BenchmarkFailedException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkFailedException.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/BenchmarkResult.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkResult.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/BenchmarkResult.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkResult.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/BenchmarkUtils.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkUtils.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/BenchmarkUtils.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkUtils.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/ClientManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/ClientManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/ClientManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/ClientManager.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/Controller.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/Controller.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/Controller.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/Controller.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/FilebasedBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/FilebasedBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/FilebasedReadBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedReadBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/FilebasedReadBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedReadBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/FilebasedWriteBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedWriteBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/FilebasedWriteBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedWriteBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/RandomOffsetbasedBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomOffsetbasedBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/RandomOffsetbasedBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomOffsetbasedBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/RandomReadBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomReadBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/RandomReadBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomReadBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/RandomWriteBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomWriteBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/RandomWriteBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomWriteBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/SequentialBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/SequentialBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/SequentialReadBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialReadBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/SequentialReadBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialReadBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/SequentialWriteBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialWriteBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/SequentialWriteBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialWriteBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/UnalignedSequentialWriteBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/UnalignedSequentialWriteBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/UnalignedSequentialWriteBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/UnalignedSequentialWriteBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/UncaughtExceptionHandlerBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/UncaughtExceptionHandlerBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/UncaughtExceptionHandlerBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/UncaughtExceptionHandlerBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/common/benchmark/VolumeManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/VolumeManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/benchmark/VolumeManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/VolumeManager.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/CachedXAttr.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/CachedXAttr.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/CachedXAttr.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/CachedXAttr.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/Client.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Client.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/Client.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Client.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/File.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/File.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/File.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/File.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/InvalidChecksumException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/InvalidChecksumException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/InvalidChecksumException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/InvalidChecksumException.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/RandomAccessFile.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/RandomAccessFile.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/RandomAccessFile.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/RandomAccessFile.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/Replica.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Replica.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/Replica.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Replica.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/Volume.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Volume.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/Volume.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Volume.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/internal/ObjectMapper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/ObjectMapper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/internal/ObjectMapper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/ObjectMapper.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/internal/OpenFileList.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/OpenFileList.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/internal/OpenFileList.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/OpenFileList.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/internal/RAID0ObjectMapper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/RAID0ObjectMapper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/internal/RAID0ObjectMapper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/RAID0ObjectMapper.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/io/ByteMapper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/io/ByteMapper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapper.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/io/ByteMapperFactory.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapperFactory.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/io/ByteMapperFactory.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapperFactory.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/io/ByteMapperRAID0.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapperRAID0.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/io/ByteMapperRAID0.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapperRAID0.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/io/ObjectStore.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ObjectStore.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/io/ObjectStore.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ObjectStore.java
diff --git a/java/servers/src/org/xtreemfs/common/clients/io/RandomAccessFile.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/RandomAccessFile.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/clients/io/RandomAccessFile.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/RandomAccessFile.java
diff --git a/java/servers/src/org/xtreemfs/common/config/Config.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/Config.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/config/Config.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/Config.java
diff --git a/java/servers/src/org/xtreemfs/common/config/PolicyClassLoader.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/PolicyClassLoader.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/config/PolicyClassLoader.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/PolicyClassLoader.java
diff --git a/java/servers/src/org/xtreemfs/common/config/PolicyContainer.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/PolicyContainer.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/config/PolicyContainer.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/PolicyContainer.java
diff --git a/java/servers/src/org/xtreemfs/common/config/RemoteConfigHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/RemoteConfigHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/config/RemoteConfigHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/RemoteConfigHelper.java
diff --git a/java/servers/src/org/xtreemfs/common/config/ServiceConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/ServiceConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/config/ServiceConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/ServiceConfig.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/AdminClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/AdminClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminClient.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/AdminFileHandle.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminFileHandle.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/AdminFileHandle.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminFileHandle.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/AdminVolume.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminVolume.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/AdminVolume.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminVolume.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/AsyncWriteBuffer.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AsyncWriteBuffer.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/AsyncWriteBuffer.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AsyncWriteBuffer.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/AsyncWriteHandler.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AsyncWriteHandler.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/AsyncWriteHandler.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AsyncWriteHandler.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/Client.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Client.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/Client.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Client.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/ClientFactory.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ClientFactory.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/ClientFactory.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ClientFactory.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/ClientImplementation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ClientImplementation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/ClientImplementation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ClientImplementation.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/FileHandle.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileHandle.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/FileHandle.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileHandle.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/FileHandleImplementation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileHandleImplementation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/FileHandleImplementation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileHandleImplementation.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/FileInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/FileInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileInfo.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/Helper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Helper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/Helper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Helper.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/MetadataCache.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/MetadataCache.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/MetadataCache.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/MetadataCache.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/MetadataCacheEntry.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/MetadataCacheEntry.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/MetadataCacheEntry.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/MetadataCacheEntry.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/Options.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Options.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/Options.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Options.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/PeriodicFileSizeUpdateThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/PeriodicFileSizeUpdateThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/PeriodicFileSizeUpdateThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/PeriodicFileSizeUpdateThread.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/PeriodicXcapRenewalThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/PeriodicXcapRenewalThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/PeriodicXcapRenewalThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/PeriodicXcapRenewalThread.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/RPCCaller.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/RPCCaller.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/RPCCaller.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/RPCCaller.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/ReadOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ReadOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/ReadOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ReadOperation.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/StripeTranslator.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslator.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/StripeTranslator.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslator.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/StripeTranslatorRaid0.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslatorRaid0.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/StripeTranslatorRaid0.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslatorRaid0.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/Tupel.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Tupel.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/Tupel.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Tupel.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/UUIDIterator.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/UUIDIterator.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/UUIDIterator.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/UUIDIterator.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/UUIDResolver.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/UUIDResolver.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/UUIDResolver.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/UUIDResolver.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/Volume.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Volume.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/Volume.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Volume.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/VolumeImplementation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/VolumeImplementation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/VolumeImplementation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/VolumeImplementation.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/WriteOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/WriteOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/WriteOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/WriteOperation.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/AddressToUUIDNotFoundException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/AddressToUUIDNotFoundException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/AddressToUUIDNotFoundException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/AddressToUUIDNotFoundException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/InternalServerErrorException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InternalServerErrorException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/InternalServerErrorException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InternalServerErrorException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/InvalidChecksumException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InvalidChecksumException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/InvalidChecksumException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InvalidChecksumException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/InvalidViewException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InvalidViewException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/InvalidViewException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InvalidViewException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/PosixErrorException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/PosixErrorException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/PosixErrorException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/PosixErrorException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/UUIDIteratorListIsEmpyException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/UUIDIteratorListIsEmpyException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/UUIDIteratorListIsEmpyException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/UUIDIteratorListIsEmpyException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/UUIDNotInXlocSetException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/UUIDNotInXlocSetException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/UUIDNotInXlocSetException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/UUIDNotInXlocSetException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/VolumeNotFoundException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/VolumeNotFoundException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/VolumeNotFoundException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/VolumeNotFoundException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/XtreemFSException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/XtreemFSException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/exceptions/XtreemFSException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/XtreemFSException.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeAdminClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeAdminClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminClient.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeAdminFileHandle.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminFileHandle.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeAdminFileHandle.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminFileHandle.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeAdminVolume.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminVolume.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeAdminVolume.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminVolume.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeClient.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeFileHandle.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeFileHandle.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeFileHandle.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeFileHandle.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeHelper.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeUUIDResolver.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeUUIDResolver.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeUUIDResolver.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeUUIDResolver.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeVolume.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeVolume.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/NativeVolume.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeVolume.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/ClientProxy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/ClientProxy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/ClientProxy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/ClientProxy.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/FileHandleProxy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/FileHandleProxy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/FileHandleProxy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/FileHandleProxy.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/IntVector.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/IntVector.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/IntVector.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/IntVector.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/OptionsProxy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/OptionsProxy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/OptionsProxy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/OptionsProxy.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/SSLContext.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/SSLContext.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/SSLContext.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/SSLContext.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/SSLOptionsProxy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/SSLOptionsProxy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/SSLOptionsProxy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/SSLOptionsProxy.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/ServiceAddresses.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/ServiceAddresses.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/ServiceAddresses.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/ServiceAddresses.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringList.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringList.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringList.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringList.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringListIterator.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringListIterator.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringListIterator.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringListIterator.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringMap.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringMap.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringMap.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringMap.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringVector.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringVector.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/StringVector.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringVector.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/UUIDResolverProxy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/UUIDResolverProxy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/UUIDResolverProxy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/UUIDResolverProxy.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/UserMapping.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/UserMapping.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/UserMapping.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/UserMapping.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/VolumeProxy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/VolumeProxy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/VolumeProxy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/VolumeProxy.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/XtreemFSServiceType.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/XtreemFSServiceType.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/XtreemFSServiceType.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/XtreemFSServiceType.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jni.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jni.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jni.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jni.java
diff --git a/java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jniJNI.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jniJNI.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jniJNI.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jniJNI.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/DirImpl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/DirImpl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/DirImpl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/DirImpl.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/GeneralImpl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/GeneralImpl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/GeneralImpl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/GeneralImpl.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/MrcImpl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/MrcImpl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/MrcImpl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/MrcImpl.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/OsdImpl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/OsdImpl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/OsdImpl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/OsdImpl.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/StatusMonitor.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/StatusMonitor.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/StatusMonitor.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/StatusMonitor.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/XTREEMFS_MIBImpl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/XTREEMFS_MIBImpl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/XTREEMFS_MIBImpl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/XTREEMFS_MIBImpl.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/Dir.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Dir.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/Dir.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Dir.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/DirMBean.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/DirMBean.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/DirMBean.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/DirMBean.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/DirMeta.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/DirMeta.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/DirMeta.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/DirMeta.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/General.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/General.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/General.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/General.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/GeneralMBean.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/GeneralMBean.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/GeneralMBean.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/GeneralMBean.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/GeneralMeta.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/GeneralMeta.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/GeneralMeta.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/GeneralMeta.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/Mrc.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Mrc.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/Mrc.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Mrc.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/MrcMBean.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/MrcMBean.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/MrcMBean.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/MrcMBean.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/MrcMeta.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/MrcMeta.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/MrcMeta.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/MrcMeta.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/Osd.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Osd.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/Osd.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Osd.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/OsdMBean.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/OsdMBean.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/OsdMBean.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/OsdMBean.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/OsdMeta.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/OsdMeta.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/OsdMeta.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/OsdMeta.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIB.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIB.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIB.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIB.java
diff --git a/java/servers/src/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIBOidTable.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIBOidTable.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIBOidTable.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIBOidTable.java
diff --git a/java/servers/src/org/xtreemfs/common/quota/FinalizeVoucherResponseHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/quota/FinalizeVoucherResponseHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/quota/FinalizeVoucherResponseHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/quota/FinalizeVoucherResponseHelper.java
diff --git a/java/servers/src/org/xtreemfs/common/quota/QuotaConstants.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/quota/QuotaConstants.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/quota/QuotaConstants.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/quota/QuotaConstants.java
diff --git a/java/servers/src/org/xtreemfs/common/statusserver/BabuDBStatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/BabuDBStatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/statusserver/BabuDBStatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/BabuDBStatusPage.java
diff --git a/java/servers/src/org/xtreemfs/common/statusserver/PrintStackTrace.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/PrintStackTrace.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/statusserver/PrintStackTrace.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/PrintStackTrace.java
diff --git a/java/servers/src/org/xtreemfs/common/statusserver/StatusServer.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServer.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/statusserver/StatusServer.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServer.java
diff --git a/java/servers/src/org/xtreemfs/common/statusserver/StatusServerHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServerHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/statusserver/StatusServerHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServerHelper.java
diff --git a/java/servers/src/org/xtreemfs/common/statusserver/StatusServerModule.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServerModule.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/statusserver/StatusServerModule.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServerModule.java
diff --git a/java/servers/src/org/xtreemfs/common/util/NetUtils.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/util/NetUtils.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/util/NetUtils.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/util/NetUtils.java
diff --git a/java/servers/src/org/xtreemfs/common/uuids/Mapping.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/Mapping.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/uuids/Mapping.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/Mapping.java
diff --git a/java/servers/src/org/xtreemfs/common/uuids/ServiceUUID.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/ServiceUUID.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/uuids/ServiceUUID.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/ServiceUUID.java
diff --git a/java/servers/src/org/xtreemfs/common/uuids/UUIDCacheEntry.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UUIDCacheEntry.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/uuids/UUIDCacheEntry.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UUIDCacheEntry.java
diff --git a/java/servers/src/org/xtreemfs/common/uuids/UUIDResolver.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UUIDResolver.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/uuids/UUIDResolver.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UUIDResolver.java
diff --git a/java/servers/src/org/xtreemfs/common/uuids/UnknownUUIDException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UnknownUUIDException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/uuids/UnknownUUIDException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UnknownUUIDException.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/InvalidXLocationsException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/InvalidXLocationsException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/InvalidXLocationsException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/InvalidXLocationsException.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/RAID0Impl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/RAID0Impl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/RAID0Impl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/RAID0Impl.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/Replica.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/Replica.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/Replica.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/Replica.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/ReplicationFlags.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/ReplicationFlags.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/ReplicationFlags.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/ReplicationFlags.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/ReplicationPolicyImplementation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/ReplicationPolicyImplementation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/ReplicationPolicyImplementation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/ReplicationPolicyImplementation.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/StripingPolicyImpl.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/StripingPolicyImpl.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/StripingPolicyImpl.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/StripingPolicyImpl.java
diff --git a/java/servers/src/org/xtreemfs/common/xloc/XLocations.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/XLocations.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/common/xloc/XLocations.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/XLocations.java
diff --git a/java/servers/src/org/xtreemfs/dir/DIR.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIR.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/DIR.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIR.java
diff --git a/java/servers/src/org/xtreemfs/dir/DIRClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/DIRClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRClient.java
diff --git a/java/servers/src/org/xtreemfs/dir/DIRConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/DIRConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRConfig.java
diff --git a/java/servers/src/org/xtreemfs/dir/DIRRequest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRRequest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/DIRRequest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRRequest.java
diff --git a/java/servers/src/org/xtreemfs/dir/DIRRequestDispatcher.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRRequestDispatcher.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/DIRRequestDispatcher.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRRequestDispatcher.java
diff --git a/java/servers/src/org/xtreemfs/dir/DIRStatusListener.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRStatusListener.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/DIRStatusListener.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRStatusListener.java
diff --git a/java/servers/src/org/xtreemfs/dir/MonitoringThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/MonitoringThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/MonitoringThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/MonitoringThread.java
diff --git a/java/servers/src/org/xtreemfs/dir/ReplicaStatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/ReplicaStatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/ReplicaStatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/ReplicaStatusPage.java
diff --git a/java/servers/src/org/xtreemfs/dir/StatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/StatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/StatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/StatusPage.java
diff --git a/java/servers/src/org/xtreemfs/dir/VivaldiClientMap.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/VivaldiClientMap.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/VivaldiClientMap.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/VivaldiClientMap.java
diff --git a/java/servers/src/org/xtreemfs/dir/VivaldiStatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/VivaldiStatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/VivaldiStatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/VivaldiStatusPage.java
diff --git a/java/servers/src/org/xtreemfs/dir/data/AddressMappingRecord.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/AddressMappingRecord.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/data/AddressMappingRecord.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/AddressMappingRecord.java
diff --git a/java/servers/src/org/xtreemfs/dir/data/AddressMappingRecords.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/AddressMappingRecords.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/data/AddressMappingRecords.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/AddressMappingRecords.java
diff --git a/java/servers/src/org/xtreemfs/dir/data/ConfigurationRecord.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ConfigurationRecord.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/data/ConfigurationRecord.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ConfigurationRecord.java
diff --git a/java/servers/src/org/xtreemfs/dir/data/ServiceRecord.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ServiceRecord.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/data/ServiceRecord.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ServiceRecord.java
diff --git a/java/servers/src/org/xtreemfs/dir/data/ServiceRecords.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ServiceRecords.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/data/ServiceRecords.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ServiceRecords.java
diff --git a/java/servers/src/org/xtreemfs/dir/discovery/DiscoveryMsgThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/discovery/DiscoveryMsgThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/discovery/DiscoveryMsgThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/discovery/DiscoveryMsgThread.java
diff --git a/java/servers/src/org/xtreemfs/dir/discovery/DiscoveryUtils.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/discovery/DiscoveryUtils.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/discovery/DiscoveryUtils.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/discovery/DiscoveryUtils.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/DIROperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DIROperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/DIROperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DIROperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/DeleteAddressMappingOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DeleteAddressMappingOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/DeleteAddressMappingOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DeleteAddressMappingOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/DeregisterServiceOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DeregisterServiceOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/DeregisterServiceOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DeregisterServiceOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/GetAddressMappingOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetAddressMappingOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/GetAddressMappingOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetAddressMappingOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/GetConfigurationOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetConfigurationOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/GetConfigurationOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetConfigurationOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/GetGlobalTimeOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetGlobalTimeOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/GetGlobalTimeOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetGlobalTimeOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/GetServiceByNameOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServiceByNameOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/GetServiceByNameOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServiceByNameOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/GetServiceByUuidOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServiceByUuidOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/GetServiceByUuidOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServiceByUuidOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/GetServicesByTypeOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServicesByTypeOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/GetServicesByTypeOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServicesByTypeOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/RegisterServiceOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/RegisterServiceOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/RegisterServiceOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/RegisterServiceOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/ServiceOfflineOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/ServiceOfflineOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/ServiceOfflineOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/ServiceOfflineOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/SetAddressMappingOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/SetAddressMappingOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/SetAddressMappingOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/SetAddressMappingOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/SetConfigurationOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/SetConfigurationOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/SetConfigurationOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/SetConfigurationOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/operations/UpdateVivaldiClientOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/UpdateVivaldiClientOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/operations/UpdateVivaldiClientOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/UpdateVivaldiClientOperation.java
diff --git a/java/servers/src/org/xtreemfs/dir/templates/d3.js b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/d3.js
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/templates/d3.js
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/d3.js
diff --git a/java/servers/src/org/xtreemfs/dir/templates/d3.v3.js b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/d3.v3.js
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/templates/d3.v3.js
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/d3.v3.js
diff --git a/java/servers/src/org/xtreemfs/dir/templates/replica_status.html b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/replica_status.html
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/templates/replica_status.html
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/replica_status.html
diff --git a/java/servers/src/org/xtreemfs/dir/templates/status.html b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/status.html
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/templates/status.html
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/status.html
diff --git a/java/servers/src/org/xtreemfs/dir/templates/vivaldi.html b/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/vivaldi.html
similarity index 100%
rename from java/servers/src/org/xtreemfs/dir/templates/vivaldi.html
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/templates/vivaldi.html
diff --git a/java/servers/src/org/xtreemfs/mrc/ErrorRecord.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ErrorRecord.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/ErrorRecord.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ErrorRecord.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRC.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRC.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRC.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRC.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCConfig.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCException.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCPolicyContainer.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCPolicyContainer.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCPolicyContainer.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCPolicyContainer.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCRequest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCRequest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCRequest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCRequest.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCRequestDispatcher.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCRequestDispatcher.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCRequestDispatcher.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCRequestDispatcher.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCStatusListener.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCStatusListener.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCStatusListener.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCStatusListener.java
diff --git a/java/servers/src/org/xtreemfs/mrc/MRCStatusManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCStatusManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/MRCStatusManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCStatusManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/RequestDetails.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/RequestDetails.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/RequestDetails.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/RequestDetails.java
diff --git a/java/servers/src/org/xtreemfs/mrc/StatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/StatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/StatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/StatusPage.java
diff --git a/java/servers/src/org/xtreemfs/mrc/UserException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/UserException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/UserException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/UserException.java
diff --git a/java/servers/src/org/xtreemfs/mrc/ac/FileAccessManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/FileAccessManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/ac/FileAccessManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/FileAccessManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/ac/FileAccessPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/FileAccessPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/ac/FileAccessPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/FileAccessPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/ac/POSIXFileAccessPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/POSIXFileAccessPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/ac/POSIXFileAccessPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/POSIXFileAccessPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/ac/VolumeACLFileAccessPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/VolumeACLFileAccessPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/ac/VolumeACLFileAccessPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/VolumeACLFileAccessPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/ac/YesToAnyoneFileAccessPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/YesToAnyoneFileAccessPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/ac/YesToAnyoneFileAccessPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/YesToAnyoneFileAccessPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/AtomicDBUpdate.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/AtomicDBUpdate.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/AtomicDBUpdate.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/AtomicDBUpdate.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/DBAccessResultListener.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DBAccessResultListener.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/DBAccessResultListener.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DBAccessResultListener.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/DatabaseException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DatabaseException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/DatabaseException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DatabaseException.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/DatabaseResultSet.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DatabaseResultSet.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/DatabaseResultSet.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DatabaseResultSet.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/ReplicationManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/ReplicationManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/ReplicationManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/ReplicationManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/StorageManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/StorageManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/StorageManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/StorageManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/VolumeChangeListener.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeChangeListener.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/VolumeChangeListener.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeChangeListener.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/VolumeInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/VolumeInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/VolumeManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/VolumeManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/AtomicBabuDBSnapshotUpdate.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/AtomicBabuDBSnapshotUpdate.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/AtomicBabuDBSnapshotUpdate.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/AtomicBabuDBSnapshotUpdate.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/AtomicBabuDBUpdate.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/AtomicBabuDBUpdate.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/AtomicBabuDBUpdate.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/AtomicBabuDBUpdate.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBRequestListenerWrapper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBRequestListenerWrapper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBRequestListenerWrapper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBRequestListenerWrapper.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotStorageManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotStorageManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotStorageManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotStorageManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotVolumeInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotVolumeInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotVolumeInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotVolumeInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBStorageHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBStorageHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBStorageHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBStorageHelper.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBStorageManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBStorageManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBStorageManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBStorageManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBVolumeManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBVolumeManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/BabuDBVolumeManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBVolumeManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/database/babudb/TransactionalBabuDBUpdate.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/TransactionalBabuDBUpdate.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/database/babudb/TransactionalBabuDBUpdate.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/TransactionalBabuDBUpdate.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/ACLEntry.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/ACLEntry.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/ACLEntry.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/ACLEntry.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedACLEntry.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedACLEntry.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedACLEntry.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedACLEntry.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedFileMetadata.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileMetadata.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedFileMetadata.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileMetadata.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherClientInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherClientInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherClientInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherClientInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedIndexMetadata.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedIndexMetadata.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedIndexMetadata.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedIndexMetadata.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedMetadata.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedMetadata.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedMetadata.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedMetadata.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedRCMetadata.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedRCMetadata.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedRCMetadata.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedRCMetadata.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedStripingPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedStripingPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedStripingPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedStripingPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedXAttr.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXAttr.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedXAttr.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXAttr.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedXLoc.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXLoc.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedXLoc.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXLoc.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedXLocList.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXLocList.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/BufferBackedXLocList.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXLocList.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/FileMetadata.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileMetadata.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/FileMetadata.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileMetadata.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/FileVoucherClientInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileVoucherClientInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/FileVoucherClientInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileVoucherClientInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/FileVoucherInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileVoucherInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/FileVoucherInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileVoucherInfo.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/ReplicationPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/ReplicationPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/ReplicationPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/ReplicationPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/StripingPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/StripingPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/StripingPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/StripingPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/XAttr.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XAttr.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/XAttr.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XAttr.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/XLoc.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XLoc.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/XLoc.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XLoc.java
diff --git a/java/servers/src/org/xtreemfs/mrc/metadata/XLocList.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XLocList.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/metadata/XLocList.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XLocList.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/AccessOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/AccessOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/AccessOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/AccessOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/AddReplicaOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/AddReplicaOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/AddReplicaOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/AddReplicaOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/CheckFileListOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CheckFileListOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/CheckFileListOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CheckFileListOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/CheckpointOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CheckpointOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/CheckpointOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CheckpointOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/ClearVouchersOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ClearVouchersOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/ClearVouchersOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ClearVouchersOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/CreateDirOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateDirOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/CreateDirOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateDirOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/CreateLinkOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateLinkOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/CreateLinkOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateLinkOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/CreateSymLinkOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateSymLinkOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/CreateSymLinkOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateSymLinkOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/CreateVolumeOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateVolumeOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/CreateVolumeOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateVolumeOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/DeleteOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DeleteOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/DeleteOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DeleteOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/DeleteVolumeOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DeleteVolumeOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/DeleteVolumeOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DeleteVolumeOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/DumpDBOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DumpDBOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/DumpDBOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DumpDBOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/FSetAttrOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/FSetAttrOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/FSetAttrOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/FSetAttrOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetFileCredentialsOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetFileCredentialsOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetFileCredentialsOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetFileCredentialsOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetLocalVolumesOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetLocalVolumesOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetLocalVolumesOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetLocalVolumesOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetSuitableOSDsOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetSuitableOSDsOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetSuitableOSDsOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetSuitableOSDsOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetXAttrOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXAttrOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetXAttrOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXAttrOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetXAttrsOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXAttrsOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetXAttrsOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXAttrsOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetXLocListOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXLocListOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetXLocListOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXLocListOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/GetXLocSetOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXLocSetOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/GetXLocSetOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXLocSetOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/InternalDebugOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/InternalDebugOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/InternalDebugOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/InternalDebugOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/MRCOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/MRCOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/MRCOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/MRCOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/MoveOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/MoveOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/MoveOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/MoveOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/OpenOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/OpenOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/OpenOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/OpenOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/ReadDirAndStatOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReadDirAndStatOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/ReadDirAndStatOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReadDirAndStatOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/ReadLinkOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReadLinkOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/ReadLinkOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReadLinkOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/RemoveReplicaOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RemoveReplicaOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/RemoveReplicaOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RemoveReplicaOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/RemoveXAttrOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RemoveXAttrOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/RemoveXAttrOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RemoveXAttrOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/RenewCapabilityAndVoucherOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RenewCapabilityAndVoucherOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/RenewCapabilityAndVoucherOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RenewCapabilityAndVoucherOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/RenewOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RenewOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/RenewOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RenewOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/ReselectOSDsOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReselectOSDsOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/ReselectOSDsOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReselectOSDsOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/RestoreDBOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RestoreDBOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/RestoreDBOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RestoreDBOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/RestoreFileOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RestoreFileOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/RestoreFileOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RestoreFileOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/SetReplicaUpdatePolicyOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetReplicaUpdatePolicyOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/SetReplicaUpdatePolicyOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetReplicaUpdatePolicyOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/SetXAttrOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetXAttrOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/SetXAttrOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetXAttrOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/SetattrOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetattrOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/SetattrOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetattrOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/ShutdownOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ShutdownOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/ShutdownOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ShutdownOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/StatFSOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/StatFSOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/StatFSOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/StatFSOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/StatOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/StatOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/StatOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/StatOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/TruncateOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/TruncateOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/TruncateOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/TruncateOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/operations/UpdateFileSizeOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/UpdateFileSizeOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/operations/UpdateFileSizeOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/UpdateFileSizeOperation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/DCMapPolicyBase.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/DCMapPolicyBase.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/DCMapPolicyBase.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/DCMapPolicyBase.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/FQDNPolicyBase.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FQDNPolicyBase.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/FQDNPolicyBase.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FQDNPolicyBase.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/FilterDefaultPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterDefaultPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/FilterDefaultPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterDefaultPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/FilterFQDNPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterFQDNPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/FilterFQDNPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterFQDNPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/FilterUUIDPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterUUIDPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/FilterUUIDPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterUUIDPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/GroupDCMapPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/GroupDCMapPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/GroupDCMapPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/GroupDCMapPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/GroupFQDNPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/GroupFQDNPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/GroupFQDNPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/GroupFQDNPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/Inet4AddressMatcher.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/Inet4AddressMatcher.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/Inet4AddressMatcher.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/Inet4AddressMatcher.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/InetAddressMatcher.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/InetAddressMatcher.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/InetAddressMatcher.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/InetAddressMatcher.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/OSDSelectionPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/OSDSelectionPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/OSDSelectionPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/OSDSelectionPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/OSDStatusManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/OSDStatusManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/OSDStatusManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/OSDStatusManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/PolicyHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/PolicyHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/PolicyHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/PolicyHelper.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortDCMapPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortDCMapPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortDCMapPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortDCMapPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortFQDNPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortFQDNPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortFQDNPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortFQDNPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortHostRoundRobinPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortHostRoundRobinPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortHostRoundRobinPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortHostRoundRobinPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortRandomPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortRandomPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortRandomPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortRandomPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortReversePolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortReversePolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortReversePolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortReversePolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortUUIDPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortUUIDPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortUUIDPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortUUIDPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/SortVivaldiPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortVivaldiPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/SortVivaldiPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortVivaldiPolicy.java
diff --git a/java/servers/src/org/xtreemfs/mrc/osdselection/VolumeOSDFilter.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/VolumeOSDFilter.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/osdselection/VolumeOSDFilter.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/VolumeOSDFilter.java
diff --git a/java/servers/src/org/xtreemfs/mrc/quota/QuotaChangeListener.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaChangeListener.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/quota/QuotaChangeListener.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaChangeListener.java
diff --git a/java/servers/src/org/xtreemfs/mrc/quota/QuotaFileInformation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaFileInformation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/quota/QuotaFileInformation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaFileInformation.java
diff --git a/java/servers/src/org/xtreemfs/mrc/quota/QuotaManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/quota/QuotaManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/quota/VolumeQuotaManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/VolumeQuotaManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/quota/VolumeQuotaManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/VolumeQuotaManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/quota/Voucher.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/Voucher.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/quota/Voucher.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/Voucher.java
diff --git a/java/servers/src/org/xtreemfs/mrc/quota/VoucherManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/VoucherManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/quota/VoucherManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/VoucherManager.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/InternalCallbackInterface.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/InternalCallbackInterface.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/InternalCallbackInterface.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/InternalCallbackInterface.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/MRCInternalRequest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCInternalRequest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/MRCInternalRequest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCInternalRequest.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/MRCStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/MRCStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCStage.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/MRCStageCallbackInterface.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCStageCallbackInterface.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/MRCStageCallbackInterface.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCStageCallbackInterface.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/OnCloseReplicationThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/OnCloseReplicationThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/OnCloseReplicationThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/OnCloseReplicationThread.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/ProcessingStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/ProcessingStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/ProcessingStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/ProcessingStage.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/XLocSetCoordinator.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetCoordinator.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/XLocSetCoordinator.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetCoordinator.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/XLocSetCoordinatorCallback.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetCoordinatorCallback.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/XLocSetCoordinatorCallback.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetCoordinatorCallback.java
diff --git a/java/servers/src/org/xtreemfs/mrc/stages/XLocSetLock.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetLock.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/stages/XLocSetLock.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetLock.java
diff --git a/java/servers/src/org/xtreemfs/mrc/templates/status.html b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/templates/status.html
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/templates/status.html
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/templates/status.html
diff --git a/java/servers/src/org/xtreemfs/mrc/utils/Converter.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/Converter.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/utils/Converter.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/Converter.java
diff --git a/java/servers/src/org/xtreemfs/mrc/utils/DBAdminHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/DBAdminHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/utils/DBAdminHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/DBAdminHelper.java
diff --git a/java/servers/src/org/xtreemfs/mrc/utils/MRCHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/MRCHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/utils/MRCHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/MRCHelper.java
diff --git a/java/servers/src/org/xtreemfs/mrc/utils/Path.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/Path.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/utils/Path.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/Path.java
diff --git a/java/servers/src/org/xtreemfs/mrc/utils/PathResolver.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/PathResolver.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/mrc/utils/PathResolver.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/PathResolver.java
diff --git a/java/servers/src/org/xtreemfs/osd/AdvisoryLock.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/AdvisoryLock.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/AdvisoryLock.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/AdvisoryLock.java
diff --git a/java/servers/src/org/xtreemfs/osd/ErrorCodes.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ErrorCodes.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/ErrorCodes.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ErrorCodes.java
diff --git a/java/servers/src/org/xtreemfs/osd/InternalObjectData.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/InternalObjectData.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/InternalObjectData.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/InternalObjectData.java
diff --git a/java/servers/src/org/xtreemfs/osd/LocationsCache.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/LocationsCache.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/LocationsCache.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/LocationsCache.java
diff --git a/java/servers/src/org/xtreemfs/osd/OSD.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSD.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OSD.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSD.java
diff --git a/java/servers/src/org/xtreemfs/osd/OSDConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OSDConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDConfig.java
diff --git a/java/servers/src/org/xtreemfs/osd/OSDPolicyContainer.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDPolicyContainer.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OSDPolicyContainer.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDPolicyContainer.java
diff --git a/java/servers/src/org/xtreemfs/osd/OSDRequest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDRequest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OSDRequest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDRequest.java
diff --git a/java/servers/src/org/xtreemfs/osd/OSDRequestDispatcher.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDRequestDispatcher.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OSDRequestDispatcher.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDRequestDispatcher.java
diff --git a/java/servers/src/org/xtreemfs/osd/OSDStatusListener.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDStatusListener.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OSDStatusListener.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDStatusListener.java
diff --git a/java/servers/src/org/xtreemfs/osd/OpenFileTable.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OpenFileTable.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/OpenFileTable.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OpenFileTable.java
diff --git a/java/servers/src/org/xtreemfs/osd/ReplicatedFileStatusJSON.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ReplicatedFileStatusJSON.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/ReplicatedFileStatusJSON.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ReplicatedFileStatusJSON.java
diff --git a/java/servers/src/org/xtreemfs/osd/ReplicatedFileStatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ReplicatedFileStatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/ReplicatedFileStatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ReplicatedFileStatusPage.java
diff --git a/java/servers/src/org/xtreemfs/osd/StatusPage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/StatusPage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/StatusPage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/StatusPage.java
diff --git a/java/servers/src/org/xtreemfs/osd/drain/OSDDrain.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/drain/OSDDrain.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/drain/OSDDrain.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/drain/OSDDrain.java
diff --git a/java/servers/src/org/xtreemfs/osd/drain/OSDDrainException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/drain/OSDDrainException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/drain/OSDDrainException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/drain/OSDDrainException.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CheckObjectOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CheckObjectOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CheckObjectOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CheckObjectOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CleanupGetResultsOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupGetResultsOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CleanupGetResultsOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupGetResultsOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CleanupGetStatusOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupGetStatusOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CleanupGetStatusOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupGetStatusOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CleanupIsRunningOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupIsRunningOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CleanupIsRunningOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupIsRunningOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CleanupStartOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupStartOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CleanupStartOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupStartOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CleanupStopOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupStopOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CleanupStopOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupStopOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/CleanupVersionsStartOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupVersionsStartOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/CleanupVersionsStartOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupVersionsStartOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/DeleteOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/DeleteOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/DeleteOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/DeleteOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventCloseFile.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventCloseFile.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventCloseFile.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventCloseFile.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventCreateFileVersion.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventCreateFileVersion.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventCreateFileVersion.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventCreateFileVersion.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventGmax.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventGmax.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventGmax.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventGmax.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventInsertPaddingObject.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventInsertPaddingObject.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventInsertPaddingObject.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventInsertPaddingObject.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventPingFile.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventPingFile.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventPingFile.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventPingFile.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventRWRStatus.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventRWRStatus.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventRWRStatus.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventRWRStatus.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/EventWriteObject.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventWriteObject.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/EventWriteObject.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventWriteObject.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/FinalizeVouchersOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/FinalizeVouchersOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/FinalizeVouchersOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/FinalizeVouchersOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/FleaseMessageOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/FleaseMessageOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/FleaseMessageOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/FleaseMessageOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/GetFileIDListOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/GetFileIDListOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/GetFileIDListOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/GetFileIDListOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/GetObjectSetOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/GetObjectSetOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/GetObjectSetOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/GetObjectSetOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalGetFileSizeOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalGetFileSizeOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalGetFileSizeOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalGetFileSizeOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalGetGmaxOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalGetGmaxOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalGetGmaxOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalGetGmaxOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRAuthStateInvalidatedOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRAuthStateInvalidatedOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRAuthStateInvalidatedOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRAuthStateInvalidatedOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRAuthStateOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRAuthStateOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRAuthStateOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRAuthStateOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRFetchOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRFetchOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRFetchOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRFetchOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRResetStatusOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRResetStatusOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRResetStatusOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRResetStatusOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRStatusOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRStatusOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRStatusOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRStatusOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRTruncateOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRTruncateOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRTruncateOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRTruncateOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalRWRUpdateOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRUpdateOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalRWRUpdateOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRUpdateOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InternalTruncateOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalTruncateOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InternalTruncateOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalTruncateOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/InvalidateXLocSetOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InvalidateXLocSetOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/InvalidateXLocSetOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InvalidateXLocSetOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/KeepFileOpenOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/KeepFileOpenOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/KeepFileOpenOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/KeepFileOpenOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/LocalReadOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LocalReadOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/LocalReadOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LocalReadOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/LockAcquireOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockAcquireOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/LockAcquireOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockAcquireOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/LockCheckOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockCheckOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/LockCheckOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockCheckOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/LockReleaseOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockReleaseOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/LockReleaseOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockReleaseOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/OSDOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/OSDOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/OSDOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/OSDOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/RWRNotifyOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RWRNotifyOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/RWRNotifyOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RWRNotifyOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/ReadOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/ReadOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/ReadOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/ReadOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/RepairObjectOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RepairObjectOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/RepairObjectOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RepairObjectOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/RequestTimeHelper.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RequestTimeHelper.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/RequestTimeHelper.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RequestTimeHelper.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/ShutdownOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/ShutdownOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/ShutdownOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/ShutdownOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/TruncateOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/TruncateOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/TruncateOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/TruncateOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/VivaldiPingOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/VivaldiPingOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/VivaldiPingOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/VivaldiPingOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/operations/WriteOperation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/WriteOperation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/operations/WriteOperation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/WriteOperation.java
diff --git a/java/servers/src/org/xtreemfs/osd/quota/FileVoucherManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/FileVoucherManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/quota/FileVoucherManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/FileVoucherManager.java
diff --git a/java/servers/src/org/xtreemfs/osd/quota/OSDVoucherManager.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/OSDVoucherManager.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/quota/OSDVoucherManager.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/OSDVoucherManager.java
diff --git a/java/servers/src/org/xtreemfs/osd/quota/VoucherErrorException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/VoucherErrorException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/quota/VoucherErrorException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/VoucherErrorException.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/ObjectDissemination.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ObjectDissemination.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/ObjectDissemination.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ObjectDissemination.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/ObjectSet.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ObjectSet.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/ObjectSet.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ObjectSet.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/ReplicatingFile.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ReplicatingFile.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/ReplicatingFile.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ReplicatingFile.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/selection/ObjectSetOSDSelection.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/ObjectSetOSDSelection.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/selection/ObjectSetOSDSelection.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/ObjectSetOSDSelection.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/selection/RandomOSDSelection.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RandomOSDSelection.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/selection/RandomOSDSelection.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RandomOSDSelection.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/selection/RandomObjectSelection.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RandomObjectSelection.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/selection/RandomObjectSelection.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RandomObjectSelection.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/selection/RarestFirstObjectSelection.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RarestFirstObjectSelection.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/selection/RarestFirstObjectSelection.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RarestFirstObjectSelection.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/selection/RoundRobinOSDSelection.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RoundRobinOSDSelection.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/selection/RoundRobinOSDSelection.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RoundRobinOSDSelection.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/selection/SequentialObjectSelection.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/SequentialObjectSelection.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/selection/SequentialObjectSelection.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/SequentialObjectSelection.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/MasqueradingTransferStrategy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/MasqueradingTransferStrategy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/MasqueradingTransferStrategy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/MasqueradingTransferStrategy.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/RandomStrategy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RandomStrategy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/RandomStrategy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RandomStrategy.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/RandomStrategyWithoutObjectSets.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RandomStrategyWithoutObjectSets.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/RandomStrategyWithoutObjectSets.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RandomStrategyWithoutObjectSets.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/RarestFirstStrategy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RarestFirstStrategy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/RarestFirstStrategy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RarestFirstStrategy.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/SequentialPrefetchingStrategy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/SequentialPrefetchingStrategy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/SequentialPrefetchingStrategy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/SequentialPrefetchingStrategy.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/SequentialStrategy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/SequentialStrategy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/SequentialStrategy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/SequentialStrategy.java
diff --git a/java/servers/src/org/xtreemfs/osd/replication/transferStrategies/TransferStrategy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/TransferStrategy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/replication/transferStrategies/TransferStrategy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/TransferStrategy.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/CoordinatedReplicaUpdatePolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/CoordinatedReplicaUpdatePolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/CoordinatedReplicaUpdatePolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/CoordinatedReplicaUpdatePolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/FleaseMasterEpochThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/FleaseMasterEpochThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/FleaseMasterEpochThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/FleaseMasterEpochThread.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/ObjectFetchRecord.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ObjectFetchRecord.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/ObjectFetchRecord.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ObjectFetchRecord.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/RWReplicationStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RWReplicationStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/RWReplicationStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RWReplicationStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/RedirectToMasterException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RedirectToMasterException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/RedirectToMasterException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RedirectToMasterException.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/ReplicaUpdatePolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicaUpdatePolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/ReplicaUpdatePolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicaUpdatePolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/ReplicatedFileState.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicatedFileState.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/ReplicatedFileState.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicatedFileState.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/ReplicatedFileStateSimple.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicatedFileStateSimple.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/ReplicatedFileStateSimple.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicatedFileStateSimple.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/RetryException.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RetryException.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/RetryException.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RetryException.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/WaR1UpdatePolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WaR1UpdatePolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/WaR1UpdatePolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WaR1UpdatePolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/WaRaUpdatePolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WaRaUpdatePolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/WaRaUpdatePolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WaRaUpdatePolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/rwre/WqRqUpdatePolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WqRqUpdatePolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/rwre/WqRqUpdatePolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WqRqUpdatePolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/DeletionStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/DeletionStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/DeletionStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/DeletionStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/PreprocStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/PreprocStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/PreprocStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/PreprocStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/ReplicationStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/ReplicationStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/ReplicationStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/ReplicationStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/Stage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/Stage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/Stage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/Stage.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/StorageStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/StorageStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/StorageStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/StorageStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/TracingStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/TracingStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/TracingStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/TracingStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/stages/VivaldiStage.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/VivaldiStage.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/stages/VivaldiStage.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/VivaldiStage.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/CleanupThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CleanupThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/CleanupThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CleanupThread.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/CleanupVersionsThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CleanupVersionsThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/CleanupVersionsThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CleanupVersionsThread.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/CowPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CowPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/CowPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CowPolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/FileMetadata.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/FileMetadata.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/FileMetadata.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/FileMetadata.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/HashStorageLayout.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/HashStorageLayout.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/HashStorageLayout.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/HashStorageLayout.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/MetadataCache.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/MetadataCache.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/MetadataCache.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/MetadataCache.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/ObjectInformation.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/ObjectInformation.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/ObjectInformation.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/ObjectInformation.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/RealSingleFileStorageLayout.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/RealSingleFileStorageLayout.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/RealSingleFileStorageLayout.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/RealSingleFileStorageLayout.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/SingleFileStorageLayout.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/SingleFileStorageLayout.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/SingleFileStorageLayout.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/SingleFileStorageLayout.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/StorageLayout.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/StorageLayout.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/StorageLayout.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/StorageLayout.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/StorageThread.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/StorageThread.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/StorageThread.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/StorageThread.java
diff --git a/java/servers/src/org/xtreemfs/osd/storage/VersionTable.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/VersionTable.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/storage/VersionTable.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/VersionTable.java
diff --git a/java/servers/src/org/xtreemfs/osd/templates/status.html b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/templates/status.html
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/templates/status.html
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/templates/status.html
diff --git a/java/servers/src/org/xtreemfs/osd/tracing/FileOutputTracingPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/FileOutputTracingPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/tracing/FileOutputTracingPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/FileOutputTracingPolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/tracing/SocketOutputTracingPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/SocketOutputTracingPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/tracing/SocketOutputTracingPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/SocketOutputTracingPolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/tracing/TraceInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/TraceInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/tracing/TraceInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/TraceInfo.java
diff --git a/java/servers/src/org/xtreemfs/osd/tracing/TracingPolicy.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/TracingPolicy.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/tracing/TracingPolicy.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/TracingPolicy.java
diff --git a/java/servers/src/org/xtreemfs/osd/vivaldi/VivaldiNode.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/vivaldi/VivaldiNode.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/vivaldi/VivaldiNode.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/vivaldi/VivaldiNode.java
diff --git a/java/servers/src/org/xtreemfs/osd/vivaldi/ZipfGenerator.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/vivaldi/ZipfGenerator.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/osd/vivaldi/ZipfGenerator.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/vivaldi/ZipfGenerator.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/Common.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/Common.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/Common.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/Common.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIR.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIR.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIR.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIR.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceClient.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceConstants.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceConstants.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceConstants.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceConstants.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRC.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRC.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRC.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRC.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceConstants.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceConstants.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceConstants.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceConstants.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSD.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSD.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSD.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSD.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceClient.java
diff --git a/java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/BenchmarkStorageLayouts.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/BenchmarkStorageLayouts.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/BenchmarkStorageLayouts.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/BenchmarkStorageLayouts.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/CleanupDemoVolume.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/CleanupDemoVolume.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/CleanupDemoVolume.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/CleanupDemoVolume.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/DBViewer.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DBViewer.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/DBViewer.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DBViewer.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/DemoScrubber.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DemoScrubber.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/DemoScrubber.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DemoScrubber.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/DemoScrubberFileInfo.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DemoScrubberFileInfo.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/DemoScrubberFileInfo.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DemoScrubberFileInfo.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/ExampleLibxtreemfsWithSSL.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ExampleLibxtreemfsWithSSL.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/ExampleLibxtreemfsWithSSL.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ExampleLibxtreemfsWithSSL.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/LocalX509AuthProvider.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/LocalX509AuthProvider.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/LocalX509AuthProvider.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/LocalX509AuthProvider.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/ThroughputTest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ThroughputTest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/ThroughputTest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ThroughputTest.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/ThroughputTest.properties b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ThroughputTest.properties
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/ThroughputTest.properties
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ThroughputTest.properties
diff --git a/java/servers/src/org/xtreemfs/sandbox/compile-DirectIOReader.txt b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/compile-DirectIOReader.txt
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/compile-DirectIOReader.txt
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/compile-DirectIOReader.txt
diff --git a/java/servers/src/org/xtreemfs/sandbox/dir_replication_test.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/dir_replication_test.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/dir_replication_test.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/dir_replication_test.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/mrc_replication_test.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/mrc_replication_test.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/mrc_replication_test.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/mrc_replication_test.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/sliceTest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/sliceTest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/sliceTest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/sliceTest.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/CreateConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/CreateConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/CreateConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/CreateConfig.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/FcntlLockTest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/FcntlLockTest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/FcntlLockTest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/FcntlLockTest.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/JavaClientTest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/JavaClientTest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/JavaClientTest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/JavaClientTest.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/MRCStressTest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/MRCStressTest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/MRCStressTest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/MRCStressTest.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/OSDTestClient.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/OSDTestClient.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/OSDTestClient.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/OSDTestClient.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/ReplicatedTortureXtreemFS.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/ReplicatedTortureXtreemFS.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/ReplicatedTortureXtreemFS.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/ReplicatedTortureXtreemFS.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/TortureLocalFS.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/TortureLocalFS.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/TortureLocalFS.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/TortureLocalFS.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/TortureXtreemFS.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/TortureXtreemFS.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/TortureXtreemFS.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/TortureXtreemFS.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/tests/rwrepl_test.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/rwrepl_test.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/tests/rwrepl_test.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/rwrepl_test.java
diff --git a/java/servers/src/org/xtreemfs/sandbox/writeTruncTest.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/writeTruncTest.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/sandbox/writeTruncTest.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/writeTruncTest.java
diff --git a/java/servers/src/org/xtreemfs/utils/DefaultDirConfig.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/DefaultDirConfig.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/DefaultDirConfig.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/DefaultDirConfig.java
diff --git a/java/servers/src/org/xtreemfs/utils/discover_dir.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/discover_dir.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/discover_dir.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/discover_dir.java
diff --git a/java/servers/src/org/xtreemfs/utils/utils.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/utils.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/utils.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/utils.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_benchmark/CLIOptions.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/CLIOptions.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_benchmark/CLIOptions.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/CLIOptions.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_benchmark/UncaughtExceptionHandlerBenchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/UncaughtExceptionHandlerBenchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_benchmark/UncaughtExceptionHandlerBenchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/UncaughtExceptionHandlerBenchmark.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_benchmark/xtfs_benchmark.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/xtfs_benchmark.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_benchmark/xtfs_benchmark.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/xtfs_benchmark.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_chstatus.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_chstatus.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_chstatus.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_chstatus.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_cleanup_osd.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_cleanup_osd.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_cleanup_osd.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_cleanup_osd.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_mrcdbtool.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_mrcdbtool.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_mrcdbtool.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_mrcdbtool.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_remove_osd.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_remove_osd.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_remove_osd.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_remove_osd.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_scrub/FileScrubber.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_scrub/FileScrubber.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_scrub/FileScrubber.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_scrub/FileScrubber.java
diff --git a/java/servers/src/org/xtreemfs/utils/xtfs_scrub/xtfs_scrub.java b/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_scrub/xtfs_scrub.java
similarity index 100%
rename from java/servers/src/org/xtreemfs/utils/xtfs_scrub/xtfs_scrub.java
rename to java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_scrub/xtfs_scrub.java
diff --git a/java/flease/nbproject/private/config.properties b/java/xtreemfs-servers/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
similarity index 100%
rename from java/flease/nbproject/private/config.properties
rename to java/xtreemfs-servers/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
diff --git a/java/xtreemfs-servers/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/java/xtreemfs-servers/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000000000000000000000000000000000000..09c316c1da259f6c832b47915d9f01262fea3a12
--- /dev/null
+++ b/java/xtreemfs-servers/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,482 @@
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/DirMBean.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DIROperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InvalidateXLocSetOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/mrc_replication_test.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRRequestDispatcher.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/OptionsProxy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/StatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/OSDVoucherManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/IntVector.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/ServiceUUID.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/UserCredentials.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/UserException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/UUIDResolver.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ReplicatedFileStatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XLocList.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCInternalRequest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/POSIXFileAccessPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeFileHandle.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/Mapping.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXLocListOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ClientFactory.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceConstants.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/PeriodicXcapRenewalThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/quota/QuotaConstants.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/ObjectSetOSDSelection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortReversePolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/KeyValuePairs.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotStorageManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DeleteVolumeOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/StorageLayout.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaChangeListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileVoucherClientInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/PosixErrorException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/DeletionStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBVolumeManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XLoc.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/DefaultDirConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXLoc.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/AccessOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/RAID0ObjectMapper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/UnalignedSequentialWriteBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/GlobalConstants.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/GeneralImpl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkFactory.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/RAID0Impl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceConstants.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RequestTimeHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/PolicyContainer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCRequestDispatcher.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WaR1UpdatePolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServerHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_cleanup_osd.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/HashStorageLayout.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetFileCredentialsOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jni.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CleanupVersionsThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIR.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherClientInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReadDirAndStatOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateVolumeOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ConfigurationRecord.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_remove_osd.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminVolume.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/drain/OSDDrain.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RestoreDBOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/OsdMeta.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/BabuDBStatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/PolicyClassLoader.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDPolicyContainer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_scrub/xtfs_scrub.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RarestFirstStrategy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RandomOSDSelection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterDefaultPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/FleaseMessageOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/TransferStrategy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapperFactory.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RemoveXAttrOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DeleteOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBStorageHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/OSDSelectionPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/MrcImpl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDStatusListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/JavaClientTest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/AbstractBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventGmax.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetAddressMappingOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/AddressMappingRecord.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/PathResolver.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBVolumeInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXAttrOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/WriteOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WaRaUpdatePolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/AtomicDBUpdate.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RWRNotifyOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RoundRobinOSDSelection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/DIRServiceClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RemoveReplicaOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBStorageManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringVector.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXLocList.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventPingFile.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DBAccessResultListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/XAttr.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/OsdMBean.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/xtreemfs_jniJNI.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RWReplicationStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/CleanupDemoVolume.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/UncaughtExceptionHandlerBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkResult.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AsyncWriteBuffer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Helper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortHostRoundRobinPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/VolumeQuotaManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileVoucherInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ClearVouchersOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetSuitableOSDsOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/InternalDebugOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/SequentialStrategy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetLocalVolumesOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RenewCapabilityAndVoucherOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_mrcdbtool.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/CLIOptions.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringMap.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/utils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedXAttr.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/ObjectMapper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Volume.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/MonitoringThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/Common.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/FileAccessManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileMetadata.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Volume.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/DBAdminHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DemoScrubberFileInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/sliceTest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/MrcMBean.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/UUIDIterator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCPolicyContainer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetCoordinatorCallback.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateLinkOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RenewOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/MoveOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RandomObjectSelection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRStatusListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/Controller.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/InvalidChecksumException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UUIDCacheEntry.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/General.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/CreateConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/writeTruncTest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/TortureLocalFS.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockReleaseOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_scrub/FileScrubber.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_chstatus.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CheckpointOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/SocketOutputTracingPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIR.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/Voucher.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/ReplicationStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/ClientProxy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/HeartbeatThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/FileAccessPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/StripingPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/RandomAccessFile.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/UncaughtExceptionHandlerBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/xtfs_benchmark/xtfs_benchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/UpdateFileSizeOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/StorageManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/ReplicationPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRUpdateOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReselectOSDsOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/GetFileIDListOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/ServiceOfflineOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/VivaldiPingOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/Inet4AddressMatcher.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/vivaldi/VivaldiNode.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/ReadOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventInsertPaddingObject.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkFailedException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBSnapshotVolumeInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/UUIDResolverProxy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/VivaldiStatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ObjectDissemination.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/FederationIdX509AuthProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/VolumeManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/MRCStressTest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCRequest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/UUIDIteratorListIsEmpyException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/VivaldiStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/InternalCallbackInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedIndexMetadata.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/File.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetCoordinator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/Converter.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/ReplicationManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/RPCCaller.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/util/NetUtils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/TransactionalBabuDBUpdate.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/RepairObjectOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/MetadataCache.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InvalidViewException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicaUpdatePolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/ReplicaUpdatePolicies.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/GetObjectSetOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/LocationsCache.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSD.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalGetGmaxOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslatorRaid0.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/internal/OpenFileList.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/ServiceAvailability.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Client.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/VolumeImplementation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/UpdateVivaldiClientOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventCreateFileVersion.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterFQDNPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Mrc.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DeleteAddressMappingOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomWriteBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServiceByUuidOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/SequentialPrefetchingStrategy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Options.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AsyncWriteHandler.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/GlobalTypes.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/AtomicBabuDBSnapshotUpdate.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/StatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/PreprocStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/OnCloseReplicationThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/VolumeACLFileAccessPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/PrintStackTrace.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/VolumeOSDFilter.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventWriteObject.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/DirImpl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/ObjectInformation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/AuthenticationProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/rwrepl_test.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/SimpleX509AuthProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ReadOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/GroupFQDNPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalTruncateOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateSymLinkOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedFileVoucherInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/AuthenticationException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InvalidChecksumException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringList.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedRCMetadata.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OpenFileTable.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RandomStrategy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/AddressMappingRecords.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortUUIDPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CheckFileListOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/FileMetadata.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRFetchOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/MrcMeta.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/ServiceConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/DumpDBOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/TruncateOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXLocSetOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/RequestDetails.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/XLocations.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/VivaldiClientMap.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalGetFileSizeOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ObjectStore.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ReplicatingFile.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/OSDTestClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Dir.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/FileMetadata.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceConstants.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/ServiceAddresses.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/Osd.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileHandle.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/VersionTable.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/MasqueradingTransferStrategy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRC.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/StatFSOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/StatOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminFileHandle.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/UUIDNotInXlocSetException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/TracingStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RedirectToMasterException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UnknownUUIDException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedMetadata.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FQDNPolicyBase.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/AddressToUUIDNotFoundException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/MRCHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/KeepFileOpenOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/MetadataCache.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/RegisterServiceOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRC.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ObjectFetchRecord.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/transferStrategies/RandomStrategyWithoutObjectSets.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/discovery/DiscoveryUtils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetConfigurationOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/CoordinatedReplicaUpdatePolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCStatusManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/OpenOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Tupel.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupGetResultsOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/InternalServerErrorException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRTruncateOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/ACLEntry.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/AdvisoryLock.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/QuotaFileInformation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRAuthStateOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DatabaseResultSet.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/io/ByteMapperRAID0.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/WriteOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/VolumeProxy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ServiceRecords.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedACLEntry.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomOffsetbasedBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/PolicyHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ErrorCodes.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/TracingPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/GeneralMeta.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/DCMapPolicyBase.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/XLocSetLock.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/Capability.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupIsRunningOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRAuthStateInvalidatedOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/RestoreFileOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/SetConfigurationOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DBViewer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/FilterUUIDPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkConfig.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetGlobalTimeOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/VolumeNotFoundException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServiceByNameOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/PeriodicFileSizeUpdateThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicatedFileState.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/FinalizeVouchersOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/DatabaseException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventCloseFile.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialReadBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/Stage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/quota/VoucherManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ErrorRecord.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/Replica.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminFileHandle.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/FileOutputTracingPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/RandomReadBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/RetryException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeUUIDResolver.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/ProcessingStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockCheckOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/BabuDBRequestListenerWrapper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/StripingPolicyImpl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/TortureXtreemFS.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/drain/OSDDrainException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/MRCServiceClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/DIRRequest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/RemoteConfigHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/FSetAttrOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortVivaldiPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/CreateDirOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/RealSingleFileStorageLayout.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortRandomPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRResetStatusOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/StatusMonitor.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/stages/MRCStageCallbackInterface.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/Client.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/InternalObjectData.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/stages/StorageStage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortFQDNPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/quota/FinalizeVoucherResponseHelper.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/metadata/BufferBackedStripingPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/InvalidXLocationsException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/ReplicationFlags.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDRequestDispatcher.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/GroupDCMapPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/SSLOptionsProxy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/config/Config.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/DeregisterServiceOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/discovery/DiscoveryMsgThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/GetServicesByTypeOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetattrOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/SSLContext.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/OSDStatusManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedReadBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/FileHandleProxy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/Replica.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSD.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LocalReadOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/FileHandleImplementation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServerModule.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/OsdImpl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/BenchmarkStorageLayouts.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/DirMeta.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/DeleteOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/pbrpc/generatedinterfaces/OSDServiceClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/InternalRWRStatusOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/SequentialWriteBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/vivaldi/ZipfGenerator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/GetXAttrsOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/data/ServiceRecord.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/operations/SetAddressMappingOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/ReplicatedFileStateSimple.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/auth/NullAuthProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/babudb/AtomicBabuDBUpdate.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/uuids/UUIDResolver.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/MetadataCacheEntry.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/StringListIterator.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupStopOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/EventRWRStatus.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/StatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/tracing/TraceInfo.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetReplicaUpdatePolicyOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/RarestFirstObjectSelection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/GeneralMBean.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/ClientImplementation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/DemoScrubber.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/xloc/ReplicationPolicyImplementation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/FileVoucherManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/AdminVolume.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CheckObjectOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupVersionsStartOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/utils/Path.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/XtreemFSServiceType.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/exceptions/XtreemFSException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/XTREEMFS_MIBImpl.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/LockAcquireOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/WqRqUpdatePolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/InetAddressMatcher.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/TruncateOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/AddReplicaOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/osdselection/SortDCMapPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCStatusListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CowPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/ReplicatedFileStatusJSON.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/utils/discover_dir.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/MRCException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/SingleFileStorageLayout.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/selection/SequentialObjectSelection.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/ac/YesToAnyoneFileAccessPolicy.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ShutdownOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/SetXAttrOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/MRCOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ExampleLibxtreemfsWithSSL.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/ShutdownOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/operations/ReadLinkOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeAdminClient.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/rwre/FleaseMasterEpochThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/replication/ObjectSet.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupStartOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/NativeVolume.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/libxtreemfs/jni/generated/UserMapping.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/CleanupGetStatusOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/LocalX509AuthProvider.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/ClientManager.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/StorageThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/OSDRequest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/FilebasedWriteBenchmark.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/statusserver/StatusServer.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/mrc/database/VolumeChangeListener.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/benchmark/BenchmarkUtils.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIBOidTable.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/dir_replication_test.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/CachedXAttr.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/storage/CleanupThread.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/quota/VoucherErrorException.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/ThroughputTest.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/ReplicatedTortureXtreemFS.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/dir/ReplicaStatusPage.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/clients/RandomAccessFile.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/common/monitoring/generatedcode/XTREEMFS_MIB.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/osd/operations/OSDOperation.java
+/home/robert/workspace/xtreemfs/java/xtreemfs-servers/src/main/java/org/xtreemfs/sandbox/tests/FcntlLockTest.java
diff --git a/java/servers/test/org/xtreemfs/common/clients/ClientTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/clients/ClientTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/clients/ClientTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/clients/ClientTest.java
diff --git a/java/servers/test/org/xtreemfs/common/clients/ReplicatedClientTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/clients/ReplicatedClientTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/clients/ReplicatedClientTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/clients/ReplicatedClientTest.java
diff --git a/java/servers/test/org/xtreemfs/common/clients/internal/RAID0ObjectMapperTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/clients/internal/RAID0ObjectMapperTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/clients/internal/RAID0ObjectMapperTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/clients/internal/RAID0ObjectMapperTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/ClientTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/ClientTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/ClientTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/ClientTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/FileHandleImplementationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/FileHandleImplementationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/FileHandleImplementationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/FileHandleImplementationTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/FileHandleTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/FileHandleTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/FileHandleTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/FileHandleTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/FileSizeUpdateThreadTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/FileSizeUpdateThreadTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/FileSizeUpdateThreadTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/FileSizeUpdateThreadTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/MetadataCacheTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/MetadataCacheTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/MetadataCacheTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/MetadataCacheTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/NativeTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/NativeTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/NativeTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/NativeTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/RPCCallerTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/RPCCallerTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/RPCCallerTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/RPCCallerTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/ReadOnlyReplicationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/ReadOnlyReplicationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/ReadOnlyReplicationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/ReadOnlyReplicationTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/StripeTranslatorTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslatorTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/StripeTranslatorTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/StripeTranslatorTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/UUIDIteratorTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/UUIDIteratorTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/UUIDIteratorTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/UUIDIteratorTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/UUIDResolverTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/UUIDResolverTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/UUIDResolverTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/UUIDResolverTest.java
diff --git a/java/servers/test/org/xtreemfs/common/libxtreemfs/VolumeTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/VolumeTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/libxtreemfs/VolumeTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/libxtreemfs/VolumeTest.java
diff --git a/java/servers/test/org/xtreemfs/common/statusserver/StatusServerTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/common/statusserver/StatusServerTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/common/statusserver/StatusServerTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/common/statusserver/StatusServerTest.java
diff --git a/java/servers/test/org/xtreemfs/integrationtest/ExternalIntegrationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/integrationtest/ExternalIntegrationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/integrationtest/ExternalIntegrationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/integrationtest/ExternalIntegrationTest.java
diff --git a/java/servers/test/org/xtreemfs/test/SetupUtils.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/SetupUtils.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/SetupUtils.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/SetupUtils.java
diff --git a/java/servers/test/org/xtreemfs/test/TestEnvironment.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/TestEnvironment.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/TestEnvironment.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/TestEnvironment.java
diff --git a/java/servers/test/org/xtreemfs/test/TestHelper.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/TestHelper.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/TestHelper.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/TestHelper.java
diff --git a/java/servers/test/org/xtreemfs/test/common/CapabilityTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/CapabilityTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/CapabilityTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/CapabilityTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/benchmark/ControllerIntegrationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/benchmark/ControllerIntegrationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/benchmark/ControllerIntegrationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/benchmark/ControllerIntegrationTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/monitoring/DIRMonitoringTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/DIRMonitoringTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/monitoring/DIRMonitoringTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/DIRMonitoringTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/monitoring/GeneralMonitoringTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/GeneralMonitoringTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/monitoring/GeneralMonitoringTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/GeneralMonitoringTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/monitoring/MRCMonitoringTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/MRCMonitoringTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/monitoring/MRCMonitoringTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/MRCMonitoringTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/monitoring/OSDMonitoringTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/OSDMonitoringTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/monitoring/OSDMonitoringTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/monitoring/OSDMonitoringTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/striping/LocationsCacheTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/striping/LocationsCacheTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/striping/LocationsCacheTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/striping/LocationsCacheTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/striping/LocationsTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/striping/LocationsTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/striping/LocationsTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/striping/LocationsTest.java
diff --git a/java/servers/test/org/xtreemfs/test/common/striping/RAID0Test.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/striping/RAID0Test.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/striping/RAID0Test.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/striping/RAID0Test.java
diff --git a/java/servers/test/org/xtreemfs/test/common/uuid/UUIDResolverTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/uuid/UUIDResolverTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/common/uuid/UUIDResolverTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/common/uuid/UUIDResolverTest.java
diff --git a/java/servers/test/org/xtreemfs/test/dir/DIRClientTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/dir/DIRClientTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/dir/DIRClientTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/dir/DIRClientTest.java
diff --git a/java/servers/test/org/xtreemfs/test/dir/DIRTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/dir/DIRTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/dir/DIRTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/dir/DIRTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/BabuDBStorageManagerTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BabuDBStorageManagerTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/BabuDBStorageManagerTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BabuDBStorageManagerTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/BufferBackedFileVoucherClientInfoTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BufferBackedFileVoucherClientInfoTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/BufferBackedFileVoucherClientInfoTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BufferBackedFileVoucherClientInfoTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/BufferBackedFileVoucherInfoTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BufferBackedFileVoucherInfoTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/BufferBackedFileVoucherInfoTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BufferBackedFileVoucherInfoTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/BufferBackedMetadataTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BufferBackedMetadataTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/BufferBackedMetadataTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/BufferBackedMetadataTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/MRCTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/MRCTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/MRCTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/MRCTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/OSDPolicyTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/OSDPolicyTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/OSDPolicyTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/OSDPolicyTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/QuotaTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/QuotaTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/QuotaTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/QuotaTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/ReselectOSDsTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/ReselectOSDsTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/ReselectOSDsTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/ReselectOSDsTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/SetReplicaUpdatePolicyTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/SetReplicaUpdatePolicyTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/SetReplicaUpdatePolicyTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/SetReplicaUpdatePolicyTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/SnapshotTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/SnapshotTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/SnapshotTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/SnapshotTest.java
diff --git a/java/servers/test/org/xtreemfs/test/mrc/XLocSetCoordinatorTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/XLocSetCoordinatorTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/mrc/XLocSetCoordinatorTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/mrc/XLocSetCoordinatorTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/AdvisoryLocksTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/AdvisoryLocksTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/AdvisoryLocksTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/AdvisoryLocksTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/CleanupTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/CleanupTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/CleanupTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/CleanupTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/CowPolicyTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/CowPolicyTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/CowPolicyTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/CowPolicyTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/FastDeleteOpenFile.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/FastDeleteOpenFile.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/FastDeleteOpenFile.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/FastDeleteOpenFile.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/OSDDataIntegrityTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDDataIntegrityTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/OSDDataIntegrityTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDDataIntegrityTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/OSDDrainTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDDrainTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/OSDDrainTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDDrainTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/OSDRangeReads.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDRangeReads.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/OSDRangeReads.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDRangeReads.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/OSDTruncateTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDTruncateTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/OSDTruncateTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/OSDTruncateTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/SimpleVivaldiStageTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/SimpleVivaldiStageTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/SimpleVivaldiStageTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/SimpleVivaldiStageTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/StorageLayoutTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StorageLayoutTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/StorageLayoutTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StorageLayoutTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/StorageStageTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StorageStageTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/StorageStageTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StorageStageTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/StripingTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StripingTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/StripingTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StripingTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/StripingTestCOW.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StripingTestCOW.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/StripingTestCOW.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/StripingTestCOW.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/TracingTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/TracingTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/TracingTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/TracingTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/VersionManagementTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/VersionManagementTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/VersionManagementTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/VersionManagementTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/VersionTableTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/VersionTableTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/VersionTableTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/VersionTableTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/replication/ObjectSetTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ObjectSetTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/replication/ObjectSetTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ObjectSetTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/replication/ReadWriteReplicationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ReadWriteReplicationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/replication/ReadWriteReplicationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ReadWriteReplicationTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/replication/ReplicationRAFTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ReplicationRAFTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/replication/ReplicationRAFTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ReplicationRAFTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/replication/ReplicationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ReplicationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/replication/ReplicationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ReplicationTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/replication/ServiceAvailabilityTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ServiceAvailabilityTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/replication/ServiceAvailabilityTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/ServiceAvailabilityTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/replication/TransferStrategiesTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/TransferStrategiesTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/replication/TransferStrategiesTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/replication/TransferStrategiesTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/rwre/FixWrongMasterEpochDirectoryTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/FixWrongMasterEpochDirectoryTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/rwre/FixWrongMasterEpochDirectoryTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/FixWrongMasterEpochDirectoryTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/rwre/RWQuorumReplicationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/RWQuorumReplicationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/rwre/RWQuorumReplicationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/RWQuorumReplicationTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/rwre/RWReplicationFailureTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/RWReplicationFailureTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/rwre/RWReplicationFailureTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/RWReplicationFailureTest.java
diff --git a/java/servers/test/org/xtreemfs/test/osd/rwre/RWReplicationTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/RWReplicationTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/test/osd/rwre/RWReplicationTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/test/osd/rwre/RWReplicationTest.java
diff --git a/java/servers/test/org/xtreemfs/utils/ScrubberTest.java b/java/xtreemfs-servers/test/main/java/org/xtreemfs/utils/ScrubberTest.java
similarity index 100%
rename from java/servers/test/org/xtreemfs/utils/ScrubberTest.java
rename to java/xtreemfs-servers/test/main/java/org/xtreemfs/utils/ScrubberTest.java