diff --git a/src/bindings/jna/libelektra5j/pom.xml.in b/src/bindings/jna/libelektra/pom.xml.in
similarity index 100%
rename from src/bindings/jna/libelektra5j/pom.xml.in
rename to src/bindings/jna/libelektra/pom.xml.in
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/Elektra.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/Elektra.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/Elektra.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/Elektra.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KDB.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/KDB.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KDB.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/KDB.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/Key.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/Key.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/Key.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/Key.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KeyNameIterator.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/KeyNameIterator.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KeyNameIterator.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/KeyNameIterator.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KeySet.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/KeySet.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KeySet.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/KeySet.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KeySetIterator.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/KeySetIterator.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/KeySetIterator.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/KeySetIterator.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/Plugin.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/Plugin.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/Plugin.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/Plugin.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/PluginLoader.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/PluginLoader.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/PluginLoader.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/PluginLoader.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/ConflictingStateException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/ConflictingStateException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/ConflictingStateException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/ConflictingStateException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/InstallationException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/InstallationException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/InstallationException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/InstallationException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/InterfaceException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/InterfaceException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/InterfaceException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/InterfaceException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/InternalException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/InternalException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/InternalException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/InternalException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/KDBException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/KDBException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/KDBException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/KDBException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/LogicalException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/LogicalException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/LogicalException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/LogicalException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/OutOfMemoryException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/OutOfMemoryException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/OutOfMemoryException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/OutOfMemoryException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/PermanentException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/PermanentException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/PermanentException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/PermanentException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/PluginMisbehaviorException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/PluginMisbehaviorException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/PluginMisbehaviorException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/PluginMisbehaviorException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/ResourceException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/ResourceException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/ResourceException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/ResourceException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/SemanticValidationException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/SemanticValidationException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/SemanticValidationException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/SemanticValidationException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/SyntacticValidationException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/SyntacticValidationException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/SyntacticValidationException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/SyntacticValidationException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/ValidationException.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/ValidationException.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/ValidationException.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/ValidationException.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/mapper/ExceptionMapperService.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/mapper/ExceptionMapperService.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/mapper/ExceptionMapperService.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/mapper/ExceptionMapperService.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/model/WarningEntry.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/model/WarningEntry.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/exception/model/WarningEntry.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/exception/model/WarningEntry.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/Echo.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/Echo.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/Echo.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/Echo.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/NativePlugin.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/NativePlugin.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/NativePlugin.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/NativePlugin.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/PropertiesStorage.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/PropertiesStorage.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/PropertiesStorage.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/PropertiesStorage.java
diff --git a/src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/Return.java b/src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/Return.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/main/java/org/libelektra/plugin/Return.java
rename to src/bindings/jna/libelektra/src/main/java/org/libelektra/plugin/Return.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/AllTests.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/AllTests.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/AllTests.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/AllTests.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/ExceptionMapperIT.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/ExceptionMapperIT.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/ExceptionMapperIT.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/ExceptionMapperIT.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/ExceptionMapperTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/ExceptionMapperTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/ExceptionMapperTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/ExceptionMapperTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/GOptsTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/GOptsTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/GOptsTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/GOptsTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KDBExceptionTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/KDBExceptionTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KDBExceptionTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/KDBExceptionTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KDBTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/KDBTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KDBTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/KDBTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KeyNameIteratorTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/KeyNameIteratorTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KeyNameIteratorTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/KeyNameIteratorTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KeySetTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/KeySetTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KeySetTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/KeySetTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KeyTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/KeyTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/KeyTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/KeyTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/PluginLoaderIT.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/PluginLoaderIT.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/PluginLoaderIT.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/PluginLoaderIT.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/exception/model/WarningEntryTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/exception/model/WarningEntryTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/exception/model/WarningEntryTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/exception/model/WarningEntryTest.java
diff --git a/src/bindings/jna/libelektra5j/src/test/java/org/libelektra/plugin/ReturnTest.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/plugin/ReturnTest.java
similarity index 100%
rename from src/bindings/jna/libelektra5j/src/test/java/org/libelektra/plugin/ReturnTest.java
rename to src/bindings/jna/libelektra/src/test/java/org/libelektra/plugin/ReturnTest.java