diff --git a/PolyTrader.App.csproj b/PolyTrader.App.csproj
index 07a34b8..7de9eeb 100644
--- a/PolyTrader.App.csproj
+++ b/PolyTrader.App.csproj
@@ -75,7 +75,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="libs\Threema-MsgApi-Net-Core\IcgSoftware.Threema.CoreMsgApi\IcgSoftware.Threema.CoreMsgApi.csproj" />
     <ProjectReference Include="src\PolyTrader.Core\PolyTrader.Core.csproj" />
     <ProjectReference Include="src\PolyTrader.Modules.CopyTrading\PolyTrader.Modules.CopyTrading.csproj" />
   </ItemGroup>
diff --git a/services/mullvad.cs b/services/mullvad.cs
deleted file mode 100644
index 19587e2..0000000
--- a/services/mullvad.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using MongoDB.Driver;
-using PolyTraderSharp.Extensions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PolyTraderSharp.services
-{    /*
-     * Verwaltet alles was mit Mullvad zu tun hat. Also VPN verbindung aktivieren / deaktivieren / prüfen
-     */
-    internal class Mullvad
-    {
-
-    }
-
-}
diff --git a/src/PolyTrader.Core/PolyTrader.Core.csproj b/src/PolyTrader.Core/PolyTrader.Core.csproj
index 52db334..b22feec 100644
--- a/src/PolyTrader.Core/PolyTrader.Core.csproj
+++ b/src/PolyTrader.Core/PolyTrader.Core.csproj
@@ -10,7 +10,12 @@
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageReference Include="Nethereum.Web3" Version="6.1.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\libs\Threema-MsgApi-Net-Core\IcgSoftware.Threema.CoreMsgApi\IcgSoftware.Threema.CoreMsgApi.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/services/MullvadVpnService.cs b/src/PolyTrader.Core/Services/MullvadVpnService.cs
similarity index 98%
rename from services/MullvadVpnService.cs
rename to src/PolyTrader.Core/Services/MullvadVpnService.cs
index 1a300a5..2086b2c 100644
--- a/services/MullvadVpnService.cs
+++ b/src/PolyTrader.Core/Services/MullvadVpnService.cs
@@ -1,6 +1,4 @@
 using System;
-using MongoDB.Driver;
-using PolyTraderSharp.Extensions;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
diff --git a/services/ThreemaService.cs b/src/PolyTrader.Core/Services/ThreemaService.cs
similarity index 100%
rename from services/ThreemaService.cs
rename to src/PolyTrader.Core/Services/ThreemaService.cs