diff --git a/.gitignore b/.gitignore
index a21234ccbfc161569baf058855b071705feb77de..df17c1c7a1d4016d4569fa1b1482633752daf6a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-clients.json
+__pycache__/
+data/clients.json
 examples/
 rmq.log
 Pipfile
diff --git a/api_client_test.py b/tests/api_client_test.py
similarity index 100%
rename from api_client_test.py
rename to tests/api_client_test.py
diff --git a/api_notify_test.py b/tests/api_notify_test.py
similarity index 100%
rename from api_notify_test.py
rename to tests/api_notify_test.py
diff --git a/api_receive_test.py b/tests/api_receive_test.py
similarity index 100%
rename from api_receive_test.py
rename to tests/api_receive_test.py
diff --git a/api_send_test.py b/tests/api_send_test.py
similarity index 100%
rename from api_send_test.py
rename to tests/api_send_test.py
diff --git a/api_token_test.py b/tests/api_token_test.py
similarity index 100%
rename from api_token_test.py
rename to tests/api_token_test.py
diff --git a/models/client_model_test.py b/tests/models/client_model_test.py
similarity index 99%
rename from models/client_model_test.py
rename to tests/models/client_model_test.py
index c56de826ccb26074ef365e2c75dd5ae1fa48d8e8..4748509cd7b5ae0698242ef65da074e181f4871f 100644
--- a/models/client_model_test.py
+++ b/tests/models/client_model_test.py
@@ -3,7 +3,7 @@ import os
 import pytest
 import re
 from unittest.mock import patch, mock_open, call
-from client_model import ClientModel
+from models.client_model import ClientModel
 
 
 @pytest.mark.usefixtures("mock_clients")
diff --git a/models/token_model_test.py b/tests/models/token_model_test.py
similarity index 98%
rename from models/token_model_test.py
rename to tests/models/token_model_test.py
index e8748c91e980d4213869ca3a0f84e8fed0591c8b..cef8888f47787616049b27b6487e8939101f2f00 100644
--- a/models/token_model_test.py
+++ b/tests/models/token_model_test.py
@@ -6,7 +6,7 @@ import os
 import pytest
 import re
 from unittest.mock import patch, mock_open, call
-from token_model import TokenModel
+from models.token_model import TokenModel
 
 
 def test_init():