diff --git a/java/.gitignore b/bindings/java/.gitignore
similarity index 100%
rename from java/.gitignore
rename to bindings/java/.gitignore
diff --git a/java/android/com/bluekitchen/btstack/SocketConnectionUnix.java b/bindings/java/android/com/bluekitchen/btstack/SocketConnectionUnix.java
similarity index 100%
rename from java/android/com/bluekitchen/btstack/SocketConnectionUnix.java
rename to bindings/java/android/com/bluekitchen/btstack/SocketConnectionUnix.java
diff --git a/java/android/com/bluekitchen/lescan/MainActivity.java b/bindings/java/android/com/bluekitchen/lescan/MainActivity.java
similarity index 100%
rename from java/android/com/bluekitchen/lescan/MainActivity.java
rename to bindings/java/android/com/bluekitchen/lescan/MainActivity.java
diff --git a/java/build.xml b/bindings/java/build.xml
similarity index 100%
rename from java/build.xml
rename to bindings/java/build.xml
diff --git a/java/example/com/bluekitchen/GATTClientTest.java b/bindings/java/example/com/bluekitchen/GATTClientTest.java
similarity index 100%
rename from java/example/com/bluekitchen/GATTClientTest.java
rename to bindings/java/example/com/bluekitchen/GATTClientTest.java
diff --git a/java/example/com/bluekitchen/SPPClientTest.java b/bindings/java/example/com/bluekitchen/SPPClientTest.java
similarity index 100%
rename from java/example/com/bluekitchen/SPPClientTest.java
rename to bindings/java/example/com/bluekitchen/SPPClientTest.java
diff --git a/java/src/com/bluekitchen/btstack/BD_ADDR.java b/bindings/java/src/com/bluekitchen/btstack/BD_ADDR.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/BD_ADDR.java
rename to bindings/java/src/com/bluekitchen/btstack/BD_ADDR.java
diff --git a/java/src/com/bluekitchen/btstack/BT_UUID.java b/bindings/java/src/com/bluekitchen/btstack/BT_UUID.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/BT_UUID.java
rename to bindings/java/src/com/bluekitchen/btstack/BT_UUID.java
diff --git a/java/src/com/bluekitchen/btstack/BTstackClient.java b/bindings/java/src/com/bluekitchen/btstack/BTstackClient.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/BTstackClient.java
rename to bindings/java/src/com/bluekitchen/btstack/BTstackClient.java
diff --git a/java/src/com/bluekitchen/btstack/Event.java b/bindings/java/src/com/bluekitchen/btstack/Event.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/Event.java
rename to bindings/java/src/com/bluekitchen/btstack/Event.java
diff --git a/java/src/com/bluekitchen/btstack/GATTCharacteristic.java b/bindings/java/src/com/bluekitchen/btstack/GATTCharacteristic.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/GATTCharacteristic.java
rename to bindings/java/src/com/bluekitchen/btstack/GATTCharacteristic.java
diff --git a/java/src/com/bluekitchen/btstack/GATTCharacteristicDescriptor.java b/bindings/java/src/com/bluekitchen/btstack/GATTCharacteristicDescriptor.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/GATTCharacteristicDescriptor.java
rename to bindings/java/src/com/bluekitchen/btstack/GATTCharacteristicDescriptor.java
diff --git a/java/src/com/bluekitchen/btstack/GATTService.java b/bindings/java/src/com/bluekitchen/btstack/GATTService.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/GATTService.java
rename to bindings/java/src/com/bluekitchen/btstack/GATTService.java
diff --git a/java/src/com/bluekitchen/btstack/L2CAPDataPacket.java b/bindings/java/src/com/bluekitchen/btstack/L2CAPDataPacket.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/L2CAPDataPacket.java
rename to bindings/java/src/com/bluekitchen/btstack/L2CAPDataPacket.java
diff --git a/java/src/com/bluekitchen/btstack/Packet.java b/bindings/java/src/com/bluekitchen/btstack/Packet.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/Packet.java
rename to bindings/java/src/com/bluekitchen/btstack/Packet.java
diff --git a/java/src/com/bluekitchen/btstack/PacketHandler.java b/bindings/java/src/com/bluekitchen/btstack/PacketHandler.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/PacketHandler.java
rename to bindings/java/src/com/bluekitchen/btstack/PacketHandler.java
diff --git a/java/src/com/bluekitchen/btstack/RFCOMMDataPacket.java b/bindings/java/src/com/bluekitchen/btstack/RFCOMMDataPacket.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/RFCOMMDataPacket.java
rename to bindings/java/src/com/bluekitchen/btstack/RFCOMMDataPacket.java
diff --git a/java/src/com/bluekitchen/btstack/SocketConnection.java b/bindings/java/src/com/bluekitchen/btstack/SocketConnection.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/SocketConnection.java
rename to bindings/java/src/com/bluekitchen/btstack/SocketConnection.java
diff --git a/java/src/com/bluekitchen/btstack/SocketConnectionTCP.java b/bindings/java/src/com/bluekitchen/btstack/SocketConnectionTCP.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/SocketConnectionTCP.java
rename to bindings/java/src/com/bluekitchen/btstack/SocketConnectionTCP.java
diff --git a/java/src/com/bluekitchen/btstack/Util.java b/bindings/java/src/com/bluekitchen/btstack/Util.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/Util.java
rename to bindings/java/src/com/bluekitchen/btstack/Util.java
diff --git a/java/src/com/bluekitchen/btstack/event/BTstackEventDaemonDisconnect.java b/bindings/java/src/com/bluekitchen/btstack/event/BTstackEventDaemonDisconnect.java
similarity index 100%
rename from java/src/com/bluekitchen/btstack/event/BTstackEventDaemonDisconnect.java
rename to bindings/java/src/com/bluekitchen/btstack/event/BTstackEventDaemonDisconnect.java