diff --git a/service/firewall/interception/interception_windows.go b/service/firewall/interception/interception_windows.go
index be5b8c4a..11eadbf3 100644
--- a/service/firewall/interception/interception_windows.go
+++ b/service/firewall/interception/interception_windows.go
@@ -6,11 +6,11 @@ import (
 	"time"
 
 	"github.com/safing/portbase/log"
-	kext1 "github.com/safing/portmaster/firewall/interception/windowskext"
-	kext2 "github.com/safing/portmaster/firewall/interception/windowskext2"
-	"github.com/safing/portmaster/network"
-	"github.com/safing/portmaster/network/packet"
-	"github.com/safing/portmaster/updates"
+	kext1 "github.com/safing/portmaster/service/firewall/interception/windowskext"
+	kext2 "github.com/safing/portmaster/service/firewall/interception/windowskext2"
+	"github.com/safing/portmaster/service/network"
+	"github.com/safing/portmaster/service/network/packet"
+	"github.com/safing/portmaster/service/updates"
 )
 
 var useOldKext = false
diff --git a/firewall/interception/windowskext2/doc.go b/service/firewall/interception/windowskext2/doc.go
similarity index 100%
rename from firewall/interception/windowskext2/doc.go
rename to service/firewall/interception/windowskext2/doc.go
diff --git a/firewall/interception/windowskext2/handler.go b/service/firewall/interception/windowskext2/handler.go
similarity index 97%
rename from firewall/interception/windowskext2/handler.go
rename to service/firewall/interception/windowskext2/handler.go
index 1d10fa79..55d4a6de 100644
--- a/firewall/interception/windowskext2/handler.go
+++ b/service/firewall/interception/windowskext2/handler.go
@@ -9,12 +9,12 @@ import (
 	"net"
 	"time"
 
-	"github.com/safing/portmaster/process"
+	"github.com/safing/portmaster/service/process"
 
 	"github.com/tevino/abool"
 
 	"github.com/safing/portbase/log"
-	"github.com/safing/portmaster/network/packet"
+	"github.com/safing/portmaster/service/network/packet"
 )
 
 type VersionInfo struct {
diff --git a/firewall/interception/windowskext2/kext.go b/service/firewall/interception/windowskext2/kext.go
similarity index 98%
rename from firewall/interception/windowskext2/kext.go
rename to service/firewall/interception/windowskext2/kext.go
index 665cf25d..ca42d7c0 100644
--- a/firewall/interception/windowskext2/kext.go
+++ b/service/firewall/interception/windowskext2/kext.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/safing/portbase/log"
-	"github.com/safing/portmaster/network"
+	"github.com/safing/portmaster/service/network"
 	"github.com/vlabo/portmaster_windows_rust_kext/kext_interface"
 	"golang.org/x/sys/windows"
 )
diff --git a/firewall/interception/windowskext2/packet.go b/service/firewall/interception/windowskext2/packet.go
similarity index 98%
rename from firewall/interception/windowskext2/packet.go
rename to service/firewall/interception/windowskext2/packet.go
index 3e425306..aa9acd54 100644
--- a/firewall/interception/windowskext2/packet.go
+++ b/service/firewall/interception/windowskext2/packet.go
@@ -10,7 +10,7 @@ import (
 	"github.com/vlabo/portmaster_windows_rust_kext/kext_interface"
 
 	"github.com/safing/portbase/log"
-	"github.com/safing/portmaster/network/packet"
+	"github.com/safing/portmaster/service/network/packet"
 )
 
 // Packet represents an IP packet.
diff --git a/firewall/interception/windowskext2/service.go b/service/firewall/interception/windowskext2/service.go
similarity index 100%
rename from firewall/interception/windowskext2/service.go
rename to service/firewall/interception/windowskext2/service.go