diff --git a/.gitignore b/.gitignore
index 7bacdd8..d5727dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 */__pycache__/
+.cache/
+tests/*/__pycache__/
 */*~
 *.#*
 *#
diff --git a/tests/test_addresses.py b/tests/lib/test_addresses.py
similarity index 100%
rename from tests/test_addresses.py
rename to tests/lib/test_addresses.py
diff --git a/tests/test_util.py b/tests/lib/test_util.py
similarity index 100%
rename from tests/test_util.py
rename to tests/lib/test_util.py
diff --git a/tests/test_storage.py b/tests/server/test_storage.py
similarity index 100%
rename from tests/test_storage.py
rename to tests/server/test_storage.py