diff --git a/extras/java/trunk/AUTHORS b/experimental/java-libburnia/AUTHORS
similarity index 100%
rename from extras/java/trunk/AUTHORS
rename to experimental/java-libburnia/AUTHORS
diff --git a/extras/java/trunk/COPYING b/experimental/java-libburnia/COPYING
similarity index 100%
rename from extras/java/trunk/COPYING
rename to experimental/java-libburnia/COPYING
diff --git a/extras/java/trunk/ChangeLog b/experimental/java-libburnia/ChangeLog
similarity index 100%
rename from extras/java/trunk/ChangeLog
rename to experimental/java-libburnia/ChangeLog
diff --git a/extras/java/trunk/INSTALL b/experimental/java-libburnia/INSTALL
similarity index 100%
rename from extras/java/trunk/INSTALL
rename to experimental/java-libburnia/INSTALL
diff --git a/extras/java/trunk/NEWS b/experimental/java-libburnia/NEWS
similarity index 100%
rename from extras/java/trunk/NEWS
rename to experimental/java-libburnia/NEWS
diff --git a/extras/java/trunk/README b/experimental/java-libburnia/README
similarity index 100%
rename from extras/java/trunk/README
rename to experimental/java-libburnia/README
diff --git a/extras/java/trunk/TODO b/experimental/java-libburnia/TODO
similarity index 100%
rename from extras/java/trunk/TODO
rename to experimental/java-libburnia/TODO
diff --git a/extras/java/trunk/build.properties.in b/experimental/java-libburnia/build.properties.in
similarity index 100%
rename from extras/java/trunk/build.properties.in
rename to experimental/java-libburnia/build.properties.in
diff --git a/extras/java/trunk/build.xml b/experimental/java-libburnia/build.xml
similarity index 100%
rename from extras/java/trunk/build.xml
rename to experimental/java-libburnia/build.xml
diff --git a/extras/java/trunk/config.log b/experimental/java-libburnia/config.log
similarity index 100%
rename from extras/java/trunk/config.log
rename to experimental/java-libburnia/config.log
diff --git a/extras/java/trunk/config.status b/experimental/java-libburnia/config.status
similarity index 100%
rename from extras/java/trunk/config.status
rename to experimental/java-libburnia/config.status
diff --git a/extras/java/trunk/configure b/experimental/java-libburnia/configure
similarity index 100%
rename from extras/java/trunk/configure
rename to experimental/java-libburnia/configure
diff --git a/extras/java/trunk/configure.ac b/experimental/java-libburnia/configure.ac
similarity index 100%
rename from extras/java/trunk/configure.ac
rename to experimental/java-libburnia/configure.ac
diff --git a/extras/java/trunk/libs/README b/experimental/java-libburnia/libs/README
similarity index 100%
rename from extras/java/trunk/libs/README
rename to experimental/java-libburnia/libs/README
diff --git a/extras/java/trunk/org.eclipse.jdt.ui.prefs b/experimental/java-libburnia/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from extras/java/trunk/org.eclipse.jdt.ui.prefs
rename to experimental/java-libburnia/org.eclipse.jdt.ui.prefs
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/bindings/Proxy.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/bindings/Proxy.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/bindings/Proxy.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/bindings/Proxy.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/BlockType.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BlockType.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/BlockType.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BlockType.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Burn.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Burn.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Burn.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Burn.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/BurnException.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BurnException.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/BurnException.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BurnException.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/BurnMode.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BurnMode.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/BurnMode.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BurnMode.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/BurnSource.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BurnSource.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/BurnSource.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/BurnSource.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Disc.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Disc.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Disc.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Disc.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/DiscStatus.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/DiscStatus.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/DiscStatus.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/DiscStatus.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Drive.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Drive.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Drive.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Drive.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/DriveInfo.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/DriveInfo.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/DriveInfo.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/DriveInfo.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/DriveStatus.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/DriveStatus.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/DriveStatus.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/DriveStatus.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/FormatDesc.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/FormatDesc.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/FormatDesc.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/FormatDesc.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/FormatStatus.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/FormatStatus.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/FormatStatus.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/FormatStatus.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Formats.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Formats.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Formats.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Formats.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Message.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Message.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Message.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Message.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Msf.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Msf.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Msf.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Msf.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/MultiCaps.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/MultiCaps.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/MultiCaps.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/MultiCaps.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Profile.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Profile.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Profile.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Profile.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Progress.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Progress.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Progress.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Progress.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/ReadOpts.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/ReadOpts.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/ReadOpts.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/ReadOpts.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/ScsiAdr.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/ScsiAdr.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/ScsiAdr.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/ScsiAdr.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Session.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Session.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Session.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Session.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/SessionFormat.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/SessionFormat.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/SessionFormat.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/SessionFormat.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Source.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Source.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Source.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Source.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/SourceStatus.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/SourceStatus.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/SourceStatus.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/SourceStatus.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/SpeedDescriptor.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/SpeedDescriptor.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/SpeedDescriptor.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/SpeedDescriptor.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/TocEntry.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/TocEntry.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/TocEntry.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/TocEntry.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/Track.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Track.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/Track.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/Track.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/WriteOpts.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/WriteOpts.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/WriteOpts.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/WriteOpts.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libburn/WriteType.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/WriteType.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libburn/WriteType.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libburn/WriteType.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libisofs/Ecma119ExtensionFlag.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/Ecma119ExtensionFlag.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libisofs/Ecma119ExtensionFlag.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/Ecma119ExtensionFlag.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoExclude.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoExclude.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoExclude.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoExclude.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoTreeNode.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoTreeNode.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoTreeNode.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoTreeNode.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoVolSet.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoVolSet.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoVolSet.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoVolSet.java
diff --git a/extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoVolume.java b/experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoVolume.java
similarity index 100%
rename from extras/java/trunk/src/java/org/pykix/libburnia/libisofs/IsoVolume.java
rename to experimental/java-libburnia/src/java/org/pykix/libburnia/libisofs/IsoVolume.java
diff --git a/extras/java/trunk/src/jni/libburn/BindingsUtil.c b/experimental/java-libburnia/src/jni/libburn/BindingsUtil.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/BindingsUtil.c
rename to experimental/java-libburnia/src/jni/libburn/BindingsUtil.c
diff --git a/extras/java/trunk/src/jni/libburn/BindingsUtil.h b/experimental/java-libburnia/src/jni/libburn/BindingsUtil.h
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/BindingsUtil.h
rename to experimental/java-libburnia/src/jni/libburn/BindingsUtil.h
diff --git a/extras/java/trunk/src/jni/libburn/Burn.c b/experimental/java-libburnia/src/jni/libburn/Burn.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Burn.c
rename to experimental/java-libburnia/src/jni/libburn/Burn.c
diff --git a/extras/java/trunk/src/jni/libburn/Disc.c b/experimental/java-libburnia/src/jni/libburn/Disc.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Disc.c
rename to experimental/java-libburnia/src/jni/libburn/Disc.c
diff --git a/extras/java/trunk/src/jni/libburn/Drive.c b/experimental/java-libburnia/src/jni/libburn/Drive.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Drive.c
rename to experimental/java-libburnia/src/jni/libburn/Drive.c
diff --git a/extras/java/trunk/src/jni/libburn/DriveInfo.c b/experimental/java-libburnia/src/jni/libburn/DriveInfo.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/DriveInfo.c
rename to experimental/java-libburnia/src/jni/libburn/DriveInfo.c
diff --git a/extras/java/trunk/src/jni/libburn/Message.c b/experimental/java-libburnia/src/jni/libburn/Message.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Message.c
rename to experimental/java-libburnia/src/jni/libburn/Message.c
diff --git a/extras/java/trunk/src/jni/libburn/Progress.c b/experimental/java-libburnia/src/jni/libburn/Progress.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Progress.c
rename to experimental/java-libburnia/src/jni/libburn/Progress.c
diff --git a/extras/java/trunk/src/jni/libburn/ReadOpts.c b/experimental/java-libburnia/src/jni/libburn/ReadOpts.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/ReadOpts.c
rename to experimental/java-libburnia/src/jni/libburn/ReadOpts.c
diff --git a/extras/java/trunk/src/jni/libburn/ScsiAdr.c b/experimental/java-libburnia/src/jni/libburn/ScsiAdr.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/ScsiAdr.c
rename to experimental/java-libburnia/src/jni/libburn/ScsiAdr.c
diff --git a/extras/java/trunk/src/jni/libburn/Session.c b/experimental/java-libburnia/src/jni/libburn/Session.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Session.c
rename to experimental/java-libburnia/src/jni/libburn/Session.c
diff --git a/extras/java/trunk/src/jni/libburn/Source.c b/experimental/java-libburnia/src/jni/libburn/Source.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Source.c
rename to experimental/java-libburnia/src/jni/libburn/Source.c
diff --git a/extras/java/trunk/src/jni/libburn/Track.c b/experimental/java-libburnia/src/jni/libburn/Track.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/Track.c
rename to experimental/java-libburnia/src/jni/libburn/Track.c
diff --git a/extras/java/trunk/src/jni/libburn/WriteOpts.c b/experimental/java-libburnia/src/jni/libburn/WriteOpts.c
similarity index 100%
rename from extras/java/trunk/src/jni/libburn/WriteOpts.c
rename to experimental/java-libburnia/src/jni/libburn/WriteOpts.c
diff --git a/extras/java/trunk/src/jni/libisofs/IsoExclude.c b/experimental/java-libburnia/src/jni/libisofs/IsoExclude.c
similarity index 100%
rename from extras/java/trunk/src/jni/libisofs/IsoExclude.c
rename to experimental/java-libburnia/src/jni/libisofs/IsoExclude.c
diff --git a/extras/java/trunk/src/jni/libisofs/IsoTreeNode.c b/experimental/java-libburnia/src/jni/libisofs/IsoTreeNode.c
similarity index 100%
rename from extras/java/trunk/src/jni/libisofs/IsoTreeNode.c
rename to experimental/java-libburnia/src/jni/libisofs/IsoTreeNode.c
diff --git a/extras/java/trunk/src/jni/libisofs/IsoVolSet.c b/experimental/java-libburnia/src/jni/libisofs/IsoVolSet.c
similarity index 100%
rename from extras/java/trunk/src/jni/libisofs/IsoVolSet.c
rename to experimental/java-libburnia/src/jni/libisofs/IsoVolSet.c
diff --git a/extras/java/trunk/src/jni/libisofs/IsoVolume.c b/experimental/java-libburnia/src/jni/libisofs/IsoVolume.c
similarity index 100%
rename from extras/java/trunk/src/jni/libisofs/IsoVolume.c
rename to experimental/java-libburnia/src/jni/libisofs/IsoVolume.c
diff --git a/extras/java/trunk/src/test/org/pykix/libburnia/test/IsoFsMain.java b/experimental/java-libburnia/src/test/org/pykix/libburnia/test/IsoFsMain.java
similarity index 100%
rename from extras/java/trunk/src/test/org/pykix/libburnia/test/IsoFsMain.java
rename to experimental/java-libburnia/src/test/org/pykix/libburnia/test/IsoFsMain.java
diff --git a/extras/java/trunk/src/test/org/pykix/libburnia/test/Test.java b/experimental/java-libburnia/src/test/org/pykix/libburnia/test/Test.java
similarity index 100%
rename from extras/java/trunk/src/test/org/pykix/libburnia/test/Test.java
rename to experimental/java-libburnia/src/test/org/pykix/libburnia/test/Test.java