Move Java examples to examples/java/.

diff --git a/simgrid-java/examples/async/AsyncTest.java b/examples/java/async/AsyncTest.java
similarity index 100%
rename from simgrid-java/examples/async/AsyncTest.java
rename to examples/java/async/AsyncTest.java

diff --git a/simgrid-java/examples/async/FinalizeTask.java b/examples/java/async/FinalizeTask.java
similarity index 100%
rename from simgrid-java/examples/async/FinalizeTask.java
rename to examples/java/async/FinalizeTask.java

diff --git a/simgrid-java/examples/async/Forwarder.java b/examples/java/async/Forwarder.java
similarity index 100%
rename from simgrid-java/examples/async/Forwarder.java
rename to examples/java/async/Forwarder.java

diff --git a/simgrid-java/examples/async/Master.java b/examples/java/async/Master.java
similarity index 100%
rename from simgrid-java/examples/async/Master.java
rename to examples/java/async/Master.java

diff --git a/simgrid-java/examples/async/README b/examples/java/async/README
similarity index 100%
rename from simgrid-java/examples/async/README
rename to examples/java/async/README

diff --git a/simgrid-java/examples/async/Slave.java b/examples/java/async/Slave.java
similarity index 100%
rename from simgrid-java/examples/async/Slave.java
rename to examples/java/async/Slave.java

diff --git a/simgrid-java/examples/async/async.tesh b/examples/java/async/async.tesh
similarity index 100%
rename from simgrid-java/examples/async/async.tesh
rename to examples/java/async/async.tesh

diff --git a/simgrid-java/examples/async/asyncDeployment.xml b/examples/java/async/asyncDeployment.xml
similarity index 100%
rename from simgrid-java/examples/async/asyncDeployment.xml
rename to examples/java/async/asyncDeployment.xml

diff --git a/simgrid-java/examples/bittorrent/Bittorrent.java b/examples/java/bittorrent/Bittorrent.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/Bittorrent.java
rename to examples/java/bittorrent/Bittorrent.java

diff --git a/simgrid-java/examples/bittorrent/Common.java b/examples/java/bittorrent/Common.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/Common.java
rename to examples/java/bittorrent/Common.java

diff --git a/simgrid-java/examples/bittorrent/Connection.java b/examples/java/bittorrent/Connection.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/Connection.java
rename to examples/java/bittorrent/Connection.java

diff --git a/simgrid-java/examples/bittorrent/MessageTask.java b/examples/java/bittorrent/MessageTask.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/MessageTask.java
rename to examples/java/bittorrent/MessageTask.java

diff --git a/simgrid-java/examples/bittorrent/Peer.java b/examples/java/bittorrent/Peer.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/Peer.java
rename to examples/java/bittorrent/Peer.java

diff --git a/simgrid-java/examples/bittorrent/Tracker.java b/examples/java/bittorrent/Tracker.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/Tracker.java
rename to examples/java/bittorrent/Tracker.java

diff --git a/simgrid-java/examples/bittorrent/TrackerTask.java b/examples/java/bittorrent/TrackerTask.java
similarity index 100%
rename from simgrid-java/examples/bittorrent/TrackerTask.java
rename to examples/java/bittorrent/TrackerTask.java

diff --git a/simgrid-java/examples/bittorrent/bittorrent.tesh b/examples/java/bittorrent/bittorrent.tesh
similarity index 100%
rename from simgrid-java/examples/bittorrent/bittorrent.tesh
rename to examples/java/bittorrent/bittorrent.tesh

diff --git a/simgrid-java/examples/bittorrent/bittorrent.xml b/examples/java/bittorrent/bittorrent.xml
similarity index 100%
rename from simgrid-java/examples/bittorrent/bittorrent.xml
rename to examples/java/bittorrent/bittorrent.xml

diff --git a/simgrid-java/examples/bittorrent/generate.py b/examples/java/bittorrent/generate.py
similarity index 100%
rename from simgrid-java/examples/bittorrent/generate.py
rename to examples/java/bittorrent/generate.py

diff --git a/simgrid-java/examples/chord/Chord.java b/examples/java/chord/Chord.java
similarity index 100%
rename from simgrid-java/examples/chord/Chord.java
rename to examples/java/chord/Chord.java

diff --git a/simgrid-java/examples/chord/ChordTask.java b/examples/java/chord/ChordTask.java
similarity index 100%
rename from simgrid-java/examples/chord/ChordTask.java
rename to examples/java/chord/ChordTask.java

diff --git a/simgrid-java/examples/chord/Common.java b/examples/java/chord/Common.java
similarity index 100%
rename from simgrid-java/examples/chord/Common.java
rename to examples/java/chord/Common.java

diff --git a/simgrid-java/examples/chord/FindSuccessorAnswerTask.java b/examples/java/chord/FindSuccessorAnswerTask.java
similarity index 100%
rename from simgrid-java/examples/chord/FindSuccessorAnswerTask.java
rename to examples/java/chord/FindSuccessorAnswerTask.java

diff --git a/simgrid-java/examples/chord/FindSuccessorTask.java b/examples/java/chord/FindSuccessorTask.java
similarity index 100%
rename from simgrid-java/examples/chord/FindSuccessorTask.java
rename to examples/java/chord/FindSuccessorTask.java

diff --git a/simgrid-java/examples/chord/GetPredecessorAnswerTask.java b/examples/java/chord/GetPredecessorAnswerTask.java
similarity index 100%
rename from simgrid-java/examples/chord/GetPredecessorAnswerTask.java
rename to examples/java/chord/GetPredecessorAnswerTask.java

diff --git a/simgrid-java/examples/chord/GetPredecessorTask.java b/examples/java/chord/GetPredecessorTask.java
similarity index 100%
rename from simgrid-java/examples/chord/GetPredecessorTask.java
rename to examples/java/chord/GetPredecessorTask.java

diff --git a/simgrid-java/examples/chord/Node.java b/examples/java/chord/Node.java
similarity index 100%
rename from simgrid-java/examples/chord/Node.java
rename to examples/java/chord/Node.java

diff --git a/simgrid-java/examples/chord/NotifyTask.java b/examples/java/chord/NotifyTask.java
similarity index 100%
rename from simgrid-java/examples/chord/NotifyTask.java
rename to examples/java/chord/NotifyTask.java

diff --git a/simgrid-java/examples/chord/chord.tesh b/examples/java/chord/chord.tesh
similarity index 100%
rename from simgrid-java/examples/chord/chord.tesh
rename to examples/java/chord/chord.tesh

diff --git a/simgrid-java/examples/chord/chord.xml b/examples/java/chord/chord.xml
similarity index 100%
rename from simgrid-java/examples/chord/chord.xml
rename to examples/java/chord/chord.xml

diff --git a/simgrid-java/examples/chord/chord10.xml b/examples/java/chord/chord10.xml
similarity index 100%
rename from simgrid-java/examples/chord/chord10.xml
rename to examples/java/chord/chord10.xml

diff --git a/simgrid-java/examples/chord/chord100.xml b/examples/java/chord/chord100.xml
similarity index 100%
rename from simgrid-java/examples/chord/chord100.xml
rename to examples/java/chord/chord100.xml

diff --git a/simgrid-java/examples/chord/chord1000.xml b/examples/java/chord/chord1000.xml
similarity index 100%
rename from simgrid-java/examples/chord/chord1000.xml
rename to examples/java/chord/chord1000.xml

diff --git a/simgrid-java/examples/chord/chord10000.xml b/examples/java/chord/chord10000.xml
similarity index 100%
rename from simgrid-java/examples/chord/chord10000.xml
rename to examples/java/chord/chord10000.xml

diff --git a/simgrid-java/examples/chord/chord90.xml b/examples/java/chord/chord90.xml
similarity index 100%
rename from simgrid-java/examples/chord/chord90.xml
rename to examples/java/chord/chord90.xml

diff --git a/simgrid-java/examples/cloud/Cloud.java b/examples/java/cloud/Cloud.java
similarity index 100%
rename from simgrid-java/examples/cloud/Cloud.java
rename to examples/java/cloud/Cloud.java

diff --git a/simgrid-java/examples/cloud/FinalizeTask.java b/examples/java/cloud/FinalizeTask.java
similarity index 100%
rename from simgrid-java/examples/cloud/FinalizeTask.java
rename to examples/java/cloud/FinalizeTask.java

diff --git a/simgrid-java/examples/cloud/Master.java b/examples/java/cloud/Master.java
similarity index 100%
rename from simgrid-java/examples/cloud/Master.java
rename to examples/java/cloud/Master.java

diff --git a/simgrid-java/examples/cloud/Slave.java b/examples/java/cloud/Slave.java
similarity index 100%
rename from simgrid-java/examples/cloud/Slave.java
rename to examples/java/cloud/Slave.java

diff --git a/simgrid-java/examples/cloud/cloud.tesh b/examples/java/cloud/cloud.tesh
similarity index 100%
rename from simgrid-java/examples/cloud/cloud.tesh
rename to examples/java/cloud/cloud.tesh

diff --git a/simgrid-java/examples/commTime/CommTimeTest.java b/examples/java/commTime/CommTimeTest.java
similarity index 100%
rename from simgrid-java/examples/commTime/CommTimeTest.java
rename to examples/java/commTime/CommTimeTest.java

diff --git a/simgrid-java/examples/commTime/FinalizeTask.java b/examples/java/commTime/FinalizeTask.java
similarity index 100%
rename from simgrid-java/examples/commTime/FinalizeTask.java
rename to examples/java/commTime/FinalizeTask.java

diff --git a/simgrid-java/examples/commTime/Master.java b/examples/java/commTime/Master.java
similarity index 100%
rename from simgrid-java/examples/commTime/Master.java
rename to examples/java/commTime/Master.java

diff --git a/simgrid-java/examples/commTime/README b/examples/java/commTime/README
similarity index 100%
rename from simgrid-java/examples/commTime/README
rename to examples/java/commTime/README

diff --git a/simgrid-java/examples/commTime/Slave.java b/examples/java/commTime/Slave.java
similarity index 100%
rename from simgrid-java/examples/commTime/Slave.java
rename to examples/java/commTime/Slave.java

diff --git a/simgrid-java/examples/commTime/commTimeDeployment.xml b/examples/java/commTime/commTimeDeployment.xml
similarity index 100%
rename from simgrid-java/examples/commTime/commTimeDeployment.xml
rename to examples/java/commTime/commTimeDeployment.xml

diff --git a/simgrid-java/examples/commTime/commtime.tesh b/examples/java/commTime/commtime.tesh
similarity index 100%
rename from simgrid-java/examples/commTime/commtime.tesh
rename to examples/java/commTime/commtime.tesh

diff --git a/simgrid-java/examples/io/IO.java b/examples/java/io/IO.java
similarity index 100%
rename from simgrid-java/examples/io/IO.java
rename to examples/java/io/IO.java

diff --git a/simgrid-java/examples/io/Node.java b/examples/java/io/Node.java
similarity index 100%
rename from simgrid-java/examples/io/Node.java
rename to examples/java/io/Node.java

diff --git a/simgrid-java/examples/io/storage.xml b/examples/java/io/storage.xml
similarity index 100%
rename from simgrid-java/examples/io/storage.xml
rename to examples/java/io/storage.xml

diff --git a/simgrid-java/examples/kademlia/Answer.java b/examples/java/kademlia/Answer.java
similarity index 100%
rename from simgrid-java/examples/kademlia/Answer.java
rename to examples/java/kademlia/Answer.java

diff --git a/simgrid-java/examples/kademlia/Bucket.java b/examples/java/kademlia/Bucket.java
similarity index 100%
rename from simgrid-java/examples/kademlia/Bucket.java
rename to examples/java/kademlia/Bucket.java

diff --git a/simgrid-java/examples/kademlia/Common.java b/examples/java/kademlia/Common.java
similarity index 100%
rename from simgrid-java/examples/kademlia/Common.java
rename to examples/java/kademlia/Common.java

diff --git a/simgrid-java/examples/kademlia/Contact.java b/examples/java/kademlia/Contact.java
similarity index 100%
rename from simgrid-java/examples/kademlia/Contact.java
rename to examples/java/kademlia/Contact.java

diff --git a/simgrid-java/examples/kademlia/FindNodeAnswerTask.java b/examples/java/kademlia/FindNodeAnswerTask.java
similarity index 100%
rename from simgrid-java/examples/kademlia/FindNodeAnswerTask.java
rename to examples/java/kademlia/FindNodeAnswerTask.java

diff --git a/simgrid-java/examples/kademlia/FindNodeTask.java b/examples/java/kademlia/FindNodeTask.java
similarity index 100%
rename from simgrid-java/examples/kademlia/FindNodeTask.java
rename to examples/java/kademlia/FindNodeTask.java

diff --git a/simgrid-java/examples/kademlia/Kademlia.java b/examples/java/kademlia/Kademlia.java
similarity index 100%
rename from simgrid-java/examples/kademlia/Kademlia.java
rename to examples/java/kademlia/Kademlia.java

diff --git a/simgrid-java/examples/kademlia/KademliaTask.java b/examples/java/kademlia/KademliaTask.java
similarity index 100%
rename from simgrid-java/examples/kademlia/KademliaTask.java
rename to examples/java/kademlia/KademliaTask.java

diff --git a/simgrid-java/examples/kademlia/Node.java b/examples/java/kademlia/Node.java
similarity index 100%
rename from simgrid-java/examples/kademlia/Node.java
rename to examples/java/kademlia/Node.java

diff --git a/simgrid-java/examples/kademlia/PingAnswerTask.java b/examples/java/kademlia/PingAnswerTask.java
similarity index 100%
rename from simgrid-java/examples/kademlia/PingAnswerTask.java
rename to examples/java/kademlia/PingAnswerTask.java

diff --git a/simgrid-java/examples/kademlia/PingTask.java b/examples/java/kademlia/PingTask.java
similarity index 100%
rename from simgrid-java/examples/kademlia/PingTask.java
rename to examples/java/kademlia/PingTask.java

diff --git a/simgrid-java/examples/kademlia/RoutingTable.java b/examples/java/kademlia/RoutingTable.java
similarity index 100%
rename from simgrid-java/examples/kademlia/RoutingTable.java
rename to examples/java/kademlia/RoutingTable.java

diff --git a/simgrid-java/examples/kademlia/kademlia.tesh b/examples/java/kademlia/kademlia.tesh
similarity index 100%
rename from simgrid-java/examples/kademlia/kademlia.tesh
rename to examples/java/kademlia/kademlia.tesh

diff --git a/simgrid-java/examples/kademlia/kademlia.xml b/examples/java/kademlia/kademlia.xml
similarity index 100%
rename from simgrid-java/examples/kademlia/kademlia.xml
rename to examples/java/kademlia/kademlia.xml

diff --git a/simgrid-java/examples/master_slave_bypass/FinalizeTask.java b/examples/java/master_slave_bypass/FinalizeTask.java
similarity index 100%
rename from simgrid-java/examples/master_slave_bypass/FinalizeTask.java
rename to examples/java/master_slave_bypass/FinalizeTask.java

diff --git a/simgrid-java/examples/master_slave_bypass/Master.java b/examples/java/master_slave_bypass/Master.java
similarity index 100%
rename from simgrid-java/examples/master_slave_bypass/Master.java
rename to examples/java/master_slave_bypass/Master.java

diff --git a/simgrid-java/examples/master_slave_bypass/MsBypass.java b/examples/java/master_slave_bypass/MsBypass.java
similarity index 100%
rename from simgrid-java/examples/master_slave_bypass/MsBypass.java
rename to examples/java/master_slave_bypass/MsBypass.java

diff --git a/simgrid-java/examples/master_slave_bypass/Slave.java b/examples/java/master_slave_bypass/Slave.java
similarity index 100%
rename from simgrid-java/examples/master_slave_bypass/Slave.java
rename to examples/java/master_slave_bypass/Slave.java

diff --git a/simgrid-java/examples/master_slave_bypass/bypass.tesh b/examples/java/master_slave_bypass/bypass.tesh
similarity index 100%
rename from simgrid-java/examples/master_slave_bypass/bypass.tesh
rename to examples/java/master_slave_bypass/bypass.tesh

diff --git a/simgrid-java/examples/master_slave_bypass/platform.xml b/examples/java/master_slave_bypass/platform.xml
similarity index 100%
rename from simgrid-java/examples/master_slave_bypass/platform.xml
rename to examples/java/master_slave_bypass/platform.xml

diff --git a/simgrid-java/examples/master_slave_kill/FinalizeTask.java b/examples/java/master_slave_kill/FinalizeTask.java
similarity index 100%
rename from simgrid-java/examples/master_slave_kill/FinalizeTask.java
rename to examples/java/master_slave_kill/FinalizeTask.java

diff --git a/simgrid-java/examples/master_slave_kill/Master.java b/examples/java/master_slave_kill/Master.java
similarity index 100%
rename from simgrid-java/examples/master_slave_kill/Master.java
rename to examples/java/master_slave_kill/Master.java

diff --git a/simgrid-java/examples/master_slave_kill/MsKill.java b/examples/java/master_slave_kill/MsKill.java
similarity index 100%
rename from simgrid-java/examples/master_slave_kill/MsKill.java
rename to examples/java/master_slave_kill/MsKill.java

diff --git a/simgrid-java/examples/master_slave_kill/Slave.java b/examples/java/master_slave_kill/Slave.java
similarity index 100%
rename from simgrid-java/examples/master_slave_kill/Slave.java
rename to examples/java/master_slave_kill/Slave.java

diff --git a/simgrid-java/examples/master_slave_kill/kill.tesh b/examples/java/master_slave_kill/kill.tesh
similarity index 100%
rename from simgrid-java/examples/master_slave_kill/kill.tesh
rename to examples/java/master_slave_kill/kill.tesh

diff --git a/simgrid-java/examples/master_slave_kill/platform.xml b/examples/java/master_slave_kill/platform.xml
similarity index 100%
rename from simgrid-java/examples/master_slave_kill/platform.xml
rename to examples/java/master_slave_kill/platform.xml

diff --git a/simgrid-java/examples/masterslave/FinalizeTask.java b/examples/java/masterslave/FinalizeTask.java
similarity index 100%
rename from simgrid-java/examples/masterslave/FinalizeTask.java
rename to examples/java/masterslave/FinalizeTask.java

diff --git a/simgrid-java/examples/masterslave/Forwarder.java b/examples/java/masterslave/Forwarder.java
similarity index 100%
rename from simgrid-java/examples/masterslave/Forwarder.java
rename to examples/java/masterslave/Forwarder.java

diff --git a/simgrid-java/examples/masterslave/Master.java b/examples/java/masterslave/Master.java
similarity index 100%
rename from simgrid-java/examples/masterslave/Master.java
rename to examples/java/masterslave/Master.java

diff --git a/simgrid-java/examples/masterslave/Masterslave.java b/examples/java/masterslave/Masterslave.java
similarity index 100%
rename from simgrid-java/examples/masterslave/Masterslave.java
rename to examples/java/masterslave/Masterslave.java

diff --git a/simgrid-java/examples/masterslave/README b/examples/java/masterslave/README
similarity index 100%
rename from simgrid-java/examples/masterslave/README
rename to examples/java/masterslave/README

diff --git a/simgrid-java/examples/masterslave/Slave.java b/examples/java/masterslave/Slave.java
similarity index 100%
rename from simgrid-java/examples/masterslave/Slave.java
rename to examples/java/masterslave/Slave.java

diff --git a/simgrid-java/examples/masterslave/deploy.xml b/examples/java/masterslave/deploy.xml
similarity index 100%
rename from simgrid-java/examples/masterslave/deploy.xml
rename to examples/java/masterslave/deploy.xml

diff --git a/simgrid-java/examples/masterslave/masterslave.tesh b/examples/java/masterslave/masterslave.tesh
similarity index 100%
rename from simgrid-java/examples/masterslave/masterslave.tesh
rename to examples/java/masterslave/masterslave.tesh

diff --git a/simgrid-java/examples/masterslave/masterslaveDeployment.xml b/examples/java/masterslave/masterslaveDeployment.xml
similarity index 100%
rename from simgrid-java/examples/masterslave/masterslaveDeployment.xml
rename to examples/java/masterslave/masterslaveDeployment.xml

diff --git a/simgrid-java/examples/migration/Emigrant.java b/examples/java/migration/Emigrant.java
similarity index 100%
rename from simgrid-java/examples/migration/Emigrant.java
rename to examples/java/migration/Emigrant.java

diff --git a/simgrid-java/examples/migration/Migration.java b/examples/java/migration/Migration.java
similarity index 100%
rename from simgrid-java/examples/migration/Migration.java
rename to examples/java/migration/Migration.java

diff --git a/simgrid-java/examples/migration/Policeman.java b/examples/java/migration/Policeman.java
similarity index 100%
rename from simgrid-java/examples/migration/Policeman.java
rename to examples/java/migration/Policeman.java

diff --git a/simgrid-java/examples/migration/migration.tesh b/examples/java/migration/migration.tesh
similarity index 100%
rename from simgrid-java/examples/migration/migration.tesh
rename to examples/java/migration/migration.tesh

diff --git a/simgrid-java/examples/migration/migrationDeployment.xml b/examples/java/migration/migrationDeployment.xml
similarity index 100%
rename from simgrid-java/examples/migration/migrationDeployment.xml
rename to examples/java/migration/migrationDeployment.xml

diff --git a/simgrid-java/examples/mutualExclusion/centralized/Coordinator.java b/examples/java/mutualExclusion/centralized/Coordinator.java
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/Coordinator.java
rename to examples/java/mutualExclusion/centralized/Coordinator.java

diff --git a/simgrid-java/examples/mutualExclusion/centralized/GrantTask.java b/examples/java/mutualExclusion/centralized/GrantTask.java
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/GrantTask.java
rename to examples/java/mutualExclusion/centralized/GrantTask.java

diff --git a/simgrid-java/examples/mutualExclusion/centralized/MutexCentral.java b/examples/java/mutualExclusion/centralized/MutexCentral.java
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/MutexCentral.java
rename to examples/java/mutualExclusion/centralized/MutexCentral.java

diff --git a/simgrid-java/examples/mutualExclusion/centralized/Node.java b/examples/java/mutualExclusion/centralized/Node.java
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/Node.java
rename to examples/java/mutualExclusion/centralized/Node.java

diff --git a/simgrid-java/examples/mutualExclusion/centralized/ReleaseTask.java b/examples/java/mutualExclusion/centralized/ReleaseTask.java
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/ReleaseTask.java
rename to examples/java/mutualExclusion/centralized/ReleaseTask.java

diff --git a/simgrid-java/examples/mutualExclusion/centralized/RequestTask.java b/examples/java/mutualExclusion/centralized/RequestTask.java
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/RequestTask.java
rename to examples/java/mutualExclusion/centralized/RequestTask.java

diff --git a/simgrid-java/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml b/examples/java/mutualExclusion/centralized/mutex_centralized_deployment.xml
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
rename to examples/java/mutualExclusion/centralized/mutex_centralized_deployment.xml

diff --git a/simgrid-java/examples/mutualExclusion/mutualexclusion.tesh b/examples/java/mutualExclusion/mutualexclusion.tesh
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/mutualexclusion.tesh
rename to examples/java/mutualExclusion/mutualexclusion.tesh

diff --git a/simgrid-java/examples/mutualExclusion/ring3.xml b/examples/java/mutualExclusion/ring3.xml
similarity index 100%
rename from simgrid-java/examples/mutualExclusion/ring3.xml
rename to examples/java/mutualExclusion/ring3.xml

diff --git a/simgrid-java/examples/pingPong/PingPongTask.java b/examples/java/pingPong/PingPongTask.java
similarity index 100%
rename from simgrid-java/examples/pingPong/PingPongTask.java
rename to examples/java/pingPong/PingPongTask.java

diff --git a/simgrid-java/examples/pingPong/PingPongTest.java b/examples/java/pingPong/PingPongTest.java
similarity index 100%
rename from simgrid-java/examples/pingPong/PingPongTest.java
rename to examples/java/pingPong/PingPongTest.java

diff --git a/simgrid-java/examples/pingPong/README b/examples/java/pingPong/README
similarity index 100%
rename from simgrid-java/examples/pingPong/README
rename to examples/java/pingPong/README

diff --git a/simgrid-java/examples/pingPong/Receiver.java b/examples/java/pingPong/Receiver.java
similarity index 100%
rename from simgrid-java/examples/pingPong/Receiver.java
rename to examples/java/pingPong/Receiver.java

diff --git a/simgrid-java/examples/pingPong/Sender.java b/examples/java/pingPong/Sender.java
similarity index 100%
rename from simgrid-java/examples/pingPong/Sender.java
rename to examples/java/pingPong/Sender.java

diff --git a/simgrid-java/examples/pingPong/pingPongDeployment.xml b/examples/java/pingPong/pingPongDeployment.xml
similarity index 100%
rename from simgrid-java/examples/pingPong/pingPongDeployment.xml
rename to examples/java/pingPong/pingPongDeployment.xml

diff --git a/simgrid-java/examples/pingPong/pingpong.tesh b/examples/java/pingPong/pingpong.tesh
similarity index 100%
rename from simgrid-java/examples/pingPong/pingpong.tesh
rename to examples/java/pingPong/pingpong.tesh

diff --git a/simgrid-java/examples/platform.xml b/examples/java/platform.xml
similarity index 100%
rename from simgrid-java/examples/platform.xml
rename to examples/java/platform.xml

diff --git a/simgrid-java/examples/priority/Priority.java b/examples/java/priority/Priority.java
similarity index 100%
rename from simgrid-java/examples/priority/Priority.java
rename to examples/java/priority/Priority.java

diff --git a/simgrid-java/examples/priority/Test.java b/examples/java/priority/Test.java
similarity index 100%
rename from simgrid-java/examples/priority/Test.java
rename to examples/java/priority/Test.java

diff --git a/simgrid-java/examples/priority/priority.tesh b/examples/java/priority/priority.tesh
similarity index 100%
rename from simgrid-java/examples/priority/priority.tesh
rename to examples/java/priority/priority.tesh

diff --git a/simgrid-java/examples/priority/priorityDeployment.xml b/examples/java/priority/priorityDeployment.xml
similarity index 100%
rename from simgrid-java/examples/priority/priorityDeployment.xml
rename to examples/java/priority/priorityDeployment.xml

diff --git a/simgrid-java/examples/startKillTime/Master.java b/examples/java/startKillTime/Master.java
similarity index 100%
rename from simgrid-java/examples/startKillTime/Master.java
rename to examples/java/startKillTime/Master.java

diff --git a/simgrid-java/examples/startKillTime/Slave.java b/examples/java/startKillTime/Slave.java
similarity index 100%
rename from simgrid-java/examples/startKillTime/Slave.java
rename to examples/java/startKillTime/Slave.java

diff --git a/simgrid-java/examples/startKillTime/StartKillTime.java b/examples/java/startKillTime/StartKillTime.java
similarity index 100%
rename from simgrid-java/examples/startKillTime/StartKillTime.java
rename to examples/java/startKillTime/StartKillTime.java

diff --git a/simgrid-java/examples/startKillTime/deployment.xml b/examples/java/startKillTime/deployment.xml
similarity index 100%
rename from simgrid-java/examples/startKillTime/deployment.xml
rename to examples/java/startKillTime/deployment.xml

diff --git a/simgrid-java/examples/startKillTime/deployment_kill.xml b/examples/java/startKillTime/deployment_kill.xml
similarity index 100%
rename from simgrid-java/examples/startKillTime/deployment_kill.xml
rename to examples/java/startKillTime/deployment_kill.xml

diff --git a/simgrid-java/examples/startKillTime/deployment_start.xml b/examples/java/startKillTime/deployment_start.xml
similarity index 100%
rename from simgrid-java/examples/startKillTime/deployment_start.xml
rename to examples/java/startKillTime/deployment_start.xml

diff --git a/simgrid-java/examples/startKillTime/deployment_start_kill.xml b/examples/java/startKillTime/deployment_start_kill.xml
similarity index 100%
rename from simgrid-java/examples/startKillTime/deployment_start_kill.xml
rename to examples/java/startKillTime/deployment_start_kill.xml

diff --git a/simgrid-java/examples/startKillTime/startKillTime.tesh b/examples/java/startKillTime/startKillTime.tesh
similarity index 100%
rename from simgrid-java/examples/startKillTime/startKillTime.tesh
rename to examples/java/startKillTime/startKillTime.tesh

diff --git a/simgrid-java/examples/suspend/DreamMaster.java b/examples/java/suspend/DreamMaster.java
similarity index 100%
rename from simgrid-java/examples/suspend/DreamMaster.java
rename to examples/java/suspend/DreamMaster.java

diff --git a/simgrid-java/examples/suspend/LazyGuy.java b/examples/java/suspend/LazyGuy.java
similarity index 100%
rename from simgrid-java/examples/suspend/LazyGuy.java
rename to examples/java/suspend/LazyGuy.java

diff --git a/simgrid-java/examples/suspend/Suspend.java b/examples/java/suspend/Suspend.java
similarity index 100%
rename from simgrid-java/examples/suspend/Suspend.java
rename to examples/java/suspend/Suspend.java

diff --git a/simgrid-java/examples/suspend/suspend.tesh b/examples/java/suspend/suspend.tesh
similarity index 100%
rename from simgrid-java/examples/suspend/suspend.tesh
rename to examples/java/suspend/suspend.tesh

diff --git a/simgrid-java/examples/suspend/suspendDeployment.xml b/examples/java/suspend/suspendDeployment.xml
similarity index 100%
rename from simgrid-java/examples/suspend/suspendDeployment.xml
rename to examples/java/suspend/suspendDeployment.xml

diff --git a/simgrid-java/examples/tracing/PingPongTask.java b/examples/java/tracing/PingPongTask.java
similarity index 100%
rename from simgrid-java/examples/tracing/PingPongTask.java
rename to examples/java/tracing/PingPongTask.java

diff --git a/simgrid-java/examples/tracing/README b/examples/java/tracing/README
similarity index 100%
rename from simgrid-java/examples/tracing/README
rename to examples/java/tracing/README

diff --git a/simgrid-java/examples/tracing/Receiver.java b/examples/java/tracing/Receiver.java
similarity index 100%
rename from simgrid-java/examples/tracing/Receiver.java
rename to examples/java/tracing/Receiver.java

diff --git a/simgrid-java/examples/tracing/Sender.java b/examples/java/tracing/Sender.java
similarity index 100%
rename from simgrid-java/examples/tracing/Sender.java
rename to examples/java/tracing/Sender.java

diff --git a/simgrid-java/examples/tracing/TracingTest.java b/examples/java/tracing/TracingTest.java
similarity index 100%
rename from simgrid-java/examples/tracing/TracingTest.java
rename to examples/java/tracing/TracingTest.java

diff --git a/simgrid-java/examples/tracing/tracingPingPong.tesh b/examples/java/tracing/tracingPingPong.tesh
similarity index 100%
rename from simgrid-java/examples/tracing/tracingPingPong.tesh
rename to examples/java/tracing/tracingPingPong.tesh

diff --git a/simgrid-java/examples/tracing/tracingPingPongDeployment.xml b/examples/java/tracing/tracingPingPongDeployment.xml
similarity index 100%
rename from simgrid-java/examples/tracing/tracingPingPongDeployment.xml
rename to examples/java/tracing/tracingPingPongDeployment.xml