diff --git a/code/Dockerfile b/code/Dockerfile
index 62ce16a..4c88fa7 100644
--- a/code/Dockerfile
+++ b/code/Dockerfile
@@ -1,5 +1,5 @@
 FROM mcr.microsoft.com/dotnet/sdk:6.0
 
-CMD dotnet run --project /server/Server.csproj
+CMD dotnet run --project /server/Server/Server.csproj
 
 EXPOSE 3131
diff --git a/code/server/Server.sln b/code/server/Server.sln
index fac3ecc..5bbce65 100644
--- a/code/server/Server.sln
+++ b/code/server/Server.sln
@@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32526.322
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{356E6AA3-C180-4309-ACCE-C6E66B4DF441}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataBase", "DataBase\DataBase.csproj", "{240EEEA0-7EFB-4919-A5C9-584DC6505C58}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataBase", "DataBase\DataBase.csproj", "{240EEEA0-7EFB-4919-A5C9-584DC6505C58}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{95CCBA12-CAB4-4574-A91C-77844E5C2C10}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,18 +13,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{356E6AA3-C180-4309-ACCE-C6E66B4DF441}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D3CF318-8453-4D0C-B11D-2A6B7E44AA47}.Release|Any CPU.Build.0 = Release|Any CPU
 		{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{240EEEA0-7EFB-4919-A5C9-584DC6505C58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95CCBA12-CAB4-4574-A91C-77844E5C2C10}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/code/server/Program.cs b/code/server/Server/Program.cs
similarity index 87%
rename from code/server/Program.cs
rename to code/server/Server/Program.cs
index 6cba3f6..0cd847f 100644
--- a/code/server/Program.cs
+++ b/code/server/Server/Program.cs
@@ -13,7 +13,7 @@ class Program
 
     static void StartServer()
     {
-        IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse("192.168.41.58"), 3131);
+        IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 3131);
         UdpClient server = new UdpClient(endPoint);
         Console.WriteLine("Server started, waiting for clients to connect...");
 
diff --git a/code/server/Server.csproj b/code/server/Server/Server.csproj
similarity index 100%
rename from code/server/Server.csproj
rename to code/server/Server/Server.csproj
diff --git a/code/server/server.metadata.v2 b/code/server/server.metadata.v2
deleted file mode 100644
index 161671f..0000000
Binary files a/code/server/server.metadata.v2 and /dev/null differ
diff --git a/code/server/server.projects.v2 b/code/server/server.projects.v2
deleted file mode 100644
index 6d697ea..0000000
Binary files a/code/server/server.projects.v2 and /dev/null differ