diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ac6f055
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+install:
+	mkdir database
+	mkdir logs
+	pip install -e . && python setup.py develop
diff --git a/tests/__init__.py b/test/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to test/__init__.py
diff --git a/tests/http_requests/comment-request.http b/test/http_requests/comment-request.http
similarity index 100%
rename from tests/http_requests/comment-request.http
rename to test/http_requests/comment-request.http
diff --git a/tests/http_requests/create-comment.http b/test/http_requests/create-comment.http
similarity index 100%
rename from tests/http_requests/create-comment.http
rename to test/http_requests/create-comment.http
diff --git a/tests/http_requests/create_comment_local.http b/test/http_requests/create_comment_local.http
similarity index 100%
rename from tests/http_requests/create_comment_local.http
rename to test/http_requests/create_comment_local.http
diff --git a/tests/http_requests/delete_comment_local.http b/test/http_requests/delete_comment_local.http
similarity index 100%
rename from tests/http_requests/delete_comment_local.http
rename to test/http_requests/delete_comment_local.http
diff --git a/tests/http_requests/get_channel_from_comment_id.http b/test/http_requests/get_channel_from_comment_id.http
similarity index 100%
rename from tests/http_requests/get_channel_from_comment_id.http
rename to test/http_requests/get_channel_from_comment_id.http
diff --git a/tests/http_requests/local-server-request.http b/test/http_requests/local-server-request.http
similarity index 100%
rename from tests/http_requests/local-server-request.http
rename to test/http_requests/local-server-request.http
diff --git a/tests/unit/database_test.py b/test/test_database.py
similarity index 99%
rename from tests/unit/database_test.py
rename to test/test_database.py
index 068e45e..347494d 100644
--- a/tests/unit/database_test.py
+++ b/test/test_database.py
@@ -1,5 +1,6 @@
-from random import randint
+import unittest
 
+from random import randint
 import faker
 from faker.providers import internet
 from faker.providers import lorem
@@ -12,7 +13,7 @@ from src.database.queries import get_claim_hidden_comments
 from src.database.writes import create_comment_or_error
 from src.database.queries import hide_comments_by_id
 from src.database.queries import delete_comment_by_id
-from tests.testcase import DatabaseTestCase
+from test.testcase import DatabaseTestCase
 
 fake = faker.Faker()
 fake.add_provider(internet)
diff --git a/tests/unit/server_test.py b/test/test_server.py
similarity index 99%
rename from tests/unit/server_test.py
rename to test/test_server.py
index 38cb3d6..0d9f478 100644
--- a/tests/unit/server_test.py
+++ b/test/test_server.py
@@ -1,6 +1,6 @@
+import unittest
 import atexit
 import os
-import unittest
 from multiprocessing.pool import Pool
 import asyncio
 import aiohttp
@@ -15,7 +15,7 @@ from faker.providers import misc
 
 from src.settings import config
 from src.server import app
-from tests.testcase import AsyncioTestCase
+from test.testcase import AsyncioTestCase
 
 
 fake = faker.Faker()
diff --git a/tests/testcase.py b/test/testcase.py
similarity index 100%
rename from tests/testcase.py
rename to test/testcase.py
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
deleted file mode 100644
index e69de29..0000000