diff --git a/hashmap/hashmap.go b/map/hashmap/hashmap.go
similarity index 100%
rename from hashmap/hashmap.go
rename to map/hashmap/hashmap.go
diff --git a/hashmap/hashmap_test.go b/map/hashmap/hashmap_test.go
similarity index 100%
rename from hashmap/hashmap_test.go
rename to map/hashmap/hashmap_test.go
diff --git a/avl/avl.go b/tree/avl/avl.go
similarity index 100%
rename from avl/avl.go
rename to tree/avl/avl.go
diff --git a/avl/avl_test.go b/tree/avl/avl_test.go
similarity index 100%
rename from avl/avl_test.go
rename to tree/avl/avl_test.go
diff --git a/avl/iterator.go b/tree/avl/iterator.go
similarity index 100%
rename from avl/iterator.go
rename to tree/avl/iterator.go
diff --git a/avldup/avldup.go b/tree/avldup/avldup.go
similarity index 100%
rename from avldup/avldup.go
rename to tree/avldup/avldup.go
diff --git a/avldup/avldup_test.go b/tree/avldup/avldup_test.go
similarity index 100%
rename from avldup/avldup_test.go
rename to tree/avldup/avldup_test.go
diff --git a/avldup/iterator.go b/tree/avldup/iterator.go
similarity index 100%
rename from avldup/iterator.go
rename to tree/avldup/iterator.go
diff --git a/avlkey/avlkey.go b/tree/avlkey/avlkey.go
similarity index 100%
rename from avlkey/avlkey.go
rename to tree/avlkey/avlkey.go
diff --git a/avlkey/avlkey_test.go b/tree/avlkey/avlkey_test.go
similarity index 100%
rename from avlkey/avlkey_test.go
rename to tree/avlkey/avlkey_test.go
diff --git a/avlkey/iterator.go b/tree/avlkey/iterator.go
similarity index 100%
rename from avlkey/iterator.go
rename to tree/avlkey/iterator.go
diff --git a/avlkeydup/avlkeydup.go b/tree/avlkeydup/avlkeydup.go
similarity index 100%
rename from avlkeydup/avlkeydup.go
rename to tree/avlkeydup/avlkeydup.go
diff --git a/avlkeydup/avlkeydup_test.go b/tree/avlkeydup/avlkeydup_test.go
similarity index 100%
rename from avlkeydup/avlkeydup_test.go
rename to tree/avlkeydup/avlkeydup_test.go
diff --git a/avlkeydup/iterator.go b/tree/avlkeydup/iterator.go
similarity index 100%
rename from avlkeydup/iterator.go
rename to tree/avlkeydup/iterator.go
diff --git a/vbt/iterator.go b/tree/vbt/iterator.go
similarity index 100%
rename from vbt/iterator.go
rename to tree/vbt/iterator.go
diff --git a/vbt/vbt.go b/tree/vbt/vbt.go
similarity index 100%
rename from vbt/vbt.go
rename to tree/vbt/vbt.go
diff --git a/vbt/vbt_test.go b/tree/vbt/vbt_test.go
similarity index 100%
rename from vbt/vbt_test.go
rename to tree/vbt/vbt_test.go
diff --git a/vbtkey/iterator.go b/tree/vbtkey/iterator.go
similarity index 100%
rename from vbtkey/iterator.go
rename to tree/vbtkey/iterator.go
diff --git a/vbtkey/vbtkey.go b/tree/vbtkey/vbtkey.go
similarity index 100%
rename from vbtkey/vbtkey.go
rename to tree/vbtkey/vbtkey.go
diff --git a/vbtkey/vbtkey_test.go b/tree/vbtkey/vbtkey_test.go
similarity index 100%
rename from vbtkey/vbtkey_test.go
rename to tree/vbtkey/vbtkey_test.go