diff --git a/NetworkResurrector.Abstractions/INotifier.cs b/NetworkResurrector.Server.Abstractions/INotifier.cs
similarity index 100%
rename from NetworkResurrector.Abstractions/INotifier.cs
rename to NetworkResurrector.Server.Abstractions/INotifier.cs
diff --git a/NetworkResurrector.Abstractions/IWakeOnLanService.cs b/NetworkResurrector.Server.Abstractions/IWakeOnLanService.cs
similarity index 100%
rename from NetworkResurrector.Abstractions/IWakeOnLanService.cs
rename to NetworkResurrector.Server.Abstractions/IWakeOnLanService.cs
diff --git a/NetworkResurrector.Abstractions/NetworkResurrector.Server.Abstractions.csproj b/NetworkResurrector.Server.Abstractions/NetworkResurrector.Server.Abstractions.csproj
similarity index 100%
rename from NetworkResurrector.Abstractions/NetworkResurrector.Server.Abstractions.csproj
rename to NetworkResurrector.Server.Abstractions/NetworkResurrector.Server.Abstractions.csproj
diff --git a/NetworkResurrector.Application/CommandHandlers/PingMachineHandler.cs b/NetworkResurrector.Server.Application/CommandHandlers/PingMachineHandler.cs
similarity index 100%
rename from NetworkResurrector.Application/CommandHandlers/PingMachineHandler.cs
rename to NetworkResurrector.Server.Application/CommandHandlers/PingMachineHandler.cs
diff --git a/NetworkResurrector.Application/CommandHandlers/ShutdownMachineHandler.cs b/NetworkResurrector.Server.Application/CommandHandlers/ShutdownMachineHandler.cs
similarity index 100%
rename from NetworkResurrector.Application/CommandHandlers/ShutdownMachineHandler.cs
rename to NetworkResurrector.Server.Application/CommandHandlers/ShutdownMachineHandler.cs
diff --git a/NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs b/NetworkResurrector.Server.Application/CommandHandlers/WakeMachineHandler.cs
similarity index 100%
rename from NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs
rename to NetworkResurrector.Server.Application/CommandHandlers/WakeMachineHandler.cs
diff --git a/NetworkResurrector.Application/Commands/PingMachine.cs b/NetworkResurrector.Server.Application/Commands/PingMachine.cs
similarity index 100%
rename from NetworkResurrector.Application/Commands/PingMachine.cs
rename to NetworkResurrector.Server.Application/Commands/PingMachine.cs
diff --git a/NetworkResurrector.Application/Commands/ShutdownMachine.cs b/NetworkResurrector.Server.Application/Commands/ShutdownMachine.cs
similarity index 100%
rename from NetworkResurrector.Application/Commands/ShutdownMachine.cs
rename to NetworkResurrector.Server.Application/Commands/ShutdownMachine.cs
diff --git a/NetworkResurrector.Application/Commands/WakeMachine.cs b/NetworkResurrector.Server.Application/Commands/WakeMachine.cs
similarity index 100%
rename from NetworkResurrector.Application/Commands/WakeMachine.cs
rename to NetworkResurrector.Server.Application/Commands/WakeMachine.cs
diff --git a/NetworkResurrector.Application/DependencyInjectionExtensions.cs b/NetworkResurrector.Server.Application/DependencyInjectionExtensions.cs
similarity index 100%
rename from NetworkResurrector.Application/DependencyInjectionExtensions.cs
rename to NetworkResurrector.Server.Application/DependencyInjectionExtensions.cs
diff --git a/NetworkResurrector.Application/Events/MachinePinged.cs b/NetworkResurrector.Server.Application/Events/MachinePinged.cs
similarity index 100%
rename from NetworkResurrector.Application/Events/MachinePinged.cs
rename to NetworkResurrector.Server.Application/Events/MachinePinged.cs
diff --git a/NetworkResurrector.Application/Events/MachineShutdown.cs b/NetworkResurrector.Server.Application/Events/MachineShutdown.cs
similarity index 100%
rename from NetworkResurrector.Application/Events/MachineShutdown.cs
rename to NetworkResurrector.Server.Application/Events/MachineShutdown.cs
diff --git a/NetworkResurrector.Application/Events/MachineWaked.cs b/NetworkResurrector.Server.Application/Events/MachineWaked.cs
similarity index 100%
rename from NetworkResurrector.Application/Events/MachineWaked.cs
rename to NetworkResurrector.Server.Application/Events/MachineWaked.cs
diff --git a/NetworkResurrector.Application/Mappings/MappingProfile.cs b/NetworkResurrector.Server.Application/Mappings/MappingProfile.cs
similarity index 100%
rename from NetworkResurrector.Application/Mappings/MappingProfile.cs
rename to NetworkResurrector.Server.Application/Mappings/MappingProfile.cs
diff --git a/NetworkResurrector.Application/NetworkResurrector.Server.Application.csproj b/NetworkResurrector.Server.Application/NetworkResurrector.Server.Application.csproj
similarity index 81%
rename from NetworkResurrector.Application/NetworkResurrector.Server.Application.csproj
rename to NetworkResurrector.Server.Application/NetworkResurrector.Server.Application.csproj
index 4f968aa..509a5bc 100644
--- a/NetworkResurrector.Application/NetworkResurrector.Server.Application.csproj
+++ b/NetworkResurrector.Server.Application/NetworkResurrector.Server.Application.csproj
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
-    <ProjectReference Include="..\NetworkResurrector.Domain\NetworkResurrector.Server.Domain.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Server.Domain\NetworkResurrector.Server.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NetworkResurrector.Application/Queries/GetServiceVersion.cs b/NetworkResurrector.Server.Application/Queries/GetServiceVersion.cs
similarity index 100%
rename from NetworkResurrector.Application/Queries/GetServiceVersion.cs
rename to NetworkResurrector.Server.Application/Queries/GetServiceVersion.cs
diff --git a/NetworkResurrector.Application/Services/IPingService.cs b/NetworkResurrector.Server.Application/Services/IPingService.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/IPingService.cs
rename to NetworkResurrector.Server.Application/Services/IPingService.cs
diff --git a/NetworkResurrector.Application/Services/IShutdownService.cs b/NetworkResurrector.Server.Application/Services/IShutdownService.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/IShutdownService.cs
rename to NetworkResurrector.Server.Application/Services/IShutdownService.cs
diff --git a/NetworkResurrector.Application/Services/IValidationService.cs b/NetworkResurrector.Server.Application/Services/IValidationService.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/IValidationService.cs
rename to NetworkResurrector.Server.Application/Services/IValidationService.cs
diff --git a/NetworkResurrector.Application/Services/ParamProvider.cs b/NetworkResurrector.Server.Application/Services/ParamProvider.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/ParamProvider.cs
rename to NetworkResurrector.Server.Application/Services/ParamProvider.cs
diff --git a/NetworkResurrector.Application/Services/PingService.cs b/NetworkResurrector.Server.Application/Services/PingService.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/PingService.cs
rename to NetworkResurrector.Server.Application/Services/PingService.cs
diff --git a/NetworkResurrector.Application/Services/ShutdownService.cs b/NetworkResurrector.Server.Application/Services/ShutdownService.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/ShutdownService.cs
rename to NetworkResurrector.Server.Application/Services/ShutdownService.cs
diff --git a/NetworkResurrector.Application/Services/ValidationService.cs b/NetworkResurrector.Server.Application/Services/ValidationService.cs
similarity index 100%
rename from NetworkResurrector.Application/Services/ValidationService.cs
rename to NetworkResurrector.Server.Application/Services/ValidationService.cs
diff --git a/NetworkResurrector.Application/Stores/ISecurityStore.cs b/NetworkResurrector.Server.Application/Stores/ISecurityStore.cs
similarity index 100%
rename from NetworkResurrector.Application/Stores/ISecurityStore.cs
rename to NetworkResurrector.Server.Application/Stores/ISecurityStore.cs
diff --git a/NetworkResurrector.Application/Stores/SecurityStore.cs b/NetworkResurrector.Server.Application/Stores/SecurityStore.cs
similarity index 100%
rename from NetworkResurrector.Application/Stores/SecurityStore.cs
rename to NetworkResurrector.Server.Application/Stores/SecurityStore.cs
diff --git a/NetworkResurrector.Domain/Models/SecurityToken.cs b/NetworkResurrector.Server.Domain/Models/SecurityToken.cs
similarity index 100%
rename from NetworkResurrector.Domain/Models/SecurityToken.cs
rename to NetworkResurrector.Server.Domain/Models/SecurityToken.cs
diff --git a/NetworkResurrector.Domain/Models/Settings/Credentials.cs b/NetworkResurrector.Server.Domain/Models/Settings/Credentials.cs
similarity index 100%
rename from NetworkResurrector.Domain/Models/Settings/Credentials.cs
rename to NetworkResurrector.Server.Domain/Models/Settings/Credentials.cs
diff --git a/NetworkResurrector.Domain/Models/TokenValidation.cs b/NetworkResurrector.Server.Domain/Models/TokenValidation.cs
similarity index 100%
rename from NetworkResurrector.Domain/Models/TokenValidation.cs
rename to NetworkResurrector.Server.Domain/Models/TokenValidation.cs
diff --git a/NetworkResurrector.Domain/NetworkResurrector.Server.Domain.csproj b/NetworkResurrector.Server.Domain/NetworkResurrector.Server.Domain.csproj
similarity index 100%
rename from NetworkResurrector.Domain/NetworkResurrector.Server.Domain.csproj
rename to NetworkResurrector.Server.Domain/NetworkResurrector.Server.Domain.csproj
diff --git a/NetworkResurrector.Domain/Services/IParamProvider.cs b/NetworkResurrector.Server.Domain/Services/IParamProvider.cs
similarity index 100%
rename from NetworkResurrector.Domain/Services/IParamProvider.cs
rename to NetworkResurrector.Server.Domain/Services/IParamProvider.cs
diff --git a/NetworkResurrector.Api/Controllers/ResurrectorController.cs b/NetworkResurrector.Server/Controllers/ResurrectorController.cs
similarity index 100%
rename from NetworkResurrector.Api/Controllers/ResurrectorController.cs
rename to NetworkResurrector.Server/Controllers/ResurrectorController.cs
diff --git a/NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs b/NetworkResurrector.Server/Extensions/WakeOnLanExtensions.cs
similarity index 100%
rename from NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs
rename to NetworkResurrector.Server/Extensions/WakeOnLanExtensions.cs
diff --git a/NetworkResurrector.Api/NetworkResurrector.Server.csproj b/NetworkResurrector.Server/NetworkResurrector.Server.csproj
similarity index 94%
rename from NetworkResurrector.Api/NetworkResurrector.Server.csproj
rename to NetworkResurrector.Server/NetworkResurrector.Server.csproj
index 3bb70b4..a8a0442 100644
--- a/NetworkResurrector.Api/NetworkResurrector.Server.csproj
+++ b/NetworkResurrector.Server/NetworkResurrector.Server.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Application\NetworkResurrector.Server.Application.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Server.Application\NetworkResurrector.Server.Application.csproj" />
     <ProjectReference Include="..\NetworkResurrector.WakeOnLan.Inhouse\NetworkResurrector.WakeOnLan.Inhouse.csproj" />
     <ProjectReference Include="..\NetworkResurrector.WakeOnLan.Nikeee\NetworkResurrector.WakeOnLan.Nikeee.csproj" />
   </ItemGroup>
diff --git a/NetworkResurrector.Api/Program.cs b/NetworkResurrector.Server/Program.cs
similarity index 100%
rename from NetworkResurrector.Api/Program.cs
rename to NetworkResurrector.Server/Program.cs
diff --git a/NetworkResurrector.Api/Properties/launchSettings.json b/NetworkResurrector.Server/Properties/launchSettings.json
similarity index 100%
rename from NetworkResurrector.Api/Properties/launchSettings.json
rename to NetworkResurrector.Server/Properties/launchSettings.json
diff --git a/NetworkResurrector.Api/Startup.cs b/NetworkResurrector.Server/Startup.cs
similarity index 100%
rename from NetworkResurrector.Api/Startup.cs
rename to NetworkResurrector.Server/Startup.cs
diff --git a/NetworkResurrector.Api/appsettings.Development.json b/NetworkResurrector.Server/appsettings.Development.json
similarity index 100%
rename from NetworkResurrector.Api/appsettings.Development.json
rename to NetworkResurrector.Server/appsettings.Development.json
diff --git a/NetworkResurrector.Api/appsettings.json b/NetworkResurrector.Server/appsettings.json
similarity index 100%
rename from NetworkResurrector.Api/appsettings.json
rename to NetworkResurrector.Server/appsettings.json
diff --git a/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj b/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj
index e52cbed..1ed583d 100644
--- a/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj
+++ b/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj
@@ -8,9 +8,9 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
   </ItemGroup>
   
 </Project>
diff --git a/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj b/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj
index 7c9bca7..aaec578 100644
--- a/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj
+++ b/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NetworkResurrector.sln b/NetworkResurrector.sln
index cc6d8f2..af1233b 100644
--- a/NetworkResurrector.sln
+++ b/NetworkResurrector.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30002.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server", "NetworkResurrector.Api\NetworkResurrector.Server.csproj", "{F6600491-5D79-4548-8745-59D9D337D3DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server", "NetworkResurrector.Server\NetworkResurrector.Server.csproj", "{F6600491-5D79-4548-8745-59D9D337D3DB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FDDE879C-E0A3-4BF1-945F-7FEA324C8EBA}"
 	ProjectSection(SolutionItems) = preProject
@@ -17,11 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		ReleaseNotes.xml = ReleaseNotes.xml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Application", "NetworkResurrector.Application\NetworkResurrector.Server.Application.csproj", "{15D65D65-CC96-45DE-8590-AF9132889D98}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Application", "NetworkResurrector.Server.Application\NetworkResurrector.Server.Application.csproj", "{15D65D65-CC96-45DE-8590-AF9132889D98}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Domain", "NetworkResurrector.Domain\NetworkResurrector.Server.Domain.csproj", "{EC78E88E-22DC-4FFD-881E-DEECF0D2494E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Domain", "NetworkResurrector.Server.Domain\NetworkResurrector.Server.Domain.csproj", "{EC78E88E-22DC-4FFD-881E-DEECF0D2494E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Abstractions", "NetworkResurrector.Abstractions\NetworkResurrector.Server.Abstractions.csproj", "{B7408385-ED73-4ED3-9654-9AFF8CDFDA8D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Abstractions", "NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj", "{B7408385-ED73-4ED3-9654-9AFF8CDFDA8D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.WakeOnLan.Nikeee", "NetworkResurrector.WakeOnLan.Nikeee\NetworkResurrector.WakeOnLan.Nikeee.csproj", "{59049C2B-CEFB-456D-B3D5-D2CF5325AEEB}"
 EndProject