diff --git a/src/main/java/net/abhinavsarkar/algorist/ChainingHashTable.java b/src/main/java/net/abhinavsarkar/algorist/hash/ChainingHashTable.java
similarity index 97%
rename from src/main/java/net/abhinavsarkar/algorist/ChainingHashTable.java
rename to src/main/java/net/abhinavsarkar/algorist/hash/ChainingHashTable.java
index b2370cb..e82f842 100644
--- a/src/main/java/net/abhinavsarkar/algorist/ChainingHashTable.java
+++ b/src/main/java/net/abhinavsarkar/algorist/hash/ChainingHashTable.java
@@ -1,6 +1,7 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.hash;
 
 import java.util.Optional;
+import net.abhinavsarkar.algorist.LinkedList;
 
 public class ChainingHashTable<K, V>
 {
diff --git a/src/main/java/net/abhinavsarkar/algorist/LRUCache.java b/src/main/java/net/abhinavsarkar/algorist/hash/LRUCache.java
similarity index 97%
rename from src/main/java/net/abhinavsarkar/algorist/LRUCache.java
rename to src/main/java/net/abhinavsarkar/algorist/hash/LRUCache.java
index 0bb9111..133e7ae 100644
--- a/src/main/java/net/abhinavsarkar/algorist/LRUCache.java
+++ b/src/main/java/net/abhinavsarkar/algorist/hash/LRUCache.java
@@ -1,4 +1,4 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.hash;
 
 import java.util.Iterator;
 import java.util.Optional;
diff --git a/src/main/java/net/abhinavsarkar/algorist/LRWCache.java b/src/main/java/net/abhinavsarkar/algorist/hash/LRWCache.java
similarity index 95%
rename from src/main/java/net/abhinavsarkar/algorist/LRWCache.java
rename to src/main/java/net/abhinavsarkar/algorist/hash/LRWCache.java
index b4c46a8..3e3bdd0 100644
--- a/src/main/java/net/abhinavsarkar/algorist/LRWCache.java
+++ b/src/main/java/net/abhinavsarkar/algorist/hash/LRWCache.java
@@ -1,7 +1,8 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.hash;
 
 import java.util.Iterator;
 import java.util.Optional;
+import net.abhinavsarkar.algorist.Map;
 
 public class LRWCache<K, V> implements Iterable<K>
 {
diff --git a/src/main/java/net/abhinavsarkar/algorist/OpenAddressingHashTable.java b/src/main/java/net/abhinavsarkar/algorist/hash/OpenAddressingHashTable.java
similarity index 99%
rename from src/main/java/net/abhinavsarkar/algorist/OpenAddressingHashTable.java
rename to src/main/java/net/abhinavsarkar/algorist/hash/OpenAddressingHashTable.java
index 6a5666b..1b8d14e 100644
--- a/src/main/java/net/abhinavsarkar/algorist/OpenAddressingHashTable.java
+++ b/src/main/java/net/abhinavsarkar/algorist/hash/OpenAddressingHashTable.java
@@ -1,8 +1,9 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.hash;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import net.abhinavsarkar.algorist.Map;
 
 public class OpenAddressingHashTable<K, V> implements Map<K, V>
 {
diff --git a/src/main/java/net/abhinavsarkar/algorist/AVLTree.java b/src/main/java/net/abhinavsarkar/algorist/tree/AVLTree.java
similarity index 99%
rename from src/main/java/net/abhinavsarkar/algorist/AVLTree.java
rename to src/main/java/net/abhinavsarkar/algorist/tree/AVLTree.java
index ff4a5af..b5fad45 100644
--- a/src/main/java/net/abhinavsarkar/algorist/AVLTree.java
+++ b/src/main/java/net/abhinavsarkar/algorist/tree/AVLTree.java
@@ -1,10 +1,11 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.tree;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Stack;
+import net.abhinavsarkar.algorist.SortedMap;
 
 public class AVLTree<K extends Comparable<K>,V> implements SortedMap<K, V>
 {
diff --git a/src/main/java/net/abhinavsarkar/algorist/BinarySearchTree.java b/src/main/java/net/abhinavsarkar/algorist/tree/BinarySearchTree.java
similarity index 99%
rename from src/main/java/net/abhinavsarkar/algorist/BinarySearchTree.java
rename to src/main/java/net/abhinavsarkar/algorist/tree/BinarySearchTree.java
index 8a7a0b3..0ab25b6 100644
--- a/src/main/java/net/abhinavsarkar/algorist/BinarySearchTree.java
+++ b/src/main/java/net/abhinavsarkar/algorist/tree/BinarySearchTree.java
@@ -1,10 +1,11 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.tree;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Stack;
+import net.abhinavsarkar.algorist.SortedMap;
 
 public class BinarySearchTree<K extends Comparable<K>,V> implements SortedMap<K,V>
 {
diff --git a/src/main/java/net/abhinavsarkar/algorist/TreeGraphvizVisitor.java b/src/main/java/net/abhinavsarkar/algorist/tree/TreeGraphvizVisitor.java
similarity index 96%
rename from src/main/java/net/abhinavsarkar/algorist/TreeGraphvizVisitor.java
rename to src/main/java/net/abhinavsarkar/algorist/tree/TreeGraphvizVisitor.java
index 05a2866..5e85d3f 100644
--- a/src/main/java/net/abhinavsarkar/algorist/TreeGraphvizVisitor.java
+++ b/src/main/java/net/abhinavsarkar/algorist/tree/TreeGraphvizVisitor.java
@@ -1,4 +1,4 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.tree;
 
 import guru.nidi.graphviz.engine.Format;
 import guru.nidi.graphviz.engine.Graphviz;
diff --git a/src/main/java/net/abhinavsarkar/algorist/Trie.java b/src/main/java/net/abhinavsarkar/algorist/tree/Trie.java
similarity index 98%
rename from src/main/java/net/abhinavsarkar/algorist/Trie.java
rename to src/main/java/net/abhinavsarkar/algorist/tree/Trie.java
index 3ef1846..3d69a9c 100644
--- a/src/main/java/net/abhinavsarkar/algorist/Trie.java
+++ b/src/main/java/net/abhinavsarkar/algorist/tree/Trie.java
@@ -1,4 +1,4 @@
-package net.abhinavsarkar.algorist;
+package net.abhinavsarkar.algorist.tree;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,6 +9,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;
+import net.abhinavsarkar.algorist.SortedMap;
 
 public class Trie<K extends Comparable<K>, V> implements SortedMap<K, V>
 {