diff --git a/Wonky.Client/Components/ActivityButton.razor b/Wonky.Client/Components/ActivityButton.razor
index 1a1e1d5f..418a2623 100644
--- a/Wonky.Client/Components/ActivityButton.razor
+++ b/Wonky.Client/Components/ActivityButton.razor
@@ -21,17 +21,3 @@ else
 {
     <a type="button" class="btn btn-outline-secondary disabled" aria-disabled="true">@ButtonText</a>
 }
-
-@code {
-    [Parameter]public string CompanyId { get; set; } = "";
-    [Parameter] public int Enabled { get; set; }
-    [Parameter] public string ButtonType { get; set; } = "primary";
-    [Parameter] public string ButtonText { get; set; } = "Tag Mig";
-    [Parameter] public string ActionLink { get; set; } = "#";
-
-    protected override void OnParametersSet()
-    {
-        if (!string.IsNullOrWhiteSpace(CompanyId))
-            ActionLink = ActionLink.Replace("$ID$", CompanyId);
-    }
-}
\ No newline at end of file
diff --git a/Wonky.Client/Components/ActivityButton.razor.cs b/Wonky.Client/Components/ActivityButton.razor.cs
new file mode 100644
index 00000000..6ff76580
--- /dev/null
+++ b/Wonky.Client/Components/ActivityButton.razor.cs
@@ -0,0 +1,34 @@
+//    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using Microsoft.AspNetCore.Components;
+
+namespace Wonky.Client.Components;
+
+public partial class ActivityButton
+{
+    [Parameter]public string CompanyId { get; set; } = "";
+    [Parameter] public int Enabled { get; set; }
+    [Parameter] public string ButtonType { get; set; } = "primary";
+    [Parameter] public string ButtonText { get; set; } = "Tag Mig";
+    [Parameter] public string ActionLink { get; set; } = "#";
+
+    
+    protected override void OnParametersSet()
+    {
+        if (!string.IsNullOrWhiteSpace(CompanyId))
+            ActionLink = ActionLink.Replace("$ID$", CompanyId);
+    }    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor
index 62d0eff3..df085f2c 100644
--- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor
+++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor
@@ -1,3 +1,4 @@
+@using Wonky.Client.Local.Services
 @*    Copyright (C) 2022 FCS Frede's Computer Services.
 //    This program is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU Affero General Public License as
@@ -13,30 +14,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 *@
 
-@using Wonky.Client.Services
-
 <div class="input-group">
     <label class="col-form-label me-2" for="kmMorning">KmStart</label>
     <input type="number" id="kmMorning" class="form-control" 
            @bind-Value="KmMorning" @bind-Value:event="oninput" @onchange="OnKmChanged"/>
 </div>
-
-@code {
-    #pragma warning disable CS8618
-    
-    [Inject] public UserPreferenceService PreferenceService { get; set; }
-    private int KmMorning { get; set; }
-    private UserPreference Preferences { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        Preferences = await PreferenceService.GetProfile();
-        KmMorning = Preferences.KmMorning;
-    }
-
-    private async Task OnKmChanged()
-    {
-        await PreferenceService.SetKmMorning(KmMorning);
-    }
-
-}
\ No newline at end of file
diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor.cs b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor.cs
new file mode 100644
index 00000000..aabee7b0
--- /dev/null
+++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor.cs
@@ -0,0 +1,39 @@
+//    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using Microsoft.AspNetCore.Components;
+using Wonky.Client.Local.Services;
+
+#pragma warning disable CS8618
+
+namespace Wonky.Client.Components;
+
+public partial class AdvisorActivityKmStartComponent
+{
+    [Inject] public UserPreferenceService PreferenceService { get; set; }
+    private int KmMorning { get; set; }
+    private UserPreference Preferences { get; set; } = new();
+
+    protected override async Task OnInitializedAsync()
+    {
+        Preferences = await PreferenceService.GetProfile();
+        KmMorning = Preferences.KmMorning;
+    }
+
+    private async Task OnKmChanged()
+    {
+        await PreferenceService.SetKmMorning(KmMorning);
+    }    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs
index 97025e6e..b8f315d7 100644
--- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs
+++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs
@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using Wonky.Client.Helpers;
 using Wonky.Client.Pages;
-using Wonky.Client.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs
index c2200adf..101b4f00 100644
--- a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs
+++ b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.VisualBasic;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Models;
diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs
index 96240371..efd79f2d 100644
--- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs
@@ -15,7 +15,8 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/Components/CatalogSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs
index 5a9141e6..00b7d386 100644
--- a/Wonky.Client/Components/CatalogSearchComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogSearchComponent.razor.cs
@@ -14,7 +14,8 @@
 //
 
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/Components/CatalogSortComponent.razor.cs b/Wonky.Client/Components/CatalogSortComponent.razor.cs
index b1d38edf..d449290a 100644
--- a/Wonky.Client/Components/CatalogSortComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogSortComponent.razor.cs
@@ -14,7 +14,8 @@
 //
 
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs
index b73a75be..a9e67ca9 100644
--- a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs
@@ -16,7 +16,8 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs
index b534e53c..ea5381f0 100644
--- a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs
@@ -15,7 +15,7 @@
 
 using System.Timers;
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Timer = System.Timers.Timer;
 #pragma warning disable CS8618
 
diff --git a/Wonky.Client/Components/CustomerSortComponent.razor.cs b/Wonky.Client/Components/CustomerSortComponent.razor.cs
index f5a87a5d..10b506b0 100644
--- a/Wonky.Client/Components/CustomerSortComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerSortComponent.razor.cs
@@ -16,7 +16,8 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/Components/DisplayStateComponent.razor b/Wonky.Client/Components/DisplayStateComponent.razor
index 1dd8bdb0..bc2cd7ff 100644
--- a/Wonky.Client/Components/DisplayStateComponent.razor
+++ b/Wonky.Client/Components/DisplayStateComponent.razor
@@ -16,6 +16,3 @@
 
 @* <img class="state the-draw rounded-circle me-1" src="state.png" alt="state"/> *@
 <img class="img-fluid rounded-circle state @StateClass-bg" src="state.png" alt="state"/>
-@code{
-    [Parameter] public string StateClass { get; set; } = "";
-}
diff --git a/Wonky.Client/Components/DisplayStateComponent.razor.cs b/Wonky.Client/Components/DisplayStateComponent.razor.cs
new file mode 100644
index 00000000..3269b6bf
--- /dev/null
+++ b/Wonky.Client/Components/DisplayStateComponent.razor.cs
@@ -0,0 +1,23 @@
+//    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using Microsoft.AspNetCore.Components;
+
+namespace Wonky.Client.Components;
+
+public partial class DisplayStateComponent
+{
+    [Parameter] public string StateClass { get; set; } = "";    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/OfficeActivityListComponent.razor b/Wonky.Client/Components/OfficeActivityListComponent.razor
index e32e3a0b..c21ebf8e 100644
--- a/Wonky.Client/Components/OfficeActivityListComponent.razor
+++ b/Wonky.Client/Components/OfficeActivityListComponent.razor
@@ -82,10 +82,3 @@
     </tr>
     </tbody>
 </table>
-
-@code {
-
-    [Parameter]
-    public List<ReportItemView> Activities { get; set; } = new();
-
-}
\ No newline at end of file
diff --git a/Wonky.Client/Components/OfficeActivityListComponent.razor.cs b/Wonky.Client/Components/OfficeActivityListComponent.razor.cs
new file mode 100644
index 00000000..64a6217d
--- /dev/null
+++ b/Wonky.Client/Components/OfficeActivityListComponent.razor.cs
@@ -0,0 +1,24 @@
+//    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using Microsoft.AspNetCore.Components;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.Components;
+
+public partial class OfficeActivityListComponent
+{
+    [Parameter] public List<ReportItemView> Activities { get; set; } = new();    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor.cs b/Wonky.Client/Components/OfficeLandingComponent.razor.cs
index 6e403531..c9c9acf7 100644
--- a/Wonky.Client/Components/OfficeLandingComponent.razor.cs
+++ b/Wonky.Client/Components/OfficeLandingComponent.razor.cs
@@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.VisualBasic;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Models;
diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs
index e348a39e..a74025a7 100644
--- a/Wonky.Client/Components/PageSizeComponent.razor.cs
+++ b/Wonky.Client/Components/PageSizeComponent.razor.cs
@@ -16,7 +16,8 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/Components/ProcessStateComponent.razor b/Wonky.Client/Components/ProcessStateComponent.razor
index 1a1a5368..7878ea74 100644
--- a/Wonky.Client/Components/ProcessStateComponent.razor
+++ b/Wonky.Client/Components/ProcessStateComponent.razor
@@ -15,23 +15,3 @@
 
 
 <i style="font-size:1.3em;" class="bi-@Icon @StateClass"></i>
-
-@code{
-    [Parameter] public string StateClass { get; set; } = "";
-    private string Icon { get; set; } = "";
-
-    protected override void OnParametersSet()
-    {
-        Icon = StateClass switch
-        {
-            "the-fast" => "lightning-charge",
-            "the-good" => "file-earmark",
-            "the-bad" => "file-earmark-check",
-            "the-ugly" => "box2-fill",
-            "the-dead" => "truck",
-            "accepted" => "printer",
-            _ => "question-square"
-            };
-    }
-
-}
diff --git a/Wonky.Client/Components/ProcessStateComponent.razor.cs b/Wonky.Client/Components/ProcessStateComponent.razor.cs
new file mode 100644
index 00000000..72225438
--- /dev/null
+++ b/Wonky.Client/Components/ProcessStateComponent.razor.cs
@@ -0,0 +1,37 @@
+//    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+using Microsoft.AspNetCore.Components;
+
+namespace Wonky.Client.Components;
+
+public partial class ProcessStateComponent
+{
+    [Parameter] public string StateClass { get; set; } = "";
+    private string Icon { get; set; } = "";
+
+    protected override void OnParametersSet()
+    {
+        Icon = StateClass switch
+        {
+            "the-fast" => "lightning-charge",
+            "the-good" => "file-earmark",
+            "the-bad" => "file-earmark-check",
+            "the-ugly" => "box2-fill",
+            "the-dead" => "truck",
+            "accepted" => "printer",
+            _ => "question-square"
+        };
+    }    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Components/WorkDateComponent.razor b/Wonky.Client/Components/WorkDateComponent.razor
index e43bba03..801c7516 100644
--- a/Wonky.Client/Components/WorkDateComponent.razor
+++ b/Wonky.Client/Components/WorkDateComponent.razor
@@ -15,7 +15,6 @@
 
 
 @using Blazored.LocalStorage
-@using Wonky.Client.Services
 
 <EditForm EditContext="WorkDateContext">
     <div class="container-fluid">
diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs
index bf63e305..44512a32 100644
--- a/Wonky.Client/Components/WorkDateComponent.razor.cs
+++ b/Wonky.Client/Components/WorkDateComponent.razor.cs
@@ -19,7 +19,8 @@ using System.Text.Json;
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Components;
diff --git a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs
index c34059ac..cc341ee6 100644
--- a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs
+++ b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs
@@ -18,9 +18,9 @@ using System.Net.Http.Headers;
 using System.Text.Json;
 using Blazored.LocalStorage;
 using Blazored.Toast.Services;
-using Wonky.Client.Services;
 using Microsoft.AspNetCore.Components;
 using Toolbelt.Blazor;
+using Wonky.Client.Local.Services;
 
 namespace Wonky.Client.HttpInterceptors;
 
diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Local.Services/AuthenticationService.cs
similarity index 99%
rename from Wonky.Client/Services/AuthenticationService.cs
rename to Wonky.Client/Local.Services/AuthenticationService.cs
index 72c15e53..2da6e93d 100644
--- a/Wonky.Client/Services/AuthenticationService.cs
+++ b/Wonky.Client/Local.Services/AuthenticationService.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Configuration;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public class AuthenticationService : IAuthenticationService
 {
diff --git a/Wonky.Client/Services/IAuthenticationService.cs b/Wonky.Client/Local.Services/IAuthenticationService.cs
similarity index 96%
rename from Wonky.Client/Services/IAuthenticationService.cs
rename to Wonky.Client/Local.Services/IAuthenticationService.cs
index b75bad30..a8a7233e 100644
--- a/Wonky.Client/Services/IAuthenticationService.cs
+++ b/Wonky.Client/Local.Services/IAuthenticationService.cs
@@ -17,7 +17,7 @@
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public interface IAuthenticationService
 {
diff --git a/Wonky.Client/Services/IUserInfoService.cs b/Wonky.Client/Local.Services/IUserInfoService.cs
similarity index 96%
rename from Wonky.Client/Services/IUserInfoService.cs
rename to Wonky.Client/Local.Services/IUserInfoService.cs
index 0df4fc21..60dfeefd 100644
--- a/Wonky.Client/Services/IUserInfoService.cs
+++ b/Wonky.Client/Local.Services/IUserInfoService.cs
@@ -16,7 +16,7 @@
 
 using Wonky.Entity.DTO;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public interface IUserInfoService
 {
diff --git a/Wonky.Client/Services/OrderDraftService.cs b/Wonky.Client/Local.Services/OrderDraftService.cs
similarity index 97%
rename from Wonky.Client/Services/OrderDraftService.cs
rename to Wonky.Client/Local.Services/OrderDraftService.cs
index e4e0c6fc..e845e75c 100644
--- a/Wonky.Client/Services/OrderDraftService.cs
+++ b/Wonky.Client/Local.Services/OrderDraftService.cs
@@ -17,7 +17,7 @@
 using Blazored.LocalStorage;
 using Wonky.Client.Models;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public class OrderDraftService
 {
diff --git a/Wonky.Client/Services/RefreshTokenService.cs b/Wonky.Client/Local.Services/RefreshTokenService.cs
similarity index 98%
rename from Wonky.Client/Services/RefreshTokenService.cs
rename to Wonky.Client/Local.Services/RefreshTokenService.cs
index 82264aa2..43a440b2 100644
--- a/Wonky.Client/Services/RefreshTokenService.cs
+++ b/Wonky.Client/Local.Services/RefreshTokenService.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.AspNetCore.Components.Authorization;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public class RefreshTokenService
 {
diff --git a/Wonky.Client/Services/UserInfoService.cs b/Wonky.Client/Local.Services/UserInfoService.cs
similarity index 97%
rename from Wonky.Client/Services/UserInfoService.cs
rename to Wonky.Client/Local.Services/UserInfoService.cs
index b0809c78..a72934d7 100644
--- a/Wonky.Client/Services/UserInfoService.cs
+++ b/Wonky.Client/Local.Services/UserInfoService.cs
@@ -14,12 +14,11 @@
 //
 
 
-using System.Security.Cryptography.Xml;
 using System.Text.Json;
 using Blazored.LocalStorage;
 using Wonky.Entity.DTO;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public class UserInfoService : IUserInfoService
 {
diff --git a/Wonky.Client/Services/UserPreferenceService.cs b/Wonky.Client/Local.Services/UserPreferenceService.cs
similarity index 99%
rename from Wonky.Client/Services/UserPreferenceService.cs
rename to Wonky.Client/Local.Services/UserPreferenceService.cs
index a738ac4c..187f129c 100644
--- a/Wonky.Client/Services/UserPreferenceService.cs
+++ b/Wonky.Client/Local.Services/UserPreferenceService.cs
@@ -15,7 +15,8 @@
 
 
 using Blazored.LocalStorage;
-namespace Wonky.Client.Services;
+
+namespace Wonky.Client.Local.Services;
 
 public record UserPreference
 {
diff --git a/Wonky.Client/Services/VatInfoLookupService.cs b/Wonky.Client/Local.Services/VatInfoLookupService.cs
similarity index 99%
rename from Wonky.Client/Services/VatInfoLookupService.cs
rename to Wonky.Client/Local.Services/VatInfoLookupService.cs
index e36fcfd6..ea8f1d64 100644
--- a/Wonky.Client/Services/VatInfoLookupService.cs
+++ b/Wonky.Client/Local.Services/VatInfoLookupService.cs
@@ -21,7 +21,7 @@ using Wonky.Entity.Configuration;
 using Wonky.Entity.Models;
 using Wonky.Entity.Requests;
 
-namespace Wonky.Client.Services;
+namespace Wonky.Client.Local.Services;
 
 public class VatInfoLookupService
 {
diff --git a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs
index ef532481..7360fedc 100644
--- a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs
+++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs
@@ -18,8 +18,8 @@ using System.Text.Json;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
 
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
index 66288929..36eaea68 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
@@ -23,10 +23,10 @@ using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
 using Wonky.Client.OverlayCustomer;
 using Wonky.Client.OverlayOrderCreate;
-using Wonky.Client.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs
index d906032a..031c81f9 100644
--- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs
@@ -20,7 +20,7 @@ using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.Views;
 
 #pragma warning disable CS8618
diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs
index e64986d7..e2d80a91 100644
--- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs
@@ -22,8 +22,8 @@ using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Models;
diff --git a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs
index b6d882b7..8111caf4 100644
--- a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs
@@ -17,7 +17,7 @@ using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
index 52e82f8d..99a1a30a 100644
--- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
@@ -22,8 +22,8 @@ using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Models;
diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
index 5308d840..a7515bf9 100644
--- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
index d0f7ffb3..f1ce8843 100644
--- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
@@ -18,8 +18,8 @@ using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
 #pragma warning disable CS8618
diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs
index 7c669773..89941c8e 100644
--- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs
@@ -18,7 +18,7 @@ using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 #pragma warning disable CS8618
 
diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs
index 21309f5c..c19998ae 100644
--- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs
@@ -18,7 +18,7 @@ using Wonky.Client.HttpInterceptors;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
 using Wonky.Entity.DTO;
diff --git a/Wonky.Client/Pages/CommonPreferencesPage.razor b/Wonky.Client/Pages/CommonPreferencesPage.razor
index 4594aa7f..a38e3efa 100644
--- a/Wonky.Client/Pages/CommonPreferencesPage.razor
+++ b/Wonky.Client/Pages/CommonPreferencesPage.razor
@@ -52,8 +52,3 @@
         <CatalogSortComponent />
     </div>
 </div>
-
-
-@code {
-    
-}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/Login.razor.cs b/Wonky.Client/Pages/Login.razor.cs
index 7f727389..17e2a66d 100644
--- a/Wonky.Client/Pages/Login.razor.cs
+++ b/Wonky.Client/Pages/Login.razor.cs
@@ -14,8 +14,8 @@
 //
 
 
-using Wonky.Client.Services;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 #pragma warning disable CS8618
 
diff --git a/Wonky.Client/Pages/Logout.razor.cs b/Wonky.Client/Pages/Logout.razor.cs
index f55da978..12d04605 100644
--- a/Wonky.Client/Pages/Logout.razor.cs
+++ b/Wonky.Client/Pages/Logout.razor.cs
@@ -15,8 +15,9 @@
 
 
 using Blazored.LocalStorage;
-using Wonky.Client.Services;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Local.Services;
+
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Pages;
diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs
index 3b4255e8..5af73533 100644
--- a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs
@@ -17,7 +17,7 @@
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs
index c1be1106..9cdb7904 100644
--- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs
@@ -22,8 +22,8 @@ using Microsoft.JSInterop;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
 #pragma warning disable CS8618
diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs
index 8d056252..fdc61f66 100644
--- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs
@@ -18,7 +18,7 @@ using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs
index 6a6fd98a..381499c1 100644
--- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs
+++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs
@@ -22,10 +22,10 @@ using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
 using Wonky.Client.OverlayOffice;
 using Wonky.Client.OverlayOrderCreate;
-using Wonky.Client.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs
index 4637d91f..d2c4716f 100644
--- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs
@@ -21,7 +21,7 @@ using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
 #pragma warning disable CS8618
diff --git a/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor b/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor
index 680954f0..116eec58 100644
--- a/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor
+++ b/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor
@@ -25,7 +25,3 @@
     <div class="card-body">
     </div>
 </div>
-
-@code {
-
-}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor.cs b/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor.cs
new file mode 100644
index 00000000..ecbb9775
--- /dev/null
+++ b/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor.cs
@@ -0,0 +1,6 @@
+namespace Wonky.Client.Pages;
+
+public partial class SystemKrvProductsAdminPage
+{
+    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor b/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor
index 4d5befa4..978a7f7d 100644
--- a/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor
+++ b/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor
@@ -24,7 +24,3 @@
     <div class="card-body">
     </div>
 </div>
-
-@code {
-    
-}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor.cs b/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor.cs
new file mode 100644
index 00000000..e584d129
--- /dev/null
+++ b/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor.cs
@@ -0,0 +1,6 @@
+namespace Wonky.Client.Pages;
+
+public partial class SystemKrvProtectionsAdminPage
+{
+    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor b/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor
index b374b49a..77787a39 100644
--- a/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor
+++ b/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor
@@ -24,7 +24,3 @@
     <div class="card-body">
     </div>
 </div>
-
-@code {
-    
-}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor.cs b/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor.cs
new file mode 100644
index 00000000..4fc46ce6
--- /dev/null
+++ b/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor.cs
@@ -0,0 +1,6 @@
+namespace Wonky.Client.Pages;
+
+public partial class SystemKrvTextsAdminPage
+{
+    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs
index 7c87c0bd..47c47d53 100644
--- a/Wonky.Client/Program.cs
+++ b/Wonky.Client/Program.cs
@@ -25,7 +25,7 @@ using Blazored.Toast;
 using Wonky.Client;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Shared;
 using Wonky.Entity.Configuration;
 
diff --git a/Wonky.Client/Shared/AuthStateProvider.cs b/Wonky.Client/Shared/AuthStateProvider.cs
index 4bc94f80..64902f2a 100644
--- a/Wonky.Client/Shared/AuthStateProvider.cs
+++ b/Wonky.Client/Shared/AuthStateProvider.cs
@@ -17,7 +17,7 @@ using System.Net.Http.Headers;
 using System.Security.Claims;
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components.Authorization;
-using Wonky.Client.Services;
+using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
 
diff --git a/Wonky.Client/Shared/ContactModal.razor.cs b/Wonky.Client/Shared/ContactModal.razor.cs
index 6dde285a..eebbaef0 100644
--- a/Wonky.Client/Shared/ContactModal.razor.cs
+++ b/Wonky.Client/Shared/ContactModal.razor.cs
@@ -20,7 +20,6 @@ using Microsoft.AspNetCore.Components.Forms;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor
index 32e7142c..4770cef0 100644
--- a/Wonky.Client/Shared/NavMenu.razor
+++ b/Wonky.Client/Shared/NavMenu.razor
@@ -16,7 +16,6 @@
 
 @inject IWebAssemblyHostEnvironment HostEnvironment
 @using Wonky.Client.Components;
-@using Wonky.Client.Services
 @using Wonky.Entity.Views
 @using Blazored.LocalStorage
 
diff --git a/Wonky.Client/Shared/VatLookupDkModal.razor.cs b/Wonky.Client/Shared/VatLookupDkModal.razor.cs
index 8d4e7ece..d0654df3 100644
--- a/Wonky.Client/Shared/VatLookupDkModal.razor.cs
+++ b/Wonky.Client/Shared/VatLookupDkModal.razor.cs
@@ -19,8 +19,8 @@ using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
+using Wonky.Client.Local.Services;
 using Wonky.Client.Models;
-using Wonky.Client.Services;
 using Wonky.Entity.Models;
 using Wonky.Entity.Requests;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj
index 4aab38f1..abed7f80 100644
--- a/Wonky.Client/Wonky.Client.csproj
+++ b/Wonky.Client/Wonky.Client.csproj
@@ -3797,4 +3797,8 @@
     <None Remove="wwwroot\icons\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Services" />
+  </ItemGroup>
+
 </Project>