diff --git a/java/Context.cpp b/bindings/java/Context.cpp
similarity index 100%
rename from java/Context.cpp
rename to bindings/java/Context.cpp
diff --git a/java/Makefile.am b/bindings/java/Makefile.am
similarity index 100%
rename from java/Makefile.am
rename to bindings/java/Makefile.am
diff --git a/java/Socket.cpp b/bindings/java/Socket.cpp
similarity index 100%
rename from java/Socket.cpp
rename to bindings/java/Socket.cpp
diff --git a/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java
similarity index 100%
rename from java/org/zmq/Context.java
rename to bindings/java/org/zmq/Context.java
diff --git a/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java
similarity index 100%
rename from java/org/zmq/Socket.java
rename to bindings/java/org/zmq/Socket.java