diff --git a/NetworkResurrector.sln b/NetworkResurrector.sln
index 10af40e..6fa5fd3 100644
--- a/NetworkResurrector.sln
+++ b/NetworkResurrector.sln
@@ -33,13 +33,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{6889D3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{43C78941-52E6-4AB8-9170-CC7C006E4784}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api", "NetworkResurrector.Agent\NetworkResurrector.Api.csproj", "{E10CEE53-8167-446F-BFF3-B80725BB6C90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api", "src\api\NetworkResurrector.Api\NetworkResurrector.Api.csproj", "{E10CEE53-8167-446F-BFF3-B80725BB6C90}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Application", "NetworkResurrector.Agent.Application\NetworkResurrector.Api.Application.csproj", "{EE31B126-12EC-46B3-8FB4-AD5BCF14C029}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Application", "src\api\NetworkResurrector.Api.Application\NetworkResurrector.Api.Application.csproj", "{EE31B126-12EC-46B3-8FB4-AD5BCF14C029}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain", "NetworkResurrector.Agent.Domain\NetworkResurrector.Api.Domain.csproj", "{885D5625-028A-4B35-8C89-7EF718BC6E34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain", "src\api\NetworkResurrector.Api.Domain\NetworkResurrector.Api.Domain.csproj", "{885D5625-028A-4B35-8C89-7EF718BC6E34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain.Data", "NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj", "{509767A7-D11C-4143-8D45-01E62DFC2C74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain.Data", "src\api\NetworkResurrector.Api.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj", "{509767A7-D11C-4143-8D45-01E62DFC2C74}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs b/src/api/NetworkResurrector.Api.Application/DependencyInjectionExtensions.cs
similarity index 100%
rename from NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs
rename to src/api/NetworkResurrector.Api.Application/DependencyInjectionExtensions.cs
diff --git a/NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs b/src/api/NetworkResurrector.Api.Application/Mappings/MappingProfile.cs
similarity index 100%
rename from NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs
rename to src/api/NetworkResurrector.Api.Application/Mappings/MappingProfile.cs
diff --git a/NetworkResurrector.Agent.Application/NetworkResurrector.Api.Application.csproj b/src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj
similarity index 89%
rename from NetworkResurrector.Agent.Application/NetworkResurrector.Api.Application.csproj
rename to src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj
index 07117d3..2407059 100644
--- a/NetworkResurrector.Agent.Application/NetworkResurrector.Api.Application.csproj
+++ b/src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj
@@ -14,6 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Api.Domain.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Api.Domain\NetworkResurrector.Api.Domain.csproj" />
   </ItemGroup>
 </Project>
diff --git a/NetworkResurrector.Agent.Application/Queries/GetMachines.cs b/src/api/NetworkResurrector.Api.Application/Queries/GetMachines.cs
similarity index 100%
rename from NetworkResurrector.Agent.Application/Queries/GetMachines.cs
rename to src/api/NetworkResurrector.Api.Application/Queries/GetMachines.cs
diff --git a/NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs b/src/api/NetworkResurrector.Api.Domain.Data/DbContexts/AgentDbContext.cs
similarity index 100%
rename from NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs
rename to src/api/NetworkResurrector.Api.Domain.Data/DbContexts/AgentDbContext.cs
diff --git a/NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs b/src/api/NetworkResurrector.Api.Domain.Data/DependencyInjectionExtensions.cs
similarity index 100%
rename from NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs
rename to src/api/NetworkResurrector.Api.Domain.Data/DependencyInjectionExtensions.cs
diff --git a/NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs b/src/api/NetworkResurrector.Api.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
similarity index 100%
rename from NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
rename to src/api/NetworkResurrector.Api.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
diff --git a/NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj b/src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
similarity index 74%
rename from NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
rename to src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
index 5429189..95c5f5c 100644
--- a/NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
+++ b/src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Api.Domain.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Api.Domain\NetworkResurrector.Api.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs b/src/api/NetworkResurrector.Api.Domain.Data/Repositories/AgentRepository.cs
similarity index 100%
rename from NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs
rename to src/api/NetworkResurrector.Api.Domain.Data/Repositories/AgentRepository.cs
diff --git a/NetworkResurrector.Agent.Domain.Data/Scripts/001.Machine table.sql b/src/api/NetworkResurrector.Api.Domain.Data/Scripts/001.Machine table.sql
similarity index 100%
rename from NetworkResurrector.Agent.Domain.Data/Scripts/001.Machine table.sql
rename to src/api/NetworkResurrector.Api.Domain.Data/Scripts/001.Machine table.sql
diff --git a/NetworkResurrector.Agent.Domain/Entities/Machine.cs b/src/api/NetworkResurrector.Api.Domain/Entities/Machine.cs
similarity index 100%
rename from NetworkResurrector.Agent.Domain/Entities/Machine.cs
rename to src/api/NetworkResurrector.Api.Domain/Entities/Machine.cs
diff --git a/NetworkResurrector.Agent.Domain/NetworkResurrector.Api.Domain.csproj b/src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj
similarity index 100%
rename from NetworkResurrector.Agent.Domain/NetworkResurrector.Api.Domain.csproj
rename to src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj
diff --git a/NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs b/src/api/NetworkResurrector.Api.Domain/Repositories/IAgentRepository.cs
similarity index 100%
rename from NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs
rename to src/api/NetworkResurrector.Api.Domain/Repositories/IAgentRepository.cs
diff --git a/NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs b/src/api/NetworkResurrector.Api/Controllers/ResurrectorAgentController.cs
similarity index 100%
rename from NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs
rename to src/api/NetworkResurrector.Api/Controllers/ResurrectorAgentController.cs
diff --git a/NetworkResurrector.Agent/Dockerfile b/src/api/NetworkResurrector.Api/Dockerfile
similarity index 100%
rename from NetworkResurrector.Agent/Dockerfile
rename to src/api/NetworkResurrector.Api/Dockerfile
diff --git a/NetworkResurrector.Agent/NetworkResurrector.Api.csproj b/src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj
similarity index 88%
rename from NetworkResurrector.Agent/NetworkResurrector.Api.csproj
rename to src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj
index e9c582f..eadafe9 100644
--- a/NetworkResurrector.Agent/NetworkResurrector.Api.csproj
+++ b/src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Agent.Application\NetworkResurrector.Api.Application.csproj" />
-    <ProjectReference Include="..\NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Api.Application\NetworkResurrector.Api.Application.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Api.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NetworkResurrector.Agent/Program.cs b/src/api/NetworkResurrector.Api/Program.cs
similarity index 100%
rename from NetworkResurrector.Agent/Program.cs
rename to src/api/NetworkResurrector.Api/Program.cs
diff --git a/NetworkResurrector.Agent/Properties/launchSettings.json b/src/api/NetworkResurrector.Api/Properties/launchSettings.json
similarity index 100%
rename from NetworkResurrector.Agent/Properties/launchSettings.json
rename to src/api/NetworkResurrector.Api/Properties/launchSettings.json
diff --git a/NetworkResurrector.Agent/Startup.cs b/src/api/NetworkResurrector.Api/Startup.cs
similarity index 100%
rename from NetworkResurrector.Agent/Startup.cs
rename to src/api/NetworkResurrector.Api/Startup.cs
diff --git a/NetworkResurrector.Agent/appsettings.Development.json b/src/api/NetworkResurrector.Api/appsettings.Development.json
similarity index 100%
rename from NetworkResurrector.Agent/appsettings.Development.json
rename to src/api/NetworkResurrector.Api/appsettings.Development.json
diff --git a/NetworkResurrector.Agent/appsettings.json b/src/api/NetworkResurrector.Api/appsettings.json
similarity index 100%
rename from NetworkResurrector.Agent/appsettings.json
rename to src/api/NetworkResurrector.Api/appsettings.json