diff --git a/build.gradle b/lib-base/build.gradle
similarity index 100%
rename from build.gradle
rename to lib-base/build.gradle
diff --git a/build/antrun.sh b/lib-base/build/antrun.sh
similarity index 100%
rename from build/antrun.sh
rename to lib-base/build/antrun.sh
diff --git a/build/build.xml b/lib-base/build/build.xml
similarity index 100%
rename from build/build.xml
rename to lib-base/build/build.xml
diff --git a/dist/COPYING b/lib-base/dist/COPYING
similarity index 100%
rename from dist/COPYING
rename to lib-base/dist/COPYING
diff --git a/dist/COPYING_HDF b/lib-base/dist/COPYING_HDF
similarity index 100%
rename from dist/COPYING_HDF
rename to lib-base/dist/COPYING_HDF
diff --git a/dist/LICENSE b/lib-base/dist/LICENSE
similarity index 100%
rename from dist/LICENSE
rename to lib-base/dist/LICENSE
diff --git a/doc/tagged_array_def.txt b/lib-base/doc/tagged_array_def.txt
similarity index 100%
rename from doc/tagged_array_def.txt
rename to lib-base/doc/tagged_array_def.txt
diff --git a/gradle/wrapper/gradle-wrapper.jar b/lib-base/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to lib-base/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/lib-base/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to lib-base/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/lib-base/gradlew
similarity index 100%
rename from gradlew
rename to lib-base/gradlew
diff --git a/gradlew.bat b/lib-base/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to lib-base/gradlew.bat
diff --git a/javaproject.gradle b/lib-base/javaproject.gradle
similarity index 100%
rename from javaproject.gradle
rename to lib-base/javaproject.gradle
diff --git a/libs/native/nativedata/amd64-Linux/libnativedata.so b/lib-base/libs/native/nativedata/amd64-Linux/libnativedata.so
similarity index 100%
rename from libs/native/nativedata/amd64-Linux/libnativedata.so
rename to lib-base/libs/native/nativedata/amd64-Linux/libnativedata.so
diff --git a/libs/native/nativedata/amd64-Windows/nativedata.dll b/lib-base/libs/native/nativedata/amd64-Windows/nativedata.dll
similarity index 100%
rename from libs/native/nativedata/amd64-Windows/nativedata.dll
rename to lib-base/libs/native/nativedata/amd64-Windows/nativedata.dll
diff --git a/libs/native/nativedata/arm-Linux/libnativedata.so b/lib-base/libs/native/nativedata/arm-Linux/libnativedata.so
similarity index 100%
rename from libs/native/nativedata/arm-Linux/libnativedata.so
rename to lib-base/libs/native/nativedata/arm-Linux/libnativedata.so
diff --git a/libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib b/lib-base/libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
similarity index 100%
rename from libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
rename to lib-base/libs/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
diff --git a/libs/native/unix/amd64-Linux/libunix.so b/lib-base/libs/native/unix/amd64-Linux/libunix.so
similarity index 100%
rename from libs/native/unix/amd64-Linux/libunix.so
rename to lib-base/libs/native/unix/amd64-Linux/libunix.so
diff --git a/libs/native/unix/arm-Linux/libunix.so b/lib-base/libs/native/unix/arm-Linux/libunix.so
similarity index 100%
rename from libs/native/unix/arm-Linux/libunix.so
rename to lib-base/libs/native/unix/arm-Linux/libunix.so
diff --git a/libs/native/unix/x86_64-Mac OS X/libunix.jnilib b/lib-base/libs/native/unix/x86_64-Mac OS X/libunix.jnilib
similarity index 100%
rename from libs/native/unix/x86_64-Mac OS X/libunix.jnilib
rename to lib-base/libs/native/unix/x86_64-Mac OS X/libunix.jnilib
diff --git a/repository.gradle b/lib-base/repository.gradle
similarity index 100%
rename from repository.gradle
rename to lib-base/repository.gradle
diff --git a/resource/dependency-structure.ddf b/lib-base/resource/dependency-structure.ddf
similarity index 100%
rename from resource/dependency-structure.ddf
rename to lib-base/resource/dependency-structure.ddf
diff --git a/settings.gradle b/lib-base/settings.gradle
similarity index 100%
rename from settings.gradle
rename to lib-base/settings.gradle
diff --git a/source/c/COPYING b/lib-base/source/c/COPYING
similarity index 100%
rename from source/c/COPYING
rename to lib-base/source/c/COPYING
diff --git a/source/c/Makefile_Win64.mak b/lib-base/source/c/Makefile_Win64.mak
similarity index 100%
rename from source/c/Makefile_Win64.mak
rename to lib-base/source/c/Makefile_Win64.mak
diff --git a/source/c/compile_linux_amd64.sh b/lib-base/source/c/compile_linux_amd64.sh
similarity index 100%
rename from source/c/compile_linux_amd64.sh
rename to lib-base/source/c/compile_linux_amd64.sh
diff --git a/source/c/compile_linux_arm.sh b/lib-base/source/c/compile_linux_arm.sh
similarity index 100%
rename from source/c/compile_linux_arm.sh
rename to lib-base/source/c/compile_linux_arm.sh
diff --git a/source/c/compile_macosx_x86_64.sh b/lib-base/source/c/compile_macosx_x86_64.sh
similarity index 100%
rename from source/c/compile_macosx_x86_64.sh
rename to lib-base/source/c/compile_macosx_x86_64.sh
diff --git a/source/c/copyByteChar.c b/lib-base/source/c/copyByteChar.c
similarity index 100%
rename from source/c/copyByteChar.c
rename to lib-base/source/c/copyByteChar.c
diff --git a/source/c/copyByteDouble.c b/lib-base/source/c/copyByteDouble.c
similarity index 100%
rename from source/c/copyByteDouble.c
rename to lib-base/source/c/copyByteDouble.c
diff --git a/source/c/copyByteFloat.c b/lib-base/source/c/copyByteFloat.c
similarity index 100%
rename from source/c/copyByteFloat.c
rename to lib-base/source/c/copyByteFloat.c
diff --git a/source/c/copyByteInt.c b/lib-base/source/c/copyByteInt.c
similarity index 100%
rename from source/c/copyByteInt.c
rename to lib-base/source/c/copyByteInt.c
diff --git a/source/c/copyByteLong.c b/lib-base/source/c/copyByteLong.c
similarity index 100%
rename from source/c/copyByteLong.c
rename to lib-base/source/c/copyByteLong.c
diff --git a/source/c/copyByteShort.c b/lib-base/source/c/copyByteShort.c
similarity index 100%
rename from source/c/copyByteShort.c
rename to lib-base/source/c/copyByteShort.c
diff --git a/source/c/copyByteTarget.ctempl b/lib-base/source/c/copyByteTarget.ctempl
similarity index 100%
rename from source/c/copyByteTarget.ctempl
rename to lib-base/source/c/copyByteTarget.ctempl
diff --git a/source/c/copyCommon.c b/lib-base/source/c/copyCommon.c
similarity index 100%
rename from source/c/copyCommon.c
rename to lib-base/source/c/copyCommon.c
diff --git a/source/c/unix.c b/lib-base/source/c/unix.c
similarity index 100%
rename from source/c/unix.c
rename to lib-base/source/c/unix.c
diff --git a/source/java/ch/systemsx/cisd/base/BuildAndEnvironmentInfo.java b/lib-base/source/java/ch/systemsx/cisd/base/BuildAndEnvironmentInfo.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/BuildAndEnvironmentInfo.java
rename to lib-base/source/java/ch/systemsx/cisd/base/BuildAndEnvironmentInfo.java
diff --git a/source/java/ch/systemsx/cisd/base/annotation/JsonObject.java b/lib-base/source/java/ch/systemsx/cisd/base/annotation/JsonObject.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/annotation/JsonObject.java
rename to lib-base/source/java/ch/systemsx/cisd/base/annotation/JsonObject.java
diff --git a/source/java/ch/systemsx/cisd/base/convert/NativeArrayEncoding.java b/lib-base/source/java/ch/systemsx/cisd/base/convert/NativeArrayEncoding.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/convert/NativeArrayEncoding.java
rename to lib-base/source/java/ch/systemsx/cisd/base/convert/NativeArrayEncoding.java
diff --git a/source/java/ch/systemsx/cisd/base/convert/NativeData.java b/lib-base/source/java/ch/systemsx/cisd/base/convert/NativeData.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/convert/NativeData.java
rename to lib-base/source/java/ch/systemsx/cisd/base/convert/NativeData.java
diff --git a/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java b/lib-base/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnel.java b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnel.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnel.java
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnel.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/IOExceptionUnchecked.java b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/IOExceptionUnchecked.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/IOExceptionUnchecked.java
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/IOExceptionUnchecked.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/InterruptedExceptionUnchecked.java b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/InterruptedExceptionUnchecked.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/InterruptedExceptionUnchecked.java
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/InterruptedExceptionUnchecked.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/StopException.java b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/StopException.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/StopException.java
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/StopException.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/TimeoutExceptionUnchecked.java b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/TimeoutExceptionUnchecked.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/TimeoutExceptionUnchecked.java
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/TimeoutExceptionUnchecked.java
diff --git a/source/java/ch/systemsx/cisd/base/exceptions/package.html b/lib-base/source/java/ch/systemsx/cisd/base/exceptions/package.html
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/exceptions/package.html
rename to lib-base/source/java/ch/systemsx/cisd/base/exceptions/package.html
diff --git a/source/java/ch/systemsx/cisd/base/image/IImageTransformer.java b/lib-base/source/java/ch/systemsx/cisd/base/image/IImageTransformer.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/image/IImageTransformer.java
rename to lib-base/source/java/ch/systemsx/cisd/base/image/IImageTransformer.java
diff --git a/source/java/ch/systemsx/cisd/base/image/IImageTransformerFactory.java b/lib-base/source/java/ch/systemsx/cisd/base/image/IImageTransformerFactory.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/image/IImageTransformerFactory.java
rename to lib-base/source/java/ch/systemsx/cisd/base/image/IImageTransformerFactory.java
diff --git a/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformer.java b/lib-base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformer.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformer.java
rename to lib-base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformer.java
diff --git a/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java b/lib-base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java
rename to lib-base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java
diff --git a/source/java/ch/systemsx/cisd/base/io/AdapterIInputStreamToInputStream.java b/lib-base/source/java/ch/systemsx/cisd/base/io/AdapterIInputStreamToInputStream.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/AdapterIInputStreamToInputStream.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/AdapterIInputStreamToInputStream.java
diff --git a/source/java/ch/systemsx/cisd/base/io/AdapterIOutputStreamToOutputStream.java b/lib-base/source/java/ch/systemsx/cisd/base/io/AdapterIOutputStreamToOutputStream.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/AdapterIOutputStreamToOutputStream.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/AdapterIOutputStreamToOutputStream.java
diff --git a/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java b/lib-base/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java
diff --git a/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java b/lib-base/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java
diff --git a/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java b/lib-base/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java
diff --git a/source/java/ch/systemsx/cisd/base/io/IInputStream.java b/lib-base/source/java/ch/systemsx/cisd/base/io/IInputStream.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/IInputStream.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/IInputStream.java
diff --git a/source/java/ch/systemsx/cisd/base/io/IOutputStream.java b/lib-base/source/java/ch/systemsx/cisd/base/io/IOutputStream.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/IOutputStream.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/IOutputStream.java
diff --git a/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java b/lib-base/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java
diff --git a/source/java/ch/systemsx/cisd/base/io/ISynchronizable.java b/lib-base/source/java/ch/systemsx/cisd/base/io/ISynchronizable.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/ISynchronizable.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/ISynchronizable.java
diff --git a/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java b/lib-base/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java
rename to lib-base/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDByteArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDDoubleArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDDoubleArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDDoubleArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDDoubleArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDFloatArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDIntArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDLongArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/MDShortArray.java
diff --git a/source/java/ch/systemsx/cisd/base/mdarray/package.html b/lib-base/source/java/ch/systemsx/cisd/base/mdarray/package.html
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/mdarray/package.html
rename to lib-base/source/java/ch/systemsx/cisd/base/mdarray/package.html
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/ICallableNameProvider.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/ICallableNameProvider.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/ICallableNameProvider.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/ICallableNameProvider.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/IRunnableNameProvider.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/IRunnableNameProvider.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/IRunnableNameProvider.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/IRunnableNameProvider.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java
diff --git a/source/java/ch/systemsx/cisd/base/namedthread/package.html b/lib-base/source/java/ch/systemsx/cisd/base/namedthread/package.html
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/namedthread/package.html
rename to lib-base/source/java/ch/systemsx/cisd/base/namedthread/package.html
diff --git a/source/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java b/lib-base/source/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
rename to lib-base/source/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
diff --git a/source/java/ch/systemsx/cisd/base/tests/Retry10.java b/lib-base/source/java/ch/systemsx/cisd/base/tests/Retry10.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/tests/Retry10.java
rename to lib-base/source/java/ch/systemsx/cisd/base/tests/Retry10.java
diff --git a/source/java/ch/systemsx/cisd/base/tests/Retry50.java b/lib-base/source/java/ch/systemsx/cisd/base/tests/Retry50.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/tests/Retry50.java
rename to lib-base/source/java/ch/systemsx/cisd/base/tests/Retry50.java
diff --git a/source/java/ch/systemsx/cisd/base/unix/FileLinkType.java b/lib-base/source/java/ch/systemsx/cisd/base/unix/FileLinkType.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/unix/FileLinkType.java
rename to lib-base/source/java/ch/systemsx/cisd/base/unix/FileLinkType.java
diff --git a/source/java/ch/systemsx/cisd/base/unix/Unix.java b/lib-base/source/java/ch/systemsx/cisd/base/unix/Unix.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/unix/Unix.java
rename to lib-base/source/java/ch/systemsx/cisd/base/unix/Unix.java
diff --git a/source/java/ch/systemsx/cisd/base/unix/package.html b/lib-base/source/java/ch/systemsx/cisd/base/unix/package.html
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/unix/package.html
rename to lib-base/source/java/ch/systemsx/cisd/base/unix/package.html
diff --git a/source/java/ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.java b/lib-base/source/java/ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.java
rename to lib-base/source/java/ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.java
diff --git a/source/java/ch/systemsx/cisd/base/utilities/NativeLibraryUtilities.java b/lib-base/source/java/ch/systemsx/cisd/base/utilities/NativeLibraryUtilities.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/utilities/NativeLibraryUtilities.java
rename to lib-base/source/java/ch/systemsx/cisd/base/utilities/NativeLibraryUtilities.java
diff --git a/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java b/lib-base/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java
rename to lib-base/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java
diff --git a/source/java/ch/systemsx/cisd/base/utilities/ResourceUtilities.java b/lib-base/source/java/ch/systemsx/cisd/base/utilities/ResourceUtilities.java
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/utilities/ResourceUtilities.java
rename to lib-base/source/java/ch/systemsx/cisd/base/utilities/ResourceUtilities.java
diff --git a/source/java/ch/systemsx/cisd/base/utilities/package.html b/lib-base/source/java/ch/systemsx/cisd/base/utilities/package.html
similarity index 100%
rename from source/java/ch/systemsx/cisd/base/utilities/package.html
rename to lib-base/source/java/ch/systemsx/cisd/base/utilities/package.html
diff --git a/sourceTest/java/ch/systemsx/cisd/base/AllTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/AllTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/AllTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/AllTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeDataTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/convert/NativeTaggedArrayTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeTaggedArrayTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/convert/NativeTaggedArrayTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/convert/NativeTaggedArrayTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnelTest.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnelTest.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnelTest.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/exceptions/CheckedExceptionTunnelTest.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/exceptions/IOExceptionUncheckedTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/exceptions/IOExceptionUncheckedTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/exceptions/IOExceptionUncheckedTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/exceptions/IOExceptionUncheckedTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFileTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFileTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFileTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFileTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/io/IRandomAccessFileTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/io/IRandomAccessFileTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/io/IRandomAccessFileTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/io/IRandomAccessFileTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/io/RandomAccessFileImplTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/io/RandomAccessFileImplTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/io/RandomAccessFileImplTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/io/RandomAccessFileImplTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixRootTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixRootTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/unix/UnixRootTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixRootTests.java
diff --git a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java b/lib-base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
similarity index 100%
rename from sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
rename to lib-base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
diff --git a/sourceTest/java/tests.xml b/lib-base/sourceTest/java/tests.xml
similarity index 100%
rename from sourceTest/java/tests.xml
rename to lib-base/sourceTest/java/tests.xml