diff --git a/src/WindreamHub.Legacy.Client/Models/SystemDetails.cs b/src/WindreamHub.Legacy.Client/Models/SystemDetails/SystemDetails.cs
similarity index 80%
rename from src/WindreamHub.Legacy.Client/Models/SystemDetails.cs
rename to src/WindreamHub.Legacy.Client/Models/SystemDetails/SystemDetails.cs
index b1ab43b..af8f525 100644
--- a/src/WindreamHub.Legacy.Client/Models/SystemDetails.cs
+++ b/src/WindreamHub.Legacy.Client/Models/SystemDetails/SystemDetails.cs
@@ -1,4 +1,4 @@
-namespace WindreamHub.Legacy.Client.Models
+namespace WindreamHub.Legacy.Client.Models.SystemDetails
 {
     public class SystemDetails
     {
diff --git a/src/WindreamHub.Legacy.Client/Models/SystemDetailsResponse.cs b/src/WindreamHub.Legacy.Client/Models/SystemDetails/SystemDetailsResponse.cs
similarity index 79%
rename from src/WindreamHub.Legacy.Client/Models/SystemDetailsResponse.cs
rename to src/WindreamHub.Legacy.Client/Models/SystemDetails/SystemDetailsResponse.cs
index 7a52949..f7d0d3c 100644
--- a/src/WindreamHub.Legacy.Client/Models/SystemDetailsResponse.cs
+++ b/src/WindreamHub.Legacy.Client/Models/SystemDetails/SystemDetailsResponse.cs
@@ -1,4 +1,4 @@
-namespace WindreamHub.Legacy.Client.Models
+namespace WindreamHub.Legacy.Client.Models.SystemDetails
 {
     public class SystemDetailsResponse
     {
diff --git a/src/WindreamHub.Legacy.Client/Routes/SystemDetailsRouteService.cs b/src/WindreamHub.Legacy.Client/Routes/SystemDetailsRouteService.cs
index 3aafcb1..fde310f 100644
--- a/src/WindreamHub.Legacy.Client/Routes/SystemDetailsRouteService.cs
+++ b/src/WindreamHub.Legacy.Client/Routes/SystemDetailsRouteService.cs
@@ -4,6 +4,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using WindreamHub.Legacy.Client.Models;
+using WindreamHub.Legacy.Client.Models.SystemDetails;
 using WindreamHub.Legacy.Client.Routes;
 
 namespace WindreamHub.Legacy.Client.Route
diff --git a/src/WindreamHub.Legacy.Client/WindreamHub.Legacy.Client.csproj b/src/WindreamHub.Legacy.Client/WindreamHub.Legacy.Client.csproj
index 6950b58..4326fe6 100644
--- a/src/WindreamHub.Legacy.Client/WindreamHub.Legacy.Client.csproj
+++ b/src/WindreamHub.Legacy.Client/WindreamHub.Legacy.Client.csproj
@@ -90,8 +90,8 @@
     <Compile Include="Models\Authentication\Base64Credential.cs" />
     <Compile Include="Models\ModelExtensions.cs" />
     <Compile Include="Models\SimplifiedResponse.cs" />
-    <Compile Include="Models\SystemDetails.cs" />
-    <Compile Include="Models\SystemDetailsResponse.cs" />
+    <Compile Include="Models\SystemDetails\SystemDetails.cs" />
+    <Compile Include="Models\SystemDetails\SystemDetailsResponse.cs" />
     <Compile Include="Models\Authentication\UserCredential.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Routes\DocumentsRouteService.cs" />