diff --git a/datastructures/datastructures.iml b/datastructures/java/datastructures.iml
similarity index 100%
rename from datastructures/datastructures.iml
rename to datastructures/java/datastructures.iml
diff --git a/datastructures/src/be/brainbaking/datastructures/hashing/DoubleProbeHash.java b/datastructures/java/src/be/brainbaking/datastructures/hashing/DoubleProbeHash.java
similarity index 100%
rename from datastructures/src/be/brainbaking/datastructures/hashing/DoubleProbeHash.java
rename to datastructures/java/src/be/brainbaking/datastructures/hashing/DoubleProbeHash.java
diff --git a/datastructures/src/be/brainbaking/datastructures/hashing/Hashable.java b/datastructures/java/src/be/brainbaking/datastructures/hashing/Hashable.java
similarity index 100%
rename from datastructures/src/be/brainbaking/datastructures/hashing/Hashable.java
rename to datastructures/java/src/be/brainbaking/datastructures/hashing/Hashable.java
diff --git a/datastructures/src/be/brainbaking/datastructures/hashing/LinearProbeHash.java b/datastructures/java/src/be/brainbaking/datastructures/hashing/LinearProbeHash.java
similarity index 100%
rename from datastructures/src/be/brainbaking/datastructures/hashing/LinearProbeHash.java
rename to datastructures/java/src/be/brainbaking/datastructures/hashing/LinearProbeHash.java
diff --git a/datastructures/src/be/brainbaking/datastructures/hashing/QuadraticProbeHash.java b/datastructures/java/src/be/brainbaking/datastructures/hashing/QuadraticProbeHash.java
similarity index 100%
rename from datastructures/src/be/brainbaking/datastructures/hashing/QuadraticProbeHash.java
rename to datastructures/java/src/be/brainbaking/datastructures/hashing/QuadraticProbeHash.java
diff --git a/datastructures/src/be/brainbaking/datastructures/hashtable/HashBucket.java b/datastructures/java/src/be/brainbaking/datastructures/hashtable/HashBucket.java
similarity index 100%
rename from datastructures/src/be/brainbaking/datastructures/hashtable/HashBucket.java
rename to datastructures/java/src/be/brainbaking/datastructures/hashtable/HashBucket.java
diff --git a/datastructures/src/be/brainbaking/datastructures/hashtable/HashTable.java b/datastructures/java/src/be/brainbaking/datastructures/hashtable/HashTable.java
similarity index 100%
rename from datastructures/src/be/brainbaking/datastructures/hashtable/HashTable.java
rename to datastructures/java/src/be/brainbaking/datastructures/hashtable/HashTable.java
diff --git a/datastructures/test/be/brainbaking/datastructures/hashtable/HashTableTest.java b/datastructures/java/test/be/brainbaking/datastructures/hashtable/HashTableTest.java
similarity index 100%
rename from datastructures/test/be/brainbaking/datastructures/hashtable/HashTableTest.java
rename to datastructures/java/test/be/brainbaking/datastructures/hashtable/HashTableTest.java