diff --git a/MauMau-Server/Controllers/MauController.cs b/Controllers/MauController.cs
similarity index 100%
rename from MauMau-Server/Controllers/MauController.cs
rename to Controllers/MauController.cs
diff --git a/MauMau-Server/Controllers/RoomController.cs b/Controllers/RoomController.cs
similarity index 100%
rename from MauMau-Server/Controllers/RoomController.cs
rename to Controllers/RoomController.cs
diff --git a/Dockerfile b/Dockerfile
index 2f1609f..d0e1df6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
-COPY ["MauMau-Server/MauMau-Server.csproj", "MauMau-Server/"]
-RUN dotnet restore "MauMau-Server/MauMau-Server.csproj"
+COPY ["MauMau-Server.csproj", "./"]
+RUN dotnet restore "MauMau-Server.csproj"
 COPY . .
-WORKDIR "/src/MauMau-Server"
+WORKDIR "/src"
 RUN dotnet build "MauMau-Server.csproj" -c Release -o /app/build
 
 FROM build AS publish
diff --git a/MauMau-Server/Mau/Card.cs b/Mau/Card.cs
similarity index 100%
rename from MauMau-Server/Mau/Card.cs
rename to Mau/Card.cs
diff --git a/MauMau-Server/Mau/CardDTO.cs b/Mau/CardDTO.cs
similarity index 100%
rename from MauMau-Server/Mau/CardDTO.cs
rename to Mau/CardDTO.cs
diff --git a/MauMau-Server/Mau/Deck.cs b/Mau/Deck.cs
similarity index 100%
rename from MauMau-Server/Mau/Deck.cs
rename to Mau/Deck.cs
diff --git a/MauMau-Server/Mau/Game.cs b/Mau/Game.cs
similarity index 100%
rename from MauMau-Server/Mau/Game.cs
rename to Mau/Game.cs
diff --git a/MauMau-Server/Mau/GameState.cs b/Mau/GameState.cs
similarity index 100%
rename from MauMau-Server/Mau/GameState.cs
rename to Mau/GameState.cs
diff --git a/MauMau-Server/Mau/Player.cs b/Mau/Player.cs
similarity index 100%
rename from MauMau-Server/Mau/Player.cs
rename to Mau/Player.cs
diff --git a/MauMau-Server/MauMau-Server.csproj b/MauMau-Server.csproj
similarity index 100%
rename from MauMau-Server/MauMau-Server.csproj
rename to MauMau-Server.csproj
diff --git a/MauMau-Server/Program.cs b/Program.cs
similarity index 100%
rename from MauMau-Server/Program.cs
rename to Program.cs
diff --git a/MauMau-Server/Websockets/Room.cs b/Websockets/Room.cs
similarity index 100%
rename from MauMau-Server/Websockets/Room.cs
rename to Websockets/Room.cs
diff --git a/MauMau-Server/Websockets/RoomManager.cs b/Websockets/RoomManager.cs
similarity index 100%
rename from MauMau-Server/Websockets/RoomManager.cs
rename to Websockets/RoomManager.cs
diff --git a/MauMau-Server/appsettings.Development.json b/appsettings.Development.json
similarity index 100%
rename from MauMau-Server/appsettings.Development.json
rename to appsettings.Development.json
diff --git a/MauMau-Server/appsettings.json b/appsettings.json
similarity index 100%
rename from MauMau-Server/appsettings.json
rename to appsettings.json