diff --git a/Dockerfile b/Dockerfile
index a2460de..98246cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ RUN curl -sSL https://install.python-poetry.org | python3 -
 
 # copy project requirement files here to ensure they will be cached.
 WORKDIR $PYSETUP_PATH
-COPY poetry.lock pyproject.toml ./
+COPY backend/poetry.lock backend/pyproject.toml ./
 
 # install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
 RUN poetry install
@@ -54,9 +54,9 @@ RUN poetry install
 FROM python-base AS production
 ENV FASTAPI_ENV=production
 COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
-COPY alembic.ini /usr/src/
+COPY backend/alembic.ini /usr/src/
 COPY start.sh /usr/src/
-COPY ./alembic /usr/src/alembic
-COPY ./app /usr/src/app
+COPY backend/alembic /usr/src/alembic
+COPY backend/app /usr/src/app
 WORKDIR /usr/src
 CMD ["bash", "start.sh"]
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/backend/.devcontainer/devcontainer.json
similarity index 100%
rename from .devcontainer/devcontainer.json
rename to backend/.devcontainer/devcontainer.json
diff --git a/.devcontainer/docker-compose.yml b/backend/.devcontainer/docker-compose.yml
similarity index 100%
rename from .devcontainer/docker-compose.yml
rename to backend/.devcontainer/docker-compose.yml
diff --git a/.gitignore b/backend/.gitignore
similarity index 100%
rename from .gitignore
rename to backend/.gitignore
diff --git a/alembic.ini b/backend/alembic.ini
similarity index 100%
rename from alembic.ini
rename to backend/alembic.ini
diff --git a/alembic/env.py b/backend/alembic/env.py
similarity index 100%
rename from alembic/env.py
rename to backend/alembic/env.py
diff --git a/alembic/script.py.mako b/backend/alembic/script.py.mako
similarity index 100%
rename from alembic/script.py.mako
rename to backend/alembic/script.py.mako
diff --git a/alembic/versions/20240420_097d427dfa07-initial_migration.py b/backend/alembic/versions/20240420_097d427dfa07-initial_migration.py
similarity index 100%
rename from alembic/versions/20240420_097d427dfa07-initial_migration.py
rename to backend/alembic/versions/20240420_097d427dfa07-initial_migration.py
diff --git a/alembic/versions/20250313_c7f72154c90b-add_user_authentication.py b/backend/alembic/versions/20250313_c7f72154c90b-add_user_authentication.py
similarity index 100%
rename from alembic/versions/20250313_c7f72154c90b-add_user_authentication.py
rename to backend/alembic/versions/20250313_c7f72154c90b-add_user_authentication.py
diff --git a/app/__init__.py b/backend/app/__init__.py
similarity index 100%
rename from app/__init__.py
rename to backend/app/__init__.py
diff --git a/app/cli.py b/backend/app/cli.py
similarity index 100%
rename from app/cli.py
rename to backend/app/cli.py
diff --git a/app/database.py b/backend/app/database.py
similarity index 100%
rename from app/database.py
rename to backend/app/database.py
diff --git a/app/main.py b/backend/app/main.py
similarity index 100%
rename from app/main.py
rename to backend/app/main.py
diff --git a/app/models/__init__.py b/backend/app/models/__init__.py
similarity index 100%
rename from app/models/__init__.py
rename to backend/app/models/__init__.py
diff --git a/app/models/chargepoint.py b/backend/app/models/chargepoint.py
similarity index 100%
rename from app/models/chargepoint.py
rename to backend/app/models/chargepoint.py
diff --git a/app/models/chargepoint_variable.py b/backend/app/models/chargepoint_variable.py
similarity index 100%
rename from app/models/chargepoint_variable.py
rename to backend/app/models/chargepoint_variable.py
diff --git a/app/models/connector.py b/backend/app/models/connector.py
similarity index 100%
rename from app/models/connector.py
rename to backend/app/models/connector.py
diff --git a/app/models/id_token.py b/backend/app/models/id_token.py
similarity index 100%
rename from app/models/id_token.py
rename to backend/app/models/id_token.py
diff --git a/app/models/meter_value.py b/backend/app/models/meter_value.py
similarity index 100%
rename from app/models/meter_value.py
rename to backend/app/models/meter_value.py
diff --git a/app/models/session.py b/backend/app/models/session.py
similarity index 100%
rename from app/models/session.py
rename to backend/app/models/session.py
diff --git a/app/models/transaction.py b/backend/app/models/transaction.py
similarity index 100%
rename from app/models/transaction.py
rename to backend/app/models/transaction.py
diff --git a/app/models/user.py b/backend/app/models/user.py
similarity index 100%
rename from app/models/user.py
rename to backend/app/models/user.py
diff --git a/app/ocpp_proto/__init__.py b/backend/app/ocpp_proto/__init__.py
similarity index 100%
rename from app/ocpp_proto/__init__.py
rename to backend/app/ocpp_proto/__init__.py
diff --git a/app/ocpp_proto/chargepoint.py b/backend/app/ocpp_proto/chargepoint.py
similarity index 100%
rename from app/ocpp_proto/chargepoint.py
rename to backend/app/ocpp_proto/chargepoint.py
diff --git a/app/ocpp_proto/chargepoint_manager.py b/backend/app/ocpp_proto/chargepoint_manager.py
similarity index 100%
rename from app/ocpp_proto/chargepoint_manager.py
rename to backend/app/ocpp_proto/chargepoint_manager.py
diff --git a/app/routers/__init__.py b/backend/app/routers/__init__.py
similarity index 100%
rename from app/routers/__init__.py
rename to backend/app/routers/__init__.py
diff --git a/app/routers/auth_v1.py b/backend/app/routers/auth_v1.py
similarity index 100%
rename from app/routers/auth_v1.py
rename to backend/app/routers/auth_v1.py
diff --git a/app/routers/chargepoint_v1.py b/backend/app/routers/chargepoint_v1.py
similarity index 100%
rename from app/routers/chargepoint_v1.py
rename to backend/app/routers/chargepoint_v1.py
diff --git a/app/routers/id_token_v1.py b/backend/app/routers/id_token_v1.py
similarity index 100%
rename from app/routers/id_token_v1.py
rename to backend/app/routers/id_token_v1.py
diff --git a/app/routers/me_v1.py b/backend/app/routers/me_v1.py
similarity index 100%
rename from app/routers/me_v1.py
rename to backend/app/routers/me_v1.py
diff --git a/app/routers/meter_value_v1.py b/backend/app/routers/meter_value_v1.py
similarity index 100%
rename from app/routers/meter_value_v1.py
rename to backend/app/routers/meter_value_v1.py
diff --git a/app/routers/ocpp_v1.py b/backend/app/routers/ocpp_v1.py
similarity index 100%
rename from app/routers/ocpp_v1.py
rename to backend/app/routers/ocpp_v1.py
diff --git a/app/routers/transaction_v1.py b/backend/app/routers/transaction_v1.py
similarity index 100%
rename from app/routers/transaction_v1.py
rename to backend/app/routers/transaction_v1.py
diff --git a/app/routers/user_v1.py b/backend/app/routers/user_v1.py
similarity index 100%
rename from app/routers/user_v1.py
rename to backend/app/routers/user_v1.py
diff --git a/app/schemas/__init__.py b/backend/app/schemas/__init__.py
similarity index 100%
rename from app/schemas/__init__.py
rename to backend/app/schemas/__init__.py
diff --git a/app/schemas/auth_token.py b/backend/app/schemas/auth_token.py
similarity index 100%
rename from app/schemas/auth_token.py
rename to backend/app/schemas/auth_token.py
diff --git a/app/schemas/chargepoint.py b/backend/app/schemas/chargepoint.py
similarity index 100%
rename from app/schemas/chargepoint.py
rename to backend/app/schemas/chargepoint.py
diff --git a/app/schemas/chargepoint_variable.py b/backend/app/schemas/chargepoint_variable.py
similarity index 100%
rename from app/schemas/chargepoint_variable.py
rename to backend/app/schemas/chargepoint_variable.py
diff --git a/app/schemas/connector.py b/backend/app/schemas/connector.py
similarity index 100%
rename from app/schemas/connector.py
rename to backend/app/schemas/connector.py
diff --git a/app/schemas/id_token.py b/backend/app/schemas/id_token.py
similarity index 100%
rename from app/schemas/id_token.py
rename to backend/app/schemas/id_token.py
diff --git a/app/schemas/meter_value.py b/backend/app/schemas/meter_value.py
similarity index 100%
rename from app/schemas/meter_value.py
rename to backend/app/schemas/meter_value.py
diff --git a/app/schemas/session.py b/backend/app/schemas/session.py
similarity index 100%
rename from app/schemas/session.py
rename to backend/app/schemas/session.py
diff --git a/app/schemas/transaction.py b/backend/app/schemas/transaction.py
similarity index 100%
rename from app/schemas/transaction.py
rename to backend/app/schemas/transaction.py
diff --git a/app/schemas/user.py b/backend/app/schemas/user.py
similarity index 100%
rename from app/schemas/user.py
rename to backend/app/schemas/user.py
diff --git a/app/security/__init__.py b/backend/app/security/__init__.py
similarity index 100%
rename from app/security/__init__.py
rename to backend/app/security/__init__.py
diff --git a/app/security/jwt_bearer.py b/backend/app/security/jwt_bearer.py
similarity index 100%
rename from app/security/jwt_bearer.py
rename to backend/app/security/jwt_bearer.py
diff --git a/app/security/websocket_auth_backend.py b/backend/app/security/websocket_auth_backend.py
similarity index 100%
rename from app/security/websocket_auth_backend.py
rename to backend/app/security/websocket_auth_backend.py
diff --git a/app/services/__init__.py b/backend/app/services/__init__.py
similarity index 100%
rename from app/services/__init__.py
rename to backend/app/services/__init__.py
diff --git a/app/services/chargepoint_service.py b/backend/app/services/chargepoint_service.py
similarity index 100%
rename from app/services/chargepoint_service.py
rename to backend/app/services/chargepoint_service.py
diff --git a/app/services/id_token_service.py b/backend/app/services/id_token_service.py
similarity index 100%
rename from app/services/id_token_service.py
rename to backend/app/services/id_token_service.py
diff --git a/app/services/meter_value_service.py b/backend/app/services/meter_value_service.py
similarity index 100%
rename from app/services/meter_value_service.py
rename to backend/app/services/meter_value_service.py
diff --git a/app/services/session_service.py b/backend/app/services/session_service.py
similarity index 100%
rename from app/services/session_service.py
rename to backend/app/services/session_service.py
diff --git a/app/services/token_service.py b/backend/app/services/token_service.py
similarity index 100%
rename from app/services/token_service.py
rename to backend/app/services/token_service.py
diff --git a/app/services/transaction_service.py b/backend/app/services/transaction_service.py
similarity index 100%
rename from app/services/transaction_service.py
rename to backend/app/services/transaction_service.py
diff --git a/app/services/user_service.py b/backend/app/services/user_service.py
similarity index 100%
rename from app/services/user_service.py
rename to backend/app/services/user_service.py
diff --git a/app/services/variable_service.py b/backend/app/services/variable_service.py
similarity index 100%
rename from app/services/variable_service.py
rename to backend/app/services/variable_service.py
diff --git a/app/util/__init__.py b/backend/app/util/__init__.py
similarity index 100%
rename from app/util/__init__.py
rename to backend/app/util/__init__.py
diff --git a/app/util/errors.py b/backend/app/util/errors.py
similarity index 100%
rename from app/util/errors.py
rename to backend/app/util/errors.py
diff --git a/app/util/websocket_wrapper.py b/backend/app/util/websocket_wrapper.py
similarity index 100%
rename from app/util/websocket_wrapper.py
rename to backend/app/util/websocket_wrapper.py
diff --git a/poetry.lock b/backend/poetry.lock
similarity index 100%
rename from poetry.lock
rename to backend/poetry.lock
diff --git a/pyproject.toml b/backend/pyproject.toml
similarity index 97%
rename from pyproject.toml
rename to backend/pyproject.toml
index c56e0c9..fd456a4 100644
--- a/pyproject.toml
+++ b/backend/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "simple-ocpp-cs"
-version = "0.1.0"
+version = "0.2.0"
 description = "A simple OCPP 2.0.1 compliant central system"
 authors = ["Bluemedia <hi@bluemedia.dev>"]
 readme = "README.md"