diff --git a/.gitignore b/.gitignore
index cdb80ae..1037f7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,6 @@ __pycache__/
*$py.class
**/migrations/
-!*/migrations/__init__.py # Keep the init file if you ignore migrations
\ No newline at end of file
+!*/migrations/__init__.py # Keep the init file if you ignore migrations
+instalinks/myapp.log
+myapp.log
\ No newline at end of file
diff --git a/Dockerfile.app b/Dockerfile.app
index 82d51d4..a538cb5 100644
--- a/Dockerfile.app
+++ b/Dockerfile.app
@@ -6,20 +6,30 @@ FROM python:3.12.9-slim-bookworm
WORKDIR /app
# Copy requirements first, to leverage Docker's layer caching
-COPY instalinks/requirements.txt /app/
+COPY instalinks/instalinks/requirements.txt /app/
# Install dependencies
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt && \
+ apt update && apt install -y nginx uwsgi which gcc
# Copy the rest of the source code
COPY instalinks/ /app/
+COPY static /app/static
+COPY nginx/etc/nginx/sites-available /etc/nginx/sites-available
+COPY running.sh /app/
+COPY manage.py /app/
+
+ENV DB_USER=/run/secrets/DB_USER
+ENV DB_PASSWORD=/run/secrets/DB_PASSWORD
+ENV DB_NAME=/run/secrets/DB_NAME
# Set environment variables for Django
ENV PYTHONUNBUFFERED 1
-ENV DJANGO_SETTINGS_MODULE instagram_links.settings
+ENV DJANGO_SETTINGS_MODULE settings
# Expose the port Django runs on
-EXPOSE 8000
+# EXPOSE 8000
+EXPOSE 8080
# Default command: run the Django dev server
-CMD ["gunicorn", "instalinks.wsgi:application"]
\ No newline at end of file
+CMD /app/running.sh
\ No newline at end of file
diff --git a/Dockerfile.db b/Dockerfile.db
index b768647..66ac94a 100644
--- a/Dockerfile.db
+++ b/Dockerfile.db
@@ -4,9 +4,9 @@
FROM bitnami/postgresql:17.4.0-debian-12-r12
# Set environment variables to override default credentials
-ENV POSTGRES_USER=/run/secrets/DB_USER
-ENV POSTGRES_PASSWORD=/run/secrets/DB_PASSWORD
-ENV POSTGRES_DB=/run/secrets/DB_NAME
+#ENV POSTGRES_USER=DB_USER
+#ENV POSTGRES_PASSWORD=DB_PASSWORD
+#ENV POSTGRES_DB=DB_NAME
# Copy the SQL init script into the entrypoint directory
COPY init.sql /docker-entrypoint-initdb.d/init.sql
diff --git a/instalinks/instalinks/__init__.py b/instalinks/__init__.py
similarity index 100%
rename from instalinks/instalinks/__init__.py
rename to instalinks/__init__.py
diff --git a/instalinks/instalinks/asgi.py b/instalinks/asgi.py
similarity index 82%
rename from instalinks/instalinks/asgi.py
rename to instalinks/asgi.py
index 8e90972..9517a72 100644
--- a/instalinks/instalinks/asgi.py
+++ b/instalinks/asgi.py
@@ -11,6 +11,6 @@ import os
from django.core.asgi import get_asgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'instalinks.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'asettings')
application = get_asgi_application()
diff --git a/instalinks/requirements.txt b/instalinks/instalinks/requirements.txt
similarity index 100%
rename from instalinks/requirements.txt
rename to instalinks/instalinks/requirements.txt
diff --git a/instalinks/templates/links/index.html b/instalinks/links/templates/links/index.html
similarity index 97%
rename from instalinks/templates/links/index.html
rename to instalinks/links/templates/links/index.html
index 2f75038..5bd5d32 100644
--- a/instalinks/templates/links/index.html
+++ b/instalinks/links/templates/links/index.html
@@ -63,6 +63,6 @@
-
+