diff --git a/Dockerfile b/Dockerfile
index c5db9ca..2f1609f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,20 @@
-#FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base
-#WORKDIR /app
-#
-#FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-#COPY ../ /src/
-#WORKDIR /src
-#RUN dotnet build "MauMau-Server.csproj" -c Release -o out
-#
-#FROM build AS publish
-#RUN dotnet publish "MauMau-Server.csproj" -c Release -o /app/publish
-#
-#FROM base AS final
-#WORKDIR /app
-#COPY --from=publish /app/publish .
-#ENTRYPOINT ["dotnet", "MauMau-Server.dll"]
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
 
-# https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.csproj .
-RUN dotnet restore --use-current-runtime  
-
-# copy everything else and build app
+WORKDIR /src
+COPY ["MauMau-Server/MauMau-Server.csproj", "MauMau-Server/"]
+RUN dotnet restore "MauMau-Server/MauMau-Server.csproj"
 COPY . .
-RUN dotnet publish -c Release -o /out --use-current-runtime --self-contained false --no-restore
+WORKDIR "/src/MauMau-Server"
+RUN dotnet build "MauMau-Server.csproj" -c Release -o /app/build
 
-# final stage/image
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
-COPY --from=build . .
-EXPOSE 5000
-CMD ["dotnet", "MauMau-Server.dll"]
\ No newline at end of file
+FROM build AS publish
+RUN dotnet publish "MauMau-Server.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "MauMau-Server.dll"]
\ No newline at end of file
diff --git a/Controllers/MauController.cs b/MauMau-Server/Controllers/MauController.cs
similarity index 100%
rename from Controllers/MauController.cs
rename to MauMau-Server/Controllers/MauController.cs
diff --git a/Controllers/RoomController.cs b/MauMau-Server/Controllers/RoomController.cs
similarity index 100%
rename from Controllers/RoomController.cs
rename to MauMau-Server/Controllers/RoomController.cs
diff --git a/Mau/Card.cs b/MauMau-Server/Mau/Card.cs
similarity index 100%
rename from Mau/Card.cs
rename to MauMau-Server/Mau/Card.cs
diff --git a/Mau/CardDTO.cs b/MauMau-Server/Mau/CardDTO.cs
similarity index 100%
rename from Mau/CardDTO.cs
rename to MauMau-Server/Mau/CardDTO.cs
diff --git a/Mau/Deck.cs b/MauMau-Server/Mau/Deck.cs
similarity index 100%
rename from Mau/Deck.cs
rename to MauMau-Server/Mau/Deck.cs
diff --git a/Mau/Game.cs b/MauMau-Server/Mau/Game.cs
similarity index 100%
rename from Mau/Game.cs
rename to MauMau-Server/Mau/Game.cs
diff --git a/Mau/GameState.cs b/MauMau-Server/Mau/GameState.cs
similarity index 100%
rename from Mau/GameState.cs
rename to MauMau-Server/Mau/GameState.cs
diff --git a/Mau/Player.cs b/MauMau-Server/Mau/Player.cs
similarity index 100%
rename from Mau/Player.cs
rename to MauMau-Server/Mau/Player.cs
diff --git a/MauMau-Server.csproj b/MauMau-Server/MauMau-Server.csproj
similarity index 78%
rename from MauMau-Server.csproj
rename to MauMau-Server/MauMau-Server.csproj
index 5ad5ad4..476e59d 100644
--- a/MauMau-Server.csproj
+++ b/MauMau-Server/MauMau-Server.csproj
@@ -4,9 +4,6 @@
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>MauMau_Server</RootNamespace>
-    <AssemblyName>MauMau_Server</AssemblyName>
-    <OutputPath>out\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Program.cs b/MauMau-Server/Program.cs
similarity index 100%
rename from Program.cs
rename to MauMau-Server/Program.cs
diff --git a/Websockets/Room.cs b/MauMau-Server/Websockets/Room.cs
similarity index 100%
rename from Websockets/Room.cs
rename to MauMau-Server/Websockets/Room.cs
diff --git a/Websockets/RoomManager.cs b/MauMau-Server/Websockets/RoomManager.cs
similarity index 100%
rename from Websockets/RoomManager.cs
rename to MauMau-Server/Websockets/RoomManager.cs
diff --git a/appsettings.Development.json b/MauMau-Server/appsettings.Development.json
similarity index 100%
rename from appsettings.Development.json
rename to MauMau-Server/appsettings.Development.json
diff --git a/appsettings.json b/MauMau-Server/appsettings.json
similarity index 100%
rename from appsettings.json
rename to MauMau-Server/appsettings.json