diff --git a/lib/msf/jmx/discovery.rb b/lib/msf/java/jmx/discovery.rb
similarity index 100%
rename from lib/msf/jmx/discovery.rb
rename to lib/msf/java/jmx/discovery.rb
diff --git a/lib/msf/jmx/handshake.rb b/lib/msf/java/jmx/handshake.rb
similarity index 100%
rename from lib/msf/jmx/handshake.rb
rename to lib/msf/java/jmx/handshake.rb
diff --git a/lib/msf/jmx/mbean.rb b/lib/msf/java/jmx/mbean.rb
similarity index 100%
rename from lib/msf/jmx/mbean.rb
rename to lib/msf/java/jmx/mbean.rb
diff --git a/lib/msf/jmx/mbean/server_connection.rb b/lib/msf/java/jmx/mbean/server_connection.rb
similarity index 100%
rename from lib/msf/jmx/mbean/server_connection.rb
rename to lib/msf/java/jmx/mbean/server_connection.rb
diff --git a/lib/msf/jmx/util.rb b/lib/msf/java/jmx/util.rb
similarity index 100%
rename from lib/msf/jmx/util.rb
rename to lib/msf/java/jmx/util.rb
diff --git a/lib/msf/rmi/client.rb b/lib/msf/java/rmi/client.rb
similarity index 100%
rename from lib/msf/rmi/client.rb
rename to lib/msf/java/rmi/client.rb
diff --git a/lib/msf/rmi/client/streams.rb b/lib/msf/java/rmi/client/streams.rb
similarity index 100%
rename from lib/msf/rmi/client/streams.rb
rename to lib/msf/java/rmi/client/streams.rb