diff --git a/.env b/.env
new file mode 100644
index 0000000..798a42c
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+POSTGRES_DB=django
+POSTGRES_USER=django
+POSTGRES_PASSWORD=apagnan
diff --git a/.gitignore b/django/.gitignore
similarity index 100%
rename from .gitignore
rename to django/.gitignore
diff --git a/.jshintrc b/django/.jshintrc
similarity index 100%
rename from .jshintrc
rename to django/.jshintrc
diff --git a/django/Dockerfile b/django/Dockerfile
new file mode 100644
index 0000000..613156d
--- /dev/null
+++ b/django/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:slim
+
+WORKDIR /app
+
+RUN apt-get update && apt-get -y install gettext
+
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+
+COPY . .
+
+ENTRYPOINT ["sh", "docker-entrypoint.sh"]
+CMD ["0.0.0.0:8000"]
diff --git a/accounts/__init__.py b/django/accounts/__init__.py
similarity index 100%
rename from accounts/__init__.py
rename to django/accounts/__init__.py
diff --git a/accounts/admin.py b/django/accounts/admin.py
similarity index 100%
rename from accounts/admin.py
rename to django/accounts/admin.py
diff --git a/accounts/apps.py b/django/accounts/apps.py
similarity index 100%
rename from accounts/apps.py
rename to django/accounts/apps.py
diff --git a/accounts/locale/fr/LC_MESSAGES/django.po b/django/accounts/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from accounts/locale/fr/LC_MESSAGES/django.po
rename to django/accounts/locale/fr/LC_MESSAGES/django.po
diff --git a/accounts/serializers/login.py b/django/accounts/serializers/login.py
similarity index 100%
rename from accounts/serializers/login.py
rename to django/accounts/serializers/login.py
diff --git a/accounts/serializers/register.py b/django/accounts/serializers/register.py
similarity index 100%
rename from accounts/serializers/register.py
rename to django/accounts/serializers/register.py
diff --git a/accounts/serializers/update_password.py b/django/accounts/serializers/update_password.py
similarity index 100%
rename from accounts/serializers/update_password.py
rename to django/accounts/serializers/update_password.py
diff --git a/accounts/serializers/update_user.py b/django/accounts/serializers/update_user.py
similarity index 100%
rename from accounts/serializers/update_user.py
rename to django/accounts/serializers/update_user.py
diff --git a/accounts/tests/__init__.py b/django/accounts/tests/__init__.py
similarity index 100%
rename from accounts/tests/__init__.py
rename to django/accounts/tests/__init__.py
diff --git a/accounts/tests/delete.py b/django/accounts/tests/delete.py
similarity index 100%
rename from accounts/tests/delete.py
rename to django/accounts/tests/delete.py
diff --git a/accounts/tests/edit.py b/django/accounts/tests/edit.py
similarity index 100%
rename from accounts/tests/edit.py
rename to django/accounts/tests/edit.py
diff --git a/accounts/tests/login.py b/django/accounts/tests/login.py
similarity index 100%
rename from accounts/tests/login.py
rename to django/accounts/tests/login.py
diff --git a/accounts/tests/logout.py b/django/accounts/tests/logout.py
similarity index 100%
rename from accounts/tests/logout.py
rename to django/accounts/tests/logout.py
diff --git a/accounts/tests/register.py b/django/accounts/tests/register.py
similarity index 100%
rename from accounts/tests/register.py
rename to django/accounts/tests/register.py
diff --git a/accounts/urls.py b/django/accounts/urls.py
similarity index 100%
rename from accounts/urls.py
rename to django/accounts/urls.py
diff --git a/accounts/views/delete.py b/django/accounts/views/delete.py
similarity index 100%
rename from accounts/views/delete.py
rename to django/accounts/views/delete.py
diff --git a/accounts/views/logged.py b/django/accounts/views/logged.py
similarity index 100%
rename from accounts/views/logged.py
rename to django/accounts/views/logged.py
diff --git a/accounts/views/login.py b/django/accounts/views/login.py
similarity index 100%
rename from accounts/views/login.py
rename to django/accounts/views/login.py
diff --git a/accounts/views/logout.py b/django/accounts/views/logout.py
similarity index 100%
rename from accounts/views/logout.py
rename to django/accounts/views/logout.py
diff --git a/accounts/views/register.py b/django/accounts/views/register.py
similarity index 100%
rename from accounts/views/register.py
rename to django/accounts/views/register.py
diff --git a/accounts/views/update_password.py b/django/accounts/views/update_password.py
similarity index 100%
rename from accounts/views/update_password.py
rename to django/accounts/views/update_password.py
diff --git a/accounts/views/update_profile.py b/django/accounts/views/update_profile.py
similarity index 100%
rename from accounts/views/update_profile.py
rename to django/accounts/views/update_profile.py
diff --git a/chat/__init__.py b/django/chat/__init__.py
similarity index 100%
rename from chat/__init__.py
rename to django/chat/__init__.py
diff --git a/chat/admin.py b/django/chat/admin.py
similarity index 100%
rename from chat/admin.py
rename to django/chat/admin.py
diff --git a/chat/apps.py b/django/chat/apps.py
similarity index 100%
rename from chat/apps.py
rename to django/chat/apps.py
diff --git a/chat/consumersChat.py b/django/chat/consumersChat.py
similarity index 100%
rename from chat/consumersChat.py
rename to django/chat/consumersChat.py
diff --git a/chat/models.py b/django/chat/models.py
similarity index 100%
rename from chat/models.py
rename to django/chat/models.py
diff --git a/chat/routing.py b/django/chat/routing.py
similarity index 100%
rename from chat/routing.py
rename to django/chat/routing.py
diff --git a/chat/serializers/ask.py b/django/chat/serializers/ask.py
similarity index 100%
rename from chat/serializers/ask.py
rename to django/chat/serializers/ask.py
diff --git a/chat/serializers/chat.py b/django/chat/serializers/chat.py
similarity index 100%
rename from chat/serializers/chat.py
rename to django/chat/serializers/chat.py
diff --git a/chat/tests.py b/django/chat/tests.py
similarity index 100%
rename from chat/tests.py
rename to django/chat/tests.py
diff --git a/chat/urls.py b/django/chat/urls.py
similarity index 100%
rename from chat/urls.py
rename to django/chat/urls.py
diff --git a/chat/views/ask.py b/django/chat/views/ask.py
similarity index 100%
rename from chat/views/ask.py
rename to django/chat/views/ask.py
diff --git a/chat/views/chat.py b/django/chat/views/chat.py
similarity index 100%
rename from chat/views/chat.py
rename to django/chat/views/chat.py
diff --git a/django/docker-entrypoint.sh b/django/docker-entrypoint.sh
new file mode 100644
index 0000000..ec40f37
--- /dev/null
+++ b/django/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/env sh
+
+python manage.py makemigrations chat games profiles notice
+python manage.py migrate
+python manage.py compilemessages
+
+exec python manage.py runserver "$@"
diff --git a/frontend/__init__.py b/django/frontend/__init__.py
similarity index 100%
rename from frontend/__init__.py
rename to django/frontend/__init__.py
diff --git a/frontend/admin.py b/django/frontend/admin.py
similarity index 100%
rename from frontend/admin.py
rename to django/frontend/admin.py
diff --git a/frontend/apps.py b/django/frontend/apps.py
similarity index 100%
rename from frontend/apps.py
rename to django/frontend/apps.py
diff --git a/frontend/models.py b/django/frontend/models.py
similarity index 100%
rename from frontend/models.py
rename to django/frontend/models.py
diff --git a/frontend/static/css/TournamentPage.css b/django/frontend/static/css/TournamentPage.css
similarity index 100%
rename from frontend/static/css/TournamentPage.css
rename to django/frontend/static/css/TournamentPage.css
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.css b/django/frontend/static/css/bootstrap/bootstrap-grid.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.css
rename to django/frontend/static/css/bootstrap/bootstrap-grid.css
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.css.map b/django/frontend/static/css/bootstrap/bootstrap-grid.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-grid.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.min.css b/django/frontend/static/css/bootstrap/bootstrap-grid.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.min.css
rename to django/frontend/static/css/bootstrap/bootstrap-grid.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.min.css.map b/django/frontend/static/css/bootstrap/bootstrap-grid.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-grid.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.rtl.css b/django/frontend/static/css/bootstrap/bootstrap-grid.rtl.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.rtl.css
rename to django/frontend/static/css/bootstrap/bootstrap-grid.rtl.css
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.rtl.css.map b/django/frontend/static/css/bootstrap/bootstrap-grid.rtl.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.rtl.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-grid.rtl.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css b/django/frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css
rename to django/frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css.map b/django/frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-grid.rtl.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.css b/django/frontend/static/css/bootstrap/bootstrap-reboot.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.css
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.css
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.css.map b/django/frontend/static/css/bootstrap/bootstrap-reboot.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.min.css b/django/frontend/static/css/bootstrap/bootstrap-reboot.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.min.css
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.min.css.map b/django/frontend/static/css/bootstrap/bootstrap-reboot.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.rtl.css b/django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.rtl.css
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.css
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.rtl.css.map b/django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.rtl.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css b/django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css.map b/django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-reboot.rtl.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.css b/django/frontend/static/css/bootstrap/bootstrap-utilities.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.css
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.css
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.css.map b/django/frontend/static/css/bootstrap/bootstrap-utilities.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.min.css b/django/frontend/static/css/bootstrap/bootstrap-utilities.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.min.css
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.min.css.map b/django/frontend/static/css/bootstrap/bootstrap-utilities.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.rtl.css b/django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.rtl.css
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.css
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.rtl.css.map b/django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.rtl.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css b/django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css.map b/django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap-utilities.rtl.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap.css b/django/frontend/static/css/bootstrap/bootstrap.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.css
rename to django/frontend/static/css/bootstrap/bootstrap.css
diff --git a/frontend/static/css/bootstrap/bootstrap.css.map b/django/frontend/static/css/bootstrap/bootstrap.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.css.map
rename to django/frontend/static/css/bootstrap/bootstrap.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap.min.css b/django/frontend/static/css/bootstrap/bootstrap.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.min.css
rename to django/frontend/static/css/bootstrap/bootstrap.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap.min.css.map b/django/frontend/static/css/bootstrap/bootstrap.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap.min.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap.rtl.css b/django/frontend/static/css/bootstrap/bootstrap.rtl.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.rtl.css
rename to django/frontend/static/css/bootstrap/bootstrap.rtl.css
diff --git a/frontend/static/css/bootstrap/bootstrap.rtl.css.map b/django/frontend/static/css/bootstrap/bootstrap.rtl.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.rtl.css.map
rename to django/frontend/static/css/bootstrap/bootstrap.rtl.css.map
diff --git a/frontend/static/css/bootstrap/bootstrap.rtl.min.css b/django/frontend/static/css/bootstrap/bootstrap.rtl.min.css
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.rtl.min.css
rename to django/frontend/static/css/bootstrap/bootstrap.rtl.min.css
diff --git a/frontend/static/css/bootstrap/bootstrap.rtl.min.css.map b/django/frontend/static/css/bootstrap/bootstrap.rtl.min.css.map
similarity index 100%
rename from frontend/static/css/bootstrap/bootstrap.rtl.min.css.map
rename to django/frontend/static/css/bootstrap/bootstrap.rtl.min.css.map
diff --git a/frontend/static/css/game.css b/django/frontend/static/css/game.css
similarity index 100%
rename from frontend/static/css/game.css
rename to django/frontend/static/css/game.css
diff --git a/frontend/static/css/gameHistory.css b/django/frontend/static/css/gameHistory.css
similarity index 100%
rename from frontend/static/css/gameHistory.css
rename to django/frontend/static/css/gameHistory.css
diff --git a/frontend/static/css/gameOffline.css b/django/frontend/static/css/gameOffline.css
similarity index 100%
rename from frontend/static/css/gameOffline.css
rename to django/frontend/static/css/gameOffline.css
diff --git a/frontend/static/css/index.css b/django/frontend/static/css/index.css
similarity index 100%
rename from frontend/static/css/index.css
rename to django/frontend/static/css/index.css
diff --git a/frontend/static/css/profile.css b/django/frontend/static/css/profile.css
similarity index 100%
rename from frontend/static/css/profile.css
rename to django/frontend/static/css/profile.css
diff --git a/frontend/static/css/search.css b/django/frontend/static/css/search.css
similarity index 100%
rename from frontend/static/css/search.css
rename to django/frontend/static/css/search.css
diff --git a/frontend/static/css/tictactoe.css b/django/frontend/static/css/tictactoe.css
similarity index 100%
rename from frontend/static/css/tictactoe.css
rename to django/frontend/static/css/tictactoe.css
diff --git a/frontend/static/js/3D/buffers.js b/django/frontend/static/js/3D/buffers.js
similarity index 100%
rename from frontend/static/js/3D/buffers.js
rename to django/frontend/static/js/3D/buffers.js
diff --git a/frontend/static/js/3D/cube.js b/django/frontend/static/js/3D/cube.js
similarity index 100%
rename from frontend/static/js/3D/cube.js
rename to django/frontend/static/js/3D/cube.js
diff --git a/frontend/static/js/3D/maths/gl-matrix-min.js b/django/frontend/static/js/3D/maths/gl-matrix-min.js
similarity index 100%
rename from frontend/static/js/3D/maths/gl-matrix-min.js
rename to django/frontend/static/js/3D/maths/gl-matrix-min.js
diff --git a/frontend/static/js/3D/shaders.js b/django/frontend/static/js/3D/shaders.js
similarity index 100%
rename from frontend/static/js/3D/shaders.js
rename to django/frontend/static/js/3D/shaders.js
diff --git a/frontend/static/js/api/AExchangable.js b/django/frontend/static/js/api/AExchangable.js
similarity index 100%
rename from frontend/static/js/api/AExchangable.js
rename to django/frontend/static/js/api/AExchangable.js
diff --git a/frontend/static/js/api/Account.js b/django/frontend/static/js/api/Account.js
similarity index 100%
rename from frontend/static/js/api/Account.js
rename to django/frontend/static/js/api/Account.js
diff --git a/frontend/static/js/api/Client.js b/django/frontend/static/js/api/Client.js
similarity index 95%
rename from frontend/static/js/api/Client.js
rename to django/frontend/static/js/api/Client.js
index 61eaef3..9264be7 100644
--- a/frontend/static/js/api/Client.js
+++ b/django/frontend/static/js/api/Client.js
@@ -2,14 +2,6 @@ import { Account } from "./Account.js";
 import { MatchMaking } from "./Matchmaking.js";
 import { Profiles } from "./Profiles.js";
 import { MyProfile } from "./MyProfile.js";
-<<<<<<< Updated upstream
-import { Channel } from "./chat/Channel.js";
-||||||| Stash base
-import { Tourmanents } from "./tournament/Tournaments.js";
-import { Channel } from "./chat/Channel.js";
-=======
-import { Tourmanents } from "./tournament/Tournaments.js";
->>>>>>> Stashed changes
 import Notice from "./Notice.js";
 import LanguageManager from './LanguageManager.js';
 
diff --git a/frontend/static/js/api/LanguageManager.js b/django/frontend/static/js/api/LanguageManager.js
similarity index 100%
rename from frontend/static/js/api/LanguageManager.js
rename to django/frontend/static/js/api/LanguageManager.js
diff --git a/frontend/static/js/api/Matchmaking.js b/django/frontend/static/js/api/Matchmaking.js
similarity index 100%
rename from frontend/static/js/api/Matchmaking.js
rename to django/frontend/static/js/api/Matchmaking.js
diff --git a/frontend/static/js/api/MyProfile.js b/django/frontend/static/js/api/MyProfile.js
similarity index 100%
rename from frontend/static/js/api/MyProfile.js
rename to django/frontend/static/js/api/MyProfile.js
diff --git a/frontend/static/js/api/Notice.js b/django/frontend/static/js/api/Notice.js
similarity index 100%
rename from frontend/static/js/api/Notice.js
rename to django/frontend/static/js/api/Notice.js
diff --git a/frontend/static/js/api/Profile.js b/django/frontend/static/js/api/Profile.js
similarity index 100%
rename from frontend/static/js/api/Profile.js
rename to django/frontend/static/js/api/Profile.js
diff --git a/frontend/static/js/api/Profiles.js b/django/frontend/static/js/api/Profiles.js
similarity index 100%
rename from frontend/static/js/api/Profiles.js
rename to django/frontend/static/js/api/Profiles.js
diff --git a/frontend/static/js/api/chat/Ask.js b/django/frontend/static/js/api/chat/Ask.js
similarity index 100%
rename from frontend/static/js/api/chat/Ask.js
rename to django/frontend/static/js/api/chat/Ask.js
diff --git a/frontend/static/js/api/chat/Channel.js b/django/frontend/static/js/api/chat/Channel.js
similarity index 100%
rename from frontend/static/js/api/chat/Channel.js
rename to django/frontend/static/js/api/chat/Channel.js
diff --git a/frontend/static/js/api/chat/Channels.js b/django/frontend/static/js/api/chat/Channels.js
similarity index 100%
rename from frontend/static/js/api/chat/Channels.js
rename to django/frontend/static/js/api/chat/Channels.js
diff --git a/frontend/static/js/api/chat/Message.js b/django/frontend/static/js/api/chat/Message.js
similarity index 100%
rename from frontend/static/js/api/chat/Message.js
rename to django/frontend/static/js/api/chat/Message.js
diff --git a/frontend/static/js/api/game/AGame.js b/django/frontend/static/js/api/game/AGame.js
similarity index 100%
rename from frontend/static/js/api/game/AGame.js
rename to django/frontend/static/js/api/game/AGame.js
diff --git a/frontend/static/js/api/game/APlayer.js b/django/frontend/static/js/api/game/APlayer.js
similarity index 100%
rename from frontend/static/js/api/game/APlayer.js
rename to django/frontend/static/js/api/game/APlayer.js
diff --git a/frontend/static/js/api/game/pong/Point.js b/django/frontend/static/js/api/game/pong/Point.js
similarity index 100%
rename from frontend/static/js/api/game/pong/Point.js
rename to django/frontend/static/js/api/game/pong/Point.js
diff --git a/frontend/static/js/api/game/pong/PongBall.js b/django/frontend/static/js/api/game/pong/PongBall.js
similarity index 100%
rename from frontend/static/js/api/game/pong/PongBall.js
rename to django/frontend/static/js/api/game/pong/PongBall.js
diff --git a/frontend/static/js/api/game/pong/PongConfig.js b/django/frontend/static/js/api/game/pong/PongConfig.js
similarity index 100%
rename from frontend/static/js/api/game/pong/PongConfig.js
rename to django/frontend/static/js/api/game/pong/PongConfig.js
diff --git a/frontend/static/js/api/game/pong/PongGame.js b/django/frontend/static/js/api/game/pong/PongGame.js
similarity index 100%
rename from frontend/static/js/api/game/pong/PongGame.js
rename to django/frontend/static/js/api/game/pong/PongGame.js
diff --git a/frontend/static/js/api/game/pong/PongMyPlayer.js b/django/frontend/static/js/api/game/pong/PongMyPlayer.js
similarity index 100%
rename from frontend/static/js/api/game/pong/PongMyPlayer.js
rename to django/frontend/static/js/api/game/pong/PongMyPlayer.js
diff --git a/frontend/static/js/api/game/pong/PongPlayer.js b/django/frontend/static/js/api/game/pong/PongPlayer.js
similarity index 100%
rename from frontend/static/js/api/game/pong/PongPlayer.js
rename to django/frontend/static/js/api/game/pong/PongPlayer.js
diff --git a/frontend/static/js/api/game/pong/Position.js b/django/frontend/static/js/api/game/pong/Position.js
similarity index 100%
rename from frontend/static/js/api/game/pong/Position.js
rename to django/frontend/static/js/api/game/pong/Position.js
diff --git a/frontend/static/js/api/game/pong/Segment.js b/django/frontend/static/js/api/game/pong/Segment.js
similarity index 100%
rename from frontend/static/js/api/game/pong/Segment.js
rename to django/frontend/static/js/api/game/pong/Segment.js
diff --git a/frontend/static/js/api/game/pong/Time.js b/django/frontend/static/js/api/game/pong/Time.js
similarity index 100%
rename from frontend/static/js/api/game/pong/Time.js
rename to django/frontend/static/js/api/game/pong/Time.js
diff --git a/frontend/static/js/api/game/pong/Wall.js b/django/frontend/static/js/api/game/pong/Wall.js
similarity index 100%
rename from frontend/static/js/api/game/pong/Wall.js
rename to django/frontend/static/js/api/game/pong/Wall.js
diff --git a/frontend/static/js/api/game/tictactoe/TicTacToeGame.js b/django/frontend/static/js/api/game/tictactoe/TicTacToeGame.js
similarity index 100%
rename from frontend/static/js/api/game/tictactoe/TicTacToeGame.js
rename to django/frontend/static/js/api/game/tictactoe/TicTacToeGame.js
diff --git a/frontend/static/js/bootstrap/bootstrap.bundle.js b/django/frontend/static/js/bootstrap/bootstrap.bundle.js
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.bundle.js
rename to django/frontend/static/js/bootstrap/bootstrap.bundle.js
diff --git a/frontend/static/js/bootstrap/bootstrap.bundle.js.map b/django/frontend/static/js/bootstrap/bootstrap.bundle.js.map
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.bundle.js.map
rename to django/frontend/static/js/bootstrap/bootstrap.bundle.js.map
diff --git a/frontend/static/js/bootstrap/bootstrap.bundle.min.js b/django/frontend/static/js/bootstrap/bootstrap.bundle.min.js
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.bundle.min.js
rename to django/frontend/static/js/bootstrap/bootstrap.bundle.min.js
diff --git a/frontend/static/js/bootstrap/bootstrap.bundle.min.js.map b/django/frontend/static/js/bootstrap/bootstrap.bundle.min.js.map
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.bundle.min.js.map
rename to django/frontend/static/js/bootstrap/bootstrap.bundle.min.js.map
diff --git a/frontend/static/js/bootstrap/bootstrap.esm.js b/django/frontend/static/js/bootstrap/bootstrap.esm.js
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.esm.js
rename to django/frontend/static/js/bootstrap/bootstrap.esm.js
diff --git a/frontend/static/js/bootstrap/bootstrap.esm.js.map b/django/frontend/static/js/bootstrap/bootstrap.esm.js.map
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.esm.js.map
rename to django/frontend/static/js/bootstrap/bootstrap.esm.js.map
diff --git a/frontend/static/js/bootstrap/bootstrap.esm.min.js b/django/frontend/static/js/bootstrap/bootstrap.esm.min.js
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.esm.min.js
rename to django/frontend/static/js/bootstrap/bootstrap.esm.min.js
diff --git a/frontend/static/js/bootstrap/bootstrap.esm.min.js.map b/django/frontend/static/js/bootstrap/bootstrap.esm.min.js.map
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.esm.min.js.map
rename to django/frontend/static/js/bootstrap/bootstrap.esm.min.js.map
diff --git a/frontend/static/js/bootstrap/bootstrap.js b/django/frontend/static/js/bootstrap/bootstrap.js
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.js
rename to django/frontend/static/js/bootstrap/bootstrap.js
diff --git a/frontend/static/js/bootstrap/bootstrap.js.map b/django/frontend/static/js/bootstrap/bootstrap.js.map
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.js.map
rename to django/frontend/static/js/bootstrap/bootstrap.js.map
diff --git a/frontend/static/js/bootstrap/bootstrap.min.js b/django/frontend/static/js/bootstrap/bootstrap.min.js
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.min.js
rename to django/frontend/static/js/bootstrap/bootstrap.min.js
diff --git a/frontend/static/js/bootstrap/bootstrap.min.js.map b/django/frontend/static/js/bootstrap/bootstrap.min.js.map
similarity index 100%
rename from frontend/static/js/bootstrap/bootstrap.min.js.map
rename to django/frontend/static/js/bootstrap/bootstrap.min.js.map
diff --git a/frontend/static/js/chartjs/chart.umd.min.js b/django/frontend/static/js/chartjs/chart.umd.min.js
similarity index 100%
rename from frontend/static/js/chartjs/chart.umd.min.js
rename to django/frontend/static/js/chartjs/chart.umd.min.js
diff --git a/frontend/static/js/index.js b/django/frontend/static/js/index.js
similarity index 100%
rename from frontend/static/js/index.js
rename to django/frontend/static/js/index.js
diff --git a/frontend/static/js/lang/cr.json b/django/frontend/static/js/lang/cr.json
similarity index 100%
rename from frontend/static/js/lang/cr.json
rename to django/frontend/static/js/lang/cr.json
diff --git a/frontend/static/js/lang/en.json b/django/frontend/static/js/lang/en.json
similarity index 100%
rename from frontend/static/js/lang/en.json
rename to django/frontend/static/js/lang/en.json
diff --git a/frontend/static/js/lang/fr.json b/django/frontend/static/js/lang/fr.json
similarity index 100%
rename from frontend/static/js/lang/fr.json
rename to django/frontend/static/js/lang/fr.json
diff --git a/frontend/static/js/lang/tp.json b/django/frontend/static/js/lang/tp.json
similarity index 100%
rename from frontend/static/js/lang/tp.json
rename to django/frontend/static/js/lang/tp.json
diff --git a/frontend/static/js/sound/tictactoe/incorrectbuzzer.mp3 b/django/frontend/static/js/sound/tictactoe/incorrectbuzzer.mp3
similarity index 100%
rename from frontend/static/js/sound/tictactoe/incorrectbuzzer.mp3
rename to django/frontend/static/js/sound/tictactoe/incorrectbuzzer.mp3
diff --git a/frontend/static/js/sound/tictactoe/play-move.mp3 b/django/frontend/static/js/sound/tictactoe/play-move.mp3
similarity index 100%
rename from frontend/static/js/sound/tictactoe/play-move.mp3
rename to django/frontend/static/js/sound/tictactoe/play-move.mp3
diff --git a/frontend/static/js/utils/formUtils.js b/django/frontend/static/js/utils/formUtils.js
similarity index 100%
rename from frontend/static/js/utils/formUtils.js
rename to django/frontend/static/js/utils/formUtils.js
diff --git a/frontend/static/js/utils/graph.js b/django/frontend/static/js/utils/graph.js
similarity index 100%
rename from frontend/static/js/utils/graph.js
rename to django/frontend/static/js/utils/graph.js
diff --git a/frontend/static/js/utils/noticeUtils.js b/django/frontend/static/js/utils/noticeUtils.js
similarity index 100%
rename from frontend/static/js/utils/noticeUtils.js
rename to django/frontend/static/js/utils/noticeUtils.js
diff --git a/frontend/static/js/utils/sleep.js b/django/frontend/static/js/utils/sleep.js
similarity index 100%
rename from frontend/static/js/utils/sleep.js
rename to django/frontend/static/js/utils/sleep.js
diff --git a/frontend/static/js/views/HomeView.js b/django/frontend/static/js/views/HomeView.js
similarity index 100%
rename from frontend/static/js/views/HomeView.js
rename to django/frontend/static/js/views/HomeView.js
diff --git a/frontend/static/js/views/MatchMakingView.js b/django/frontend/static/js/views/MatchMakingView.js
similarity index 100%
rename from frontend/static/js/views/MatchMakingView.js
rename to django/frontend/static/js/views/MatchMakingView.js
diff --git a/frontend/static/js/views/PageNotFoundView.js b/django/frontend/static/js/views/PageNotFoundView.js
similarity index 100%
rename from frontend/static/js/views/PageNotFoundView.js
rename to django/frontend/static/js/views/PageNotFoundView.js
diff --git a/frontend/static/js/views/PongOfflineView.js b/django/frontend/static/js/views/PongOfflineView.js
similarity index 100%
rename from frontend/static/js/views/PongOfflineView.js
rename to django/frontend/static/js/views/PongOfflineView.js
diff --git a/frontend/static/js/views/PongOnlineView.js b/django/frontend/static/js/views/PongOnlineView.js
similarity index 100%
rename from frontend/static/js/views/PongOnlineView.js
rename to django/frontend/static/js/views/PongOnlineView.js
diff --git a/frontend/static/js/views/ProfilePageView.js b/django/frontend/static/js/views/ProfilePageView.js
similarity index 100%
rename from frontend/static/js/views/ProfilePageView.js
rename to django/frontend/static/js/views/ProfilePageView.js
diff --git a/frontend/static/js/views/Search.js b/django/frontend/static/js/views/Search.js
similarity index 100%
rename from frontend/static/js/views/Search.js
rename to django/frontend/static/js/views/Search.js
diff --git a/frontend/static/js/views/SettingsView.js b/django/frontend/static/js/views/SettingsView.js
similarity index 100%
rename from frontend/static/js/views/SettingsView.js
rename to django/frontend/static/js/views/SettingsView.js
diff --git a/frontend/static/js/views/TicTacToeOfflineView.js b/django/frontend/static/js/views/TicTacToeOfflineView.js
similarity index 100%
rename from frontend/static/js/views/TicTacToeOfflineView.js
rename to django/frontend/static/js/views/TicTacToeOfflineView.js
diff --git a/frontend/static/js/views/TicTacToeOnlineView.js b/django/frontend/static/js/views/TicTacToeOnlineView.js
similarity index 100%
rename from frontend/static/js/views/TicTacToeOnlineView.js
rename to django/frontend/static/js/views/TicTacToeOnlineView.js
diff --git a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js b/django/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
similarity index 100%
rename from frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
rename to django/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js b/django/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
similarity index 100%
rename from frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
rename to django/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
diff --git a/frontend/static/js/views/abstracts/AbstractRedirectView.js b/django/frontend/static/js/views/abstracts/AbstractRedirectView.js
similarity index 100%
rename from frontend/static/js/views/abstracts/AbstractRedirectView.js
rename to django/frontend/static/js/views/abstracts/AbstractRedirectView.js
diff --git a/frontend/static/js/views/abstracts/AbstractView.js b/django/frontend/static/js/views/abstracts/AbstractView.js
similarity index 100%
rename from frontend/static/js/views/abstracts/AbstractView.js
rename to django/frontend/static/js/views/abstracts/AbstractView.js
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/django/frontend/static/js/views/accounts/AuthenticationView.js
similarity index 100%
rename from frontend/static/js/views/accounts/AuthenticationView.js
rename to django/frontend/static/js/views/accounts/AuthenticationView.js
diff --git a/frontend/static/js/views/accounts/LogoutView.js b/django/frontend/static/js/views/accounts/LogoutView.js
similarity index 100%
rename from frontend/static/js/views/accounts/LogoutView.js
rename to django/frontend/static/js/views/accounts/LogoutView.js
diff --git a/frontend/templates/index.html b/django/frontend/templates/index.html
similarity index 100%
rename from frontend/templates/index.html
rename to django/frontend/templates/index.html
diff --git a/frontend/tests.py b/django/frontend/tests.py
similarity index 100%
rename from frontend/tests.py
rename to django/frontend/tests.py
diff --git a/frontend/urls.py b/django/frontend/urls.py
similarity index 100%
rename from frontend/urls.py
rename to django/frontend/urls.py
diff --git a/frontend/views.py b/django/frontend/views.py
similarity index 100%
rename from frontend/views.py
rename to django/frontend/views.py
diff --git a/games/GameConfigView.py b/django/games/GameConfigView.py
similarity index 100%
rename from games/GameConfigView.py
rename to django/games/GameConfigView.py
diff --git a/games/GameHistoryViewSet.py b/django/games/GameHistoryViewSet.py
similarity index 100%
rename from games/GameHistoryViewSet.py
rename to django/games/GameHistoryViewSet.py
diff --git a/games/GameViewSet.py b/django/games/GameViewSet.py
similarity index 100%
rename from games/GameViewSet.py
rename to django/games/GameViewSet.py
diff --git a/games/__init__.py b/django/games/__init__.py
similarity index 100%
rename from games/__init__.py
rename to django/games/__init__.py
diff --git a/games/admin.py b/django/games/admin.py
similarity index 100%
rename from games/admin.py
rename to django/games/admin.py
diff --git a/games/apps.py b/django/games/apps.py
similarity index 100%
rename from games/apps.py
rename to django/games/apps.py
diff --git a/games/config.py b/django/games/config.py
similarity index 100%
rename from games/config.py
rename to django/games/config.py
diff --git a/games/consumers.py b/django/games/consumers.py
similarity index 100%
rename from games/consumers.py
rename to django/games/consumers.py
diff --git a/games/models.py b/django/games/models.py
similarity index 100%
rename from games/models.py
rename to django/games/models.py
diff --git a/games/objects/AGame.py b/django/games/objects/AGame.py
similarity index 100%
rename from games/objects/AGame.py
rename to django/games/objects/AGame.py
diff --git a/games/objects/APlayer.py b/django/games/objects/APlayer.py
similarity index 100%
rename from games/objects/APlayer.py
rename to django/games/objects/APlayer.py
diff --git a/games/objects/ASpectator.py b/django/games/objects/ASpectator.py
similarity index 100%
rename from games/objects/ASpectator.py
rename to django/games/objects/ASpectator.py
diff --git a/games/objects/GameManager.py b/django/games/objects/GameManager.py
similarity index 100%
rename from games/objects/GameManager.py
rename to django/games/objects/GameManager.py
diff --git a/games/objects/pong/Ball.py b/django/games/objects/pong/Ball.py
similarity index 100%
rename from games/objects/pong/Ball.py
rename to django/games/objects/pong/Ball.py
diff --git a/games/objects/pong/Point.py b/django/games/objects/pong/Point.py
similarity index 100%
rename from games/objects/pong/Point.py
rename to django/games/objects/pong/Point.py
diff --git a/games/objects/pong/PongGame.py b/django/games/objects/pong/PongGame.py
similarity index 100%
rename from games/objects/pong/PongGame.py
rename to django/games/objects/pong/PongGame.py
diff --git a/games/objects/pong/PongPlayer.py b/django/games/objects/pong/PongPlayer.py
similarity index 100%
rename from games/objects/pong/PongPlayer.py
rename to django/games/objects/pong/PongPlayer.py
diff --git a/games/objects/pong/PongSpectator.py b/django/games/objects/pong/PongSpectator.py
similarity index 100%
rename from games/objects/pong/PongSpectator.py
rename to django/games/objects/pong/PongSpectator.py
diff --git a/games/objects/pong/Position.py b/django/games/objects/pong/Position.py
similarity index 100%
rename from games/objects/pong/Position.py
rename to django/games/objects/pong/Position.py
diff --git a/games/objects/pong/Segment.py b/django/games/objects/pong/Segment.py
similarity index 100%
rename from games/objects/pong/Segment.py
rename to django/games/objects/pong/Segment.py
diff --git a/games/objects/pong/Vector.py b/django/games/objects/pong/Vector.py
similarity index 100%
rename from games/objects/pong/Vector.py
rename to django/games/objects/pong/Vector.py
diff --git a/games/objects/pong/Wall.py b/django/games/objects/pong/Wall.py
similarity index 100%
rename from games/objects/pong/Wall.py
rename to django/games/objects/pong/Wall.py
diff --git a/games/objects/tictactoe/TicTacToeGame.py b/django/games/objects/tictactoe/TicTacToeGame.py
similarity index 100%
rename from games/objects/tictactoe/TicTacToeGame.py
rename to django/games/objects/tictactoe/TicTacToeGame.py
diff --git a/games/objects/tictactoe/TicTacToePlayer.py b/django/games/objects/tictactoe/TicTacToePlayer.py
similarity index 100%
rename from games/objects/tictactoe/TicTacToePlayer.py
rename to django/games/objects/tictactoe/TicTacToePlayer.py
diff --git a/games/objects/tictactoe/TicTacToeSpectator.py b/django/games/objects/tictactoe/TicTacToeSpectator.py
similarity index 100%
rename from games/objects/tictactoe/TicTacToeSpectator.py
rename to django/games/objects/tictactoe/TicTacToeSpectator.py
diff --git a/games/routine.py b/django/games/routine.py
similarity index 100%
rename from games/routine.py
rename to django/games/routine.py
diff --git a/games/routing.py b/django/games/routing.py
similarity index 100%
rename from games/routing.py
rename to django/games/routing.py
diff --git a/games/serializers.py b/django/games/serializers.py
similarity index 100%
rename from games/serializers.py
rename to django/games/serializers.py
diff --git a/games/tests.py b/django/games/tests.py
similarity index 100%
rename from games/tests.py
rename to django/games/tests.py
diff --git a/games/urls.py b/django/games/urls.py
similarity index 100%
rename from games/urls.py
rename to django/games/urls.py
diff --git a/manage.py b/django/manage.py
similarity index 100%
rename from manage.py
rename to django/manage.py
diff --git a/matchmaking/__init__.py b/django/matchmaking/__init__.py
similarity index 100%
rename from matchmaking/__init__.py
rename to django/matchmaking/__init__.py
diff --git a/matchmaking/admin.py b/django/matchmaking/admin.py
similarity index 100%
rename from matchmaking/admin.py
rename to django/matchmaking/admin.py
diff --git a/matchmaking/apps.py b/django/matchmaking/apps.py
similarity index 100%
rename from matchmaking/apps.py
rename to django/matchmaking/apps.py
diff --git a/matchmaking/consumers.py b/django/matchmaking/consumers.py
similarity index 100%
rename from matchmaking/consumers.py
rename to django/matchmaking/consumers.py
diff --git a/matchmaking/models.py b/django/matchmaking/models.py
similarity index 100%
rename from matchmaking/models.py
rename to django/matchmaking/models.py
diff --git a/matchmaking/routing.py b/django/matchmaking/routing.py
similarity index 100%
rename from matchmaking/routing.py
rename to django/matchmaking/routing.py
diff --git a/matchmaking/tests.py b/django/matchmaking/tests.py
similarity index 100%
rename from matchmaking/tests.py
rename to django/matchmaking/tests.py
diff --git a/matchmaking/views.py b/django/matchmaking/views.py
similarity index 100%
rename from matchmaking/views.py
rename to django/matchmaking/views.py
diff --git a/notice/__init__.py b/django/notice/__init__.py
similarity index 100%
rename from notice/__init__.py
rename to django/notice/__init__.py
diff --git a/notice/admin.py b/django/notice/admin.py
similarity index 100%
rename from notice/admin.py
rename to django/notice/admin.py
diff --git a/notice/apps.py b/django/notice/apps.py
similarity index 100%
rename from notice/apps.py
rename to django/notice/apps.py
diff --git a/notice/consumers.py b/django/notice/consumers.py
similarity index 100%
rename from notice/consumers.py
rename to django/notice/consumers.py
diff --git a/notice/models.py b/django/notice/models.py
similarity index 100%
rename from notice/models.py
rename to django/notice/models.py
diff --git a/notice/routing.py b/django/notice/routing.py
similarity index 100%
rename from notice/routing.py
rename to django/notice/routing.py
diff --git a/notice/tests.py b/django/notice/tests.py
similarity index 100%
rename from notice/tests.py
rename to django/notice/tests.py
diff --git a/notice/views.py b/django/notice/views.py
similarity index 100%
rename from notice/views.py
rename to django/notice/views.py
diff --git a/profiles/__init__.py b/django/profiles/__init__.py
similarity index 100%
rename from profiles/__init__.py
rename to django/profiles/__init__.py
diff --git a/profiles/admin.py b/django/profiles/admin.py
similarity index 100%
rename from profiles/admin.py
rename to django/profiles/admin.py
diff --git a/profiles/apps.py b/django/profiles/apps.py
similarity index 100%
rename from profiles/apps.py
rename to django/profiles/apps.py
diff --git a/profiles/models.py b/django/profiles/models.py
similarity index 100%
rename from profiles/models.py
rename to django/profiles/models.py
diff --git a/profiles/serializers.py b/django/profiles/serializers.py
similarity index 100%
rename from profiles/serializers.py
rename to django/profiles/serializers.py
diff --git a/profiles/static/avatars/default.avif b/django/profiles/static/avatars/default.avif
similarity index 100%
rename from profiles/static/avatars/default.avif
rename to django/profiles/static/avatars/default.avif
diff --git a/profiles/tests/__init__.py b/django/profiles/tests/__init__.py
similarity index 100%
rename from profiles/tests/__init__.py
rename to django/profiles/tests/__init__.py
diff --git a/profiles/tests/blocks.py b/django/profiles/tests/blocks.py
similarity index 100%
rename from profiles/tests/blocks.py
rename to django/profiles/tests/blocks.py
diff --git a/profiles/tests/friends.py b/django/profiles/tests/friends.py
similarity index 100%
rename from profiles/tests/friends.py
rename to django/profiles/tests/friends.py
diff --git a/profiles/tests/profiles.py b/django/profiles/tests/profiles.py
similarity index 100%
rename from profiles/tests/profiles.py
rename to django/profiles/tests/profiles.py
diff --git a/profiles/urls.py b/django/profiles/urls.py
similarity index 100%
rename from profiles/urls.py
rename to django/profiles/urls.py
diff --git a/profiles/views/blocks.py b/django/profiles/views/blocks.py
similarity index 100%
rename from profiles/views/blocks.py
rename to django/profiles/views/blocks.py
diff --git a/profiles/views/friends.py b/django/profiles/views/friends.py
similarity index 100%
rename from profiles/views/friends.py
rename to django/profiles/views/friends.py
diff --git a/profiles/viewsets/MyProfileViewSet.py b/django/profiles/viewsets/MyProfileViewSet.py
similarity index 100%
rename from profiles/viewsets/MyProfileViewSet.py
rename to django/profiles/viewsets/MyProfileViewSet.py
diff --git a/profiles/viewsets/ProfileViewSet.py b/django/profiles/viewsets/ProfileViewSet.py
similarity index 100%
rename from profiles/viewsets/ProfileViewSet.py
rename to django/profiles/viewsets/ProfileViewSet.py
diff --git a/requirements.txt b/django/requirements.txt
similarity index 90%
rename from requirements.txt
rename to django/requirements.txt
index be1d817..3e79c4f 100644
--- a/requirements.txt
+++ b/django/requirements.txt
@@ -16,12 +16,15 @@ idna==3.6
 incremental==22.10.0
 install==1.3.5
 Pillow==10.1.0
+psycopg==3.1.19
+psycopg-binary==3.1.19
 pyasn1==0.5.1
 pyasn1-modules==0.3.0
 pycparser==2.21
 pyOpenSSL==23.3.0
 pytz==2023.3.post1
 service-identity==23.1.0
+setuptools==69.5.1
 six==1.16.0
 sqlparse==0.4.4
 Twisted==23.10.0
diff --git a/transcendence/__init__.py b/django/transcendence/__init__.py
similarity index 100%
rename from transcendence/__init__.py
rename to django/transcendence/__init__.py
diff --git a/transcendence/abstract/AbstractRoom.py b/django/transcendence/abstract/AbstractRoom.py
similarity index 100%
rename from transcendence/abstract/AbstractRoom.py
rename to django/transcendence/abstract/AbstractRoom.py
diff --git a/transcendence/abstract/AbstractRoomManager.py b/django/transcendence/abstract/AbstractRoomManager.py
similarity index 100%
rename from transcendence/abstract/AbstractRoomManager.py
rename to django/transcendence/abstract/AbstractRoomManager.py
diff --git a/transcendence/abstract/AbstractRoomMember.py b/django/transcendence/abstract/AbstractRoomMember.py
similarity index 100%
rename from transcendence/abstract/AbstractRoomMember.py
rename to django/transcendence/abstract/AbstractRoomMember.py
diff --git a/transcendence/asgi.py b/django/transcendence/asgi.py
similarity index 100%
rename from transcendence/asgi.py
rename to django/transcendence/asgi.py
diff --git a/transcendence/settings.py b/django/transcendence/settings.py
similarity index 94%
rename from transcendence/settings.py
rename to django/transcendence/settings.py
index 68129c4..b747a7e 100644
--- a/transcendence/settings.py
+++ b/django/transcendence/settings.py
@@ -108,8 +108,11 @@ WSGI_APPLICATION = 'transcendence.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django.db.backends.postgresql',
+        'HOST': 'django-db',
+        'NAME': os.environ['POSTGRES_DB'],
+        'USER': os.environ['POSTGRES_USER'],
+        'PASSWORD': os.environ['POSTGRES_PASSWORD'],
     }
 }
 
diff --git a/transcendence/urls.py b/django/transcendence/urls.py
similarity index 100%
rename from transcendence/urls.py
rename to django/transcendence/urls.py
diff --git a/transcendence/views.py b/django/transcendence/views.py
similarity index 100%
rename from transcendence/views.py
rename to django/transcendence/views.py
diff --git a/transcendence/wsgi.py b/django/transcendence/wsgi.py
similarity index 100%
rename from transcendence/wsgi.py
rename to django/transcendence/wsgi.py
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..bf3dd82
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,39 @@
+name: ft_transcendence
+
+services:
+  django:
+    build: django/
+    image: django
+    networks:
+      - network
+    ports:
+      - "8000:8000"
+    container_name: django
+    restart: always
+    env_file: .env
+    depends_on:
+      db:
+        condition: service_healthy
+        restart: true
+
+  db:
+    image: postgres
+    volumes:
+      - db:/var/lib/postgresql/data
+    networks:
+      - network
+    container_name: django-db
+    restart: always
+    env_file: .env
+    healthcheck:
+      test: "pg_isready -U $POSTGRES_USER"
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  db:
+
+networks:
+  network:
+    driver: bridge
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 9860154..0000000
--- a/run.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-python3 -m venv .env
-source .env/bin/activate
-pip install -r requirements.txt
-python manage.py makemigrations games
-python manage.py makemigrations profiles
-python manage.py makemigrations chat
-python manage.py makemigrations notice
-python manage.py migrate
-python manage.py compilemessages
-python manage.py runserver 0.0.0.0:8000