diff --git a/LANCommander.Server.Services/_IBaseDatabaseService.cs b/LANCommander.Server.Services/Abstractions/IBaseDatabaseService.cs
similarity index 85%
rename from LANCommander.Server.Services/_IBaseDatabaseService.cs
rename to LANCommander.Server.Services/Abstractions/IBaseDatabaseService.cs
index 3c663cdd..f1828ed5 100644
--- a/LANCommander.Server.Services/_IBaseDatabaseService.cs
+++ b/LANCommander.Server.Services/Abstractions/IBaseDatabaseService.cs
@@ -1,13 +1,9 @@
-using LANCommander.Server.Data;
-using LANCommander.Server.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Data.Models;
-using LANCommander.Server.Models;
 using LANCommander.Server.Services.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using System.Linq.Expressions;
 
-namespace LANCommander.Server.Services
+namespace LANCommander.Server.Services.Abstractions
 {
     public interface IBaseDatabaseService<T> where T : class, IBaseModel
     {
diff --git a/LANCommander.Server.Services/IMediaGrabberService.cs b/LANCommander.Server.Services/Abstractions/IMediaGrabberService.cs
similarity index 81%
rename from LANCommander.Server.Services/IMediaGrabberService.cs
rename to LANCommander.Server.Services/Abstractions/IMediaGrabberService.cs
index d5ed0115..7fd9e659 100644
--- a/LANCommander.Server.Services/IMediaGrabberService.cs
+++ b/LANCommander.Server.Services/Abstractions/IMediaGrabberService.cs
@@ -1,7 +1,7 @@
 using LANCommander.SDK.Enums;
 using LANCommander.Server.Services.Models;
 
-namespace LANCommander.Server.Services
+namespace LANCommander.Server.Services.Abstractions
 {
     public interface IMediaGrabberService
     {
diff --git a/LANCommander.Server.Services/IVersionProvider.cs b/LANCommander.Server.Services/Abstractions/IVersionProvider.cs
similarity index 62%
rename from LANCommander.Server.Services/IVersionProvider.cs
rename to LANCommander.Server.Services/Abstractions/IVersionProvider.cs
index 56ea399e..a0d3f4e2 100644
--- a/LANCommander.Server.Services/IVersionProvider.cs
+++ b/LANCommander.Server.Services/Abstractions/IVersionProvider.cs
@@ -1,6 +1,6 @@
 using Semver;
 
-namespace LANCommander.Server.Services;
+namespace LANCommander.Server.Services.Abstractions;
 
 public interface IVersionProvider
 {
diff --git a/LANCommander.Server.Services/BeaconService.cs b/LANCommander.Server.Services/BeaconService.cs
index 308c35dc..0ca5d230 100644
--- a/LANCommander.Server.Services/BeaconService.cs
+++ b/LANCommander.Server.Services/BeaconService.cs
@@ -1,5 +1,6 @@
 using BeaconLib;
 using LANCommander.Server.Models;
+using LANCommander.Server.Services.Abstractions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs b/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs
index b8c54ff2..82788610 100644
--- a/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs
+++ b/LANCommander.Server.Services/MediaGrabbers/SteamGridDBMediaGrabber.cs
@@ -1,8 +1,8 @@
 using craftersmine.SteamGridDBNet;
-using LANCommander.Server.Models;
 using LANCommander.SDK.Enums;
 using LANCommander.Steam;
 using System.Net.Mime;
+using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Models;
 
 namespace LANCommander.Server.Services.MediaGrabbers
diff --git a/LANCommander.Server.Services/UpdateService.cs b/LANCommander.Server.Services/UpdateService.cs
index 2f5ebc89..47e5da79 100644
--- a/LANCommander.Server.Services/UpdateService.cs
+++ b/LANCommander.Server.Services/UpdateService.cs
@@ -8,6 +8,7 @@ using System.Net;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using AutoMapper;
+using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Exceptions;
 using LANCommander.Server.Services.Models;
 using ZiggyCreatures.Caching.Fusion;
diff --git a/LANCommander.Server.Services/UserService.cs b/LANCommander.Server.Services/UserService.cs
index dbea2832..ca4290e9 100644
--- a/LANCommander.Server.Services/UserService.cs
+++ b/LANCommander.Server.Services/UserService.cs
@@ -1,6 +1,5 @@
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
-using LANCommander.Server.Data;
 using LANCommander.Server.Data.Enums;
 using LANCommander.Server.Data.Models;
 using LANCommander.Server.Services.Factories;
@@ -9,8 +8,8 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using System.Linq.Expressions;
+using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Exceptions;
-using LANCommander.Server.Services.Extensions;
 using ZiggyCreatures.Caching.Fusion;
 
 namespace LANCommander.Server.Services
diff --git a/LANCommander.Server.Services/_BaseDatabaseService.cs b/LANCommander.Server.Services/_BaseDatabaseService.cs
index 735ddc61..51af0347 100644
--- a/LANCommander.Server.Services/_BaseDatabaseService.cs
+++ b/LANCommander.Server.Services/_BaseDatabaseService.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
 using System.Linq.Expressions;
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
+using LANCommander.Server.Services.Abstractions;
 using Microsoft.AspNetCore.Http;
 using ZiggyCreatures.Caching.Fusion;
 
diff --git a/LANCommander.Server.Tests/ApplicationFactory.cs b/LANCommander.Server.Tests/ApplicationFactory.cs
index b060ac08..1ee33b31 100644
--- a/LANCommander.Server.Tests/ApplicationFactory.cs
+++ b/LANCommander.Server.Tests/ApplicationFactory.cs
@@ -1,6 +1,6 @@
 using System.Data.Common;
 using LANCommander.Server.Data;
-using LANCommander.Server.Services;
+using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Tests.Mocks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
diff --git a/LANCommander.Server.Tests/Mocks/VersionProviderMock.cs b/LANCommander.Server.Tests/Mocks/VersionProviderMock.cs
index e701fdd6..c7afe185 100644
--- a/LANCommander.Server.Tests/Mocks/VersionProviderMock.cs
+++ b/LANCommander.Server.Tests/Mocks/VersionProviderMock.cs
@@ -1,4 +1,4 @@
-using LANCommander.Server.Services;
+using LANCommander.Server.Services.Abstractions;
 using Semver;
 
 namespace LANCommander.Server.Tests.Mocks;
diff --git a/LANCommander.Server/Controllers/Api/LauncherController.cs b/LANCommander.Server/Controllers/Api/LauncherController.cs
index 80c1b476..67688981 100644
--- a/LANCommander.Server/Controllers/Api/LauncherController.cs
+++ b/LANCommander.Server/Controllers/Api/LauncherController.cs
@@ -1,6 +1,6 @@
 using LANCommander.SDK.Models;
-using LANCommander.Server.Providers;
 using LANCommander.Server.Services;
+using LANCommander.Server.Services.Abstractions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Semver;
diff --git a/LANCommander.Server/Middlewares/ApiVersioningMiddleware.cs b/LANCommander.Server/Middlewares/ApiVersioningMiddleware.cs
index 242c50df..aa0e3126 100644
--- a/LANCommander.Server/Middlewares/ApiVersioningMiddleware.cs
+++ b/LANCommander.Server/Middlewares/ApiVersioningMiddleware.cs
@@ -1,4 +1,4 @@
-using LANCommander.Server.Services;
+using LANCommander.Server.Services.Abstractions;
 
 namespace LANCommander.Server
 {
diff --git a/LANCommander.Server/Providers/VersionProvider.cs b/LANCommander.Server/Providers/VersionProvider.cs
index ce3e31c1..da191b6c 100644
--- a/LANCommander.Server/Providers/VersionProvider.cs
+++ b/LANCommander.Server/Providers/VersionProvider.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using LANCommander.Server.Services;
+using LANCommander.Server.Services.Abstractions;
 using Semver;
 
 namespace LANCommander.Server.Providers;
diff --git a/LANCommander.Server/Startup/Services.cs b/LANCommander.Server/Startup/Services.cs
index 0ec82ec8..ff9d16ed 100644
--- a/LANCommander.Server/Startup/Services.cs
+++ b/LANCommander.Server/Startup/Services.cs
@@ -1,5 +1,6 @@
 using LANCommander.Server.Providers;
 using LANCommander.Server.Services;
+using LANCommander.Server.Services.Abstractions;
 using LANCommander.Server.Services.Extensions;
 using LANCommander.Server.Services.Models;
 using Serilog;
diff --git a/LANCommander.Server/UI/Components/MediaGrabberDialog.razor b/LANCommander.Server/UI/Components/MediaGrabberDialog.razor
index 986febcf..b31da824 100644
--- a/LANCommander.Server/UI/Components/MediaGrabberDialog.razor
+++ b/LANCommander.Server/UI/Components/MediaGrabberDialog.razor
@@ -1,4 +1,5 @@
 @inherits FeedbackComponent<MediaGrabberOptions, MediaGrabberResult>
+@using LANCommander.Server.Services.Abstractions
 @using LANCommander.SDK.Enums
 @inject IMediaGrabberService MediaGrabberService
 @inject IMessageService MessageService
diff --git a/LANCommander.Server/UI/Pages/Settings/Tools/Index.razor b/LANCommander.Server/UI/Pages/Settings/Tools/Index.razor
index 7264de9e..8622b39b 100644
--- a/LANCommander.Server/UI/Pages/Settings/Tools/Index.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Tools/Index.razor
@@ -8,7 +8,6 @@
 @inject PageService PageService
 @inject UpdateService UpdateService
 @inject StorageLocationService StorageLocationService
-@inject IVersionProvider VersionProvider
 @inject IMessageService MessageService
 @inject IFusionCache FusionCache
 @inject ILogger<Index> Logger
diff --git a/LANCommander.Server/UI/Pages/Settings/Updates.razor b/LANCommander.Server/UI/Pages/Settings/Updates.razor
index 91640642..96f7e7f2 100644
--- a/LANCommander.Server/UI/Pages/Settings/Updates.razor
+++ b/LANCommander.Server/UI/Pages/Settings/Updates.razor
@@ -1,4 +1,5 @@
 @page "/Settings/Updates"
+@using LANCommander.Server.Services.Abstractions
 @using Markdig
 @using Octokit
 @using Semver
diff --git a/LANCommander.Server/UI/Shared/BasicLayout.razor b/LANCommander.Server/UI/Shared/BasicLayout.razor
index ed8802a6..e85bfa5d 100644
--- a/LANCommander.Server/UI/Shared/BasicLayout.razor
+++ b/LANCommander.Server/UI/Shared/BasicLayout.razor
@@ -1,4 +1,5 @@
-@inherits LayoutComponentBase
+@using LANCommander.Server.Services.Abstractions
+@inherits LayoutComponentBase
 @inject IVersionProvider VersionProvider
 
 <Layout Class="layout">
diff --git a/LANCommander.Server/UI/Shared/MainLayout.razor b/LANCommander.Server/UI/Shared/MainLayout.razor
index 20418aa7..226d4996 100644
--- a/LANCommander.Server/UI/Shared/MainLayout.razor
+++ b/LANCommander.Server/UI/Shared/MainLayout.razor
@@ -1,4 +1,4 @@
-@using LANCommander.Server.Providers
+@using LANCommander.Server.Services.Abstractions
 @inherits LayoutComponentBase
 @inject IVersionProvider VersionProvider
 @inject NavigationManager NavigationManager
@@ -9,9 +9,11 @@
     <Flex Vertical Justify="FlexJustify.SpaceBetween" Gap="FlexGap.Large" Class="layout-wrapper" >
         <ErrorHandler Title="Unexpected Error">
             <Body>
-                <Content>
+            <Content>
+                <ServerProcessMonitor>
                     @Body
-                </Content>
+                </ServerProcessMonitor>
+            </Content>
             </Body>
             <Extra>
                 <Button Type="ButtonType.Primary" OnClick="@(() => NavigationManager.Refresh())">Refresh</Button>