diff --git a/xflaim/java/native/src/jbackup.cpp b/xflaim/java/jni/src/jbackup.cpp
similarity index 100%
rename from xflaim/java/native/src/jbackup.cpp
rename to xflaim/java/jni/src/jbackup.cpp
diff --git a/xflaim/java/native/src/jdatavector.cpp b/xflaim/java/jni/src/jdatavector.cpp
similarity index 100%
rename from xflaim/java/native/src/jdatavector.cpp
rename to xflaim/java/jni/src/jdatavector.cpp
diff --git a/xflaim/java/native/src/jdb.cpp b/xflaim/java/jni/src/jdb.cpp
similarity index 100%
rename from xflaim/java/native/src/jdb.cpp
rename to xflaim/java/jni/src/jdb.cpp
diff --git a/xflaim/java/native/src/jdbsystem.cpp b/xflaim/java/jni/src/jdbsystem.cpp
similarity index 100%
rename from xflaim/java/native/src/jdbsystem.cpp
rename to xflaim/java/jni/src/jdbsystem.cpp
diff --git a/xflaim/java/native/src/jdomnode.cpp b/xflaim/java/jni/src/jdomnode.cpp
similarity index 100%
rename from xflaim/java/native/src/jdomnode.cpp
rename to xflaim/java/jni/src/jdomnode.cpp
diff --git a/xflaim/java/native/src/jniftk.cpp b/xflaim/java/jni/src/jniftk.cpp
similarity index 100%
rename from xflaim/java/native/src/jniftk.cpp
rename to xflaim/java/jni/src/jniftk.cpp
diff --git a/xflaim/java/native/src/jniftk.h b/xflaim/java/jni/src/jniftk.h
similarity index 100%
rename from xflaim/java/native/src/jniftk.h
rename to xflaim/java/jni/src/jniftk.h
diff --git a/xflaim/java/native/src/jnirestore.cpp b/xflaim/java/jni/src/jnirestore.cpp
similarity index 100%
rename from xflaim/java/native/src/jnirestore.cpp
rename to xflaim/java/jni/src/jnirestore.cpp
diff --git a/xflaim/java/native/src/jnirestore.h b/xflaim/java/jni/src/jnirestore.h
similarity index 100%
rename from xflaim/java/native/src/jnirestore.h
rename to xflaim/java/jni/src/jnirestore.h
diff --git a/xflaim/java/native/src/jnistatus.cpp b/xflaim/java/jni/src/jnistatus.cpp
similarity index 100%
rename from xflaim/java/native/src/jnistatus.cpp
rename to xflaim/java/jni/src/jnistatus.cpp
diff --git a/xflaim/java/native/src/jnistatus.h b/xflaim/java/jni/src/jnistatus.h
similarity index 100%
rename from xflaim/java/native/src/jnistatus.h
rename to xflaim/java/jni/src/jnistatus.h
diff --git a/xflaim/java/native/src/jposistream.cpp b/xflaim/java/jni/src/jposistream.cpp
similarity index 100%
rename from xflaim/java/native/src/jposistream.cpp
rename to xflaim/java/jni/src/jposistream.cpp
diff --git a/xflaim/java/java/xflaim/Backup.java b/xflaim/java/xflaim/Backup.java
similarity index 100%
rename from xflaim/java/java/xflaim/Backup.java
rename to xflaim/java/xflaim/Backup.java
diff --git a/xflaim/java/java/xflaim/BackupClient.java b/xflaim/java/xflaim/BackupClient.java
similarity index 100%
rename from xflaim/java/java/xflaim/BackupClient.java
rename to xflaim/java/xflaim/BackupClient.java
diff --git a/xflaim/java/java/xflaim/BackupStatus.java b/xflaim/java/xflaim/BackupStatus.java
similarity index 100%
rename from xflaim/java/java/xflaim/BackupStatus.java
rename to xflaim/java/xflaim/BackupStatus.java
diff --git a/xflaim/java/java/xflaim/CHECKINFO.java b/xflaim/java/xflaim/CHECKINFO.java
similarity index 100%
rename from xflaim/java/java/xflaim/CHECKINFO.java
rename to xflaim/java/xflaim/CHECKINFO.java
diff --git a/xflaim/java/java/xflaim/CORRUPTINFO.java b/xflaim/java/xflaim/CORRUPTINFO.java
similarity index 100%
rename from xflaim/java/java/xflaim/CORRUPTINFO.java
rename to xflaim/java/xflaim/CORRUPTINFO.java
diff --git a/xflaim/java/java/xflaim/CREATEOPTS.java b/xflaim/java/xflaim/CREATEOPTS.java
similarity index 100%
rename from xflaim/java/java/xflaim/CREATEOPTS.java
rename to xflaim/java/xflaim/CREATEOPTS.java
diff --git a/xflaim/java/java/xflaim/Collections.java b/xflaim/java/xflaim/Collections.java
similarity index 100%
rename from xflaim/java/java/xflaim/Collections.java
rename to xflaim/java/xflaim/Collections.java
diff --git a/xflaim/java/java/xflaim/DOMNode.java b/xflaim/java/xflaim/DOMNode.java
similarity index 100%
rename from xflaim/java/java/xflaim/DOMNode.java
rename to xflaim/java/xflaim/DOMNode.java
diff --git a/xflaim/java/java/xflaim/DataVector.java b/xflaim/java/xflaim/DataVector.java
similarity index 100%
rename from xflaim/java/java/xflaim/DataVector.java
rename to xflaim/java/xflaim/DataVector.java
diff --git a/xflaim/java/java/xflaim/Db.java b/xflaim/java/xflaim/Db.java
similarity index 100%
rename from xflaim/java/java/xflaim/Db.java
rename to xflaim/java/xflaim/Db.java
diff --git a/xflaim/java/java/xflaim/DbCheckFlags.java b/xflaim/java/xflaim/DbCheckFlags.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbCheckFlags.java
rename to xflaim/java/xflaim/DbCheckFlags.java
diff --git a/xflaim/java/java/xflaim/DbCheckStatus.java b/xflaim/java/xflaim/DbCheckStatus.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbCheckStatus.java
rename to xflaim/java/xflaim/DbCheckStatus.java
diff --git a/xflaim/java/java/xflaim/DbCopyStatus.java b/xflaim/java/xflaim/DbCopyStatus.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbCopyStatus.java
rename to xflaim/java/xflaim/DbCopyStatus.java
diff --git a/xflaim/java/java/xflaim/DbInfo.java b/xflaim/java/xflaim/DbInfo.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbInfo.java
rename to xflaim/java/xflaim/DbInfo.java
diff --git a/xflaim/java/java/xflaim/DbRebuildStatus.java b/xflaim/java/xflaim/DbRebuildStatus.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbRebuildStatus.java
rename to xflaim/java/xflaim/DbRebuildStatus.java
diff --git a/xflaim/java/java/xflaim/DbRenameStatus.java b/xflaim/java/xflaim/DbRenameStatus.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbRenameStatus.java
rename to xflaim/java/xflaim/DbRenameStatus.java
diff --git a/xflaim/java/java/xflaim/DbSystem.java b/xflaim/java/xflaim/DbSystem.java
similarity index 100%
rename from xflaim/java/java/xflaim/DbSystem.java
rename to xflaim/java/xflaim/DbSystem.java
diff --git a/xflaim/java/java/xflaim/DefaultBackupClient.java b/xflaim/java/xflaim/DefaultBackupClient.java
similarity index 100%
rename from xflaim/java/java/xflaim/DefaultBackupClient.java
rename to xflaim/java/xflaim/DefaultBackupClient.java
diff --git a/xflaim/java/java/xflaim/DefaultRestoreClient.java b/xflaim/java/xflaim/DefaultRestoreClient.java
similarity index 100%
rename from xflaim/java/java/xflaim/DefaultRestoreClient.java
rename to xflaim/java/xflaim/DefaultRestoreClient.java
diff --git a/xflaim/java/java/xflaim/FlmBackupType.java b/xflaim/java/xflaim/FlmBackupType.java
similarity index 100%
rename from xflaim/java/java/xflaim/FlmBackupType.java
rename to xflaim/java/xflaim/FlmBackupType.java
diff --git a/xflaim/java/java/xflaim/FlmDataType.java b/xflaim/java/xflaim/FlmDataType.java
similarity index 100%
rename from xflaim/java/java/xflaim/FlmDataType.java
rename to xflaim/java/xflaim/FlmDataType.java
diff --git a/xflaim/java/java/xflaim/FlmDictIndex.java b/xflaim/java/xflaim/FlmDictIndex.java
similarity index 100%
rename from xflaim/java/java/xflaim/FlmDictIndex.java
rename to xflaim/java/xflaim/FlmDictIndex.java
diff --git a/xflaim/java/java/xflaim/FlmDomNodeType.java b/xflaim/java/xflaim/FlmDomNodeType.java
similarity index 100%
rename from xflaim/java/java/xflaim/FlmDomNodeType.java
rename to xflaim/java/xflaim/FlmDomNodeType.java
diff --git a/xflaim/java/java/xflaim/FlmInsertLoc.java b/xflaim/java/xflaim/FlmInsertLoc.java
similarity index 100%
rename from xflaim/java/java/xflaim/FlmInsertLoc.java
rename to xflaim/java/xflaim/FlmInsertLoc.java
diff --git a/xflaim/java/java/xflaim/KeyRetrieveFlags.java b/xflaim/java/xflaim/KeyRetrieveFlags.java
similarity index 100%
rename from xflaim/java/java/xflaim/KeyRetrieveFlags.java
rename to xflaim/java/xflaim/KeyRetrieveFlags.java
diff --git a/xflaim/java/java/xflaim/PosIStream.java b/xflaim/java/xflaim/PosIStream.java
similarity index 100%
rename from xflaim/java/java/xflaim/PosIStream.java
rename to xflaim/java/xflaim/PosIStream.java
diff --git a/xflaim/java/java/xflaim/RCODE.java b/xflaim/java/xflaim/RCODE.java
similarity index 100%
rename from xflaim/java/java/xflaim/RCODE.java
rename to xflaim/java/xflaim/RCODE.java
diff --git a/xflaim/java/java/xflaim/ReserveID.java b/xflaim/java/xflaim/ReserveID.java
similarity index 100%
rename from xflaim/java/java/xflaim/ReserveID.java
rename to xflaim/java/xflaim/ReserveID.java
diff --git a/xflaim/java/java/xflaim/RestoreAction.java b/xflaim/java/xflaim/RestoreAction.java
similarity index 100%
rename from xflaim/java/java/xflaim/RestoreAction.java
rename to xflaim/java/xflaim/RestoreAction.java
diff --git a/xflaim/java/java/xflaim/RestoreClient.java b/xflaim/java/xflaim/RestoreClient.java
similarity index 100%
rename from xflaim/java/java/xflaim/RestoreClient.java
rename to xflaim/java/xflaim/RestoreClient.java
diff --git a/xflaim/java/java/xflaim/RestoreStatus.java b/xflaim/java/xflaim/RestoreStatus.java
similarity index 100%
rename from xflaim/java/java/xflaim/RestoreStatus.java
rename to xflaim/java/xflaim/RestoreStatus.java
diff --git a/xflaim/java/java/xflaim/TransactionFlags.java b/xflaim/java/xflaim/TransactionFlags.java
similarity index 100%
rename from xflaim/java/java/xflaim/TransactionFlags.java
rename to xflaim/java/xflaim/TransactionFlags.java
diff --git a/xflaim/java/java/xflaim/TransactionType.java b/xflaim/java/xflaim/TransactionType.java
similarity index 100%
rename from xflaim/java/java/xflaim/TransactionType.java
rename to xflaim/java/xflaim/TransactionType.java
diff --git a/xflaim/java/java/xflaim/XFlaimException.java b/xflaim/java/xflaim/XFlaimException.java
similarity index 100%
rename from xflaim/java/java/xflaim/XFlaimException.java
rename to xflaim/java/xflaim/XFlaimException.java