internal: relocate packages

Signed-off-by: Ophestra <cat@gensokyo.uk>

59 files changed, 45 insertions, 45 deletions

diff --git a/internal/system/acl/acl.go b/internal/acl/acl.go
index 366ad533..366ad533 100644
--- a/internal/system/acl/acl.go
+++ b/internal/acl/acl.go
diff --git a/internal/system/acl/acl_test.go b/internal/acl/acl_test.go
index b0dd58d7..5b1b30e7 100644
--- a/internal/system/acl/acl_test.go
+++ b/internal/acl/acl_test.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"testing"
 
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 const testFileName = "acl.test"
diff --git a/internal/system/acl/libacl-helper.c b/internal/acl/libacl-helper.c
index d1df8167..d1df8167 100644
--- a/internal/system/acl/libacl-helper.c
+++ b/internal/acl/libacl-helper.c
diff --git a/internal/system/acl/libacl-helper.go b/internal/acl/libacl-helper.go
index 22575296..22575296 100644
--- a/internal/system/acl/libacl-helper.go
+++ b/internal/acl/libacl-helper.go
diff --git a/internal/system/acl/libacl-helper.h b/internal/acl/libacl-helper.h
index b86eb170..b86eb170 100644
--- a/internal/system/acl/libacl-helper.h
+++ b/internal/acl/libacl-helper.h
diff --git a/internal/system/acl/libacl-helper_test.go b/internal/acl/libacl-helper_test.go
index 13d23a3c..13d23a3c 100644
--- a/internal/system/acl/libacl-helper_test.go
+++ b/internal/acl/libacl-helper_test.go
diff --git a/internal/system/acl/perms.go b/internal/acl/perms.go
index fbc99e82..fbc99e82 100644
--- a/internal/system/acl/perms.go
+++ b/internal/acl/perms.go
diff --git a/internal/system/acl/perms_test.go b/internal/acl/perms_test.go
index 3d5e3df5..3920046d 100644
--- a/internal/system/acl/perms_test.go
+++ b/internal/acl/perms_test.go
@@ -3,7 +3,7 @@ package acl_test
 import (
 	"testing"
 
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 func TestPerms(t *testing.T) {
diff --git a/internal/system/dbus/address.go b/internal/dbus/address.go
index edee7e20..edee7e20 100644
--- a/internal/system/dbus/address.go
+++ b/internal/dbus/address.go
diff --git a/internal/system/dbus/address_escape_test.go b/internal/dbus/address_escape_test.go
index 4ef48f8b..4ef48f8b 100644
--- a/internal/system/dbus/address_escape_test.go
+++ b/internal/dbus/address_escape_test.go
diff --git a/internal/system/dbus/address_test.go b/internal/dbus/address_test.go
index 9ed48214..7517aa1d 100644
--- a/internal/system/dbus/address_test.go
+++ b/internal/dbus/address_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 func TestParse(t *testing.T) {
diff --git a/internal/system/dbus/config.go b/internal/dbus/config.go
index 2a09ee90..2a09ee90 100644
--- a/internal/system/dbus/config.go
+++ b/internal/dbus/config.go
diff --git a/internal/system/dbus/config_test.go b/internal/dbus/config_test.go
index dec4cb16..8509007a 100644
--- a/internal/system/dbus/config_test.go
+++ b/internal/dbus/config_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 func TestConfigArgs(t *testing.T) {
diff --git a/internal/system/dbus/dbus.go b/internal/dbus/dbus.go
index 9ea89f51..9ea89f51 100644
--- a/internal/system/dbus/dbus.go
+++ b/internal/dbus/dbus.go
diff --git a/internal/system/dbus/dbus_test.go b/internal/dbus/dbus_test.go
index 9fc2b539..5d6e4c40 100644
--- a/internal/system/dbus/dbus_test.go
+++ b/internal/dbus/dbus_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 
diff --git a/internal/system/dbus/export_test.go b/internal/dbus/export_test.go
index bc24f3f3..bc24f3f3 100644
--- a/internal/system/dbus/export_test.go
+++ b/internal/dbus/export_test.go
diff --git a/internal/system/dbus/proc.go b/internal/dbus/proc.go
index c934e89e..c934e89e 100644
--- a/internal/system/dbus/proc.go
+++ b/internal/dbus/proc.go
diff --git a/internal/system/dbus/proc_test.go b/internal/dbus/proc_test.go
index 544856ed..544856ed 100644
--- a/internal/system/dbus/proc_test.go
+++ b/internal/dbus/proc_test.go
diff --git a/internal/system/dbus/proxy.go b/internal/dbus/proxy.go
index 9de49c41..9de49c41 100644
--- a/internal/system/dbus/proxy.go
+++ b/internal/dbus/proxy.go
diff --git a/internal/system/dbus/samples_test.go b/internal/dbus/samples_test.go
index 7db3d6b9..7db3d6b9 100644
--- a/internal/system/dbus/samples_test.go
+++ b/internal/dbus/samples_test.go
diff --git a/internal/system/dbus/testdata/dev.vencord.Vesktop.json b/internal/dbus/testdata/dev.vencord.Vesktop.json
index 05259774..05259774 100644
--- a/internal/system/dbus/testdata/dev.vencord.Vesktop.json
+++ b/internal/dbus/testdata/dev.vencord.Vesktop.json
diff --git a/internal/system/dbus/testdata/org.chromium.Chromium+.json b/internal/dbus/testdata/org.chromium.Chromium+.json
index 0a27d719..0a27d719 100644
--- a/internal/system/dbus/testdata/org.chromium.Chromium+.json
+++ b/internal/dbus/testdata/org.chromium.Chromium+.json
diff --git a/internal/system/dbus/testdata/org.chromium.Chromium.json b/internal/dbus/testdata/org.chromium.Chromium.json
index be027f39..be027f39 100644
--- a/internal/system/dbus/testdata/org.chromium.Chromium.json
+++ b/internal/dbus/testdata/org.chromium.Chromium.json
diff --git a/internal/system/dbus/testdata/uk.gensokyo.CrashTestDummy.json b/internal/dbus/testdata/uk.gensokyo.CrashTestDummy.json
index 43272f67..43272f67 100644
--- a/internal/system/dbus/testdata/uk.gensokyo.CrashTestDummy.json
+++ b/internal/dbus/testdata/uk.gensokyo.CrashTestDummy.json
diff --git a/internal/outcome/dispatcher.go b/internal/outcome/dispatcher.go
index 20c70a4b..a5339b20 100644
--- a/internal/outcome/dispatcher.go
+++ b/internal/outcome/dispatcher.go
@@ -14,8 +14,8 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/info"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 
diff --git a/internal/outcome/outcome.go b/internal/outcome/outcome.go
index b137d4f3..48f85a4b 100644
--- a/internal/outcome/outcome.go
+++ b/internal/outcome/outcome.go
@@ -9,9 +9,9 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/env"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 	"hakurei.app/message"
 )
 
diff --git a/internal/outcome/run_test.go b/internal/outcome/run_test.go
index de2113f2..6908cd2f 100644
--- a/internal/outcome/run_test.go
+++ b/internal/outcome/run_test.go
@@ -21,9 +21,9 @@ import (
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 
diff --git a/internal/outcome/spcontainer.go b/internal/outcome/spcontainer.go
index 738d3383..28697b41 100644
--- a/internal/outcome/spcontainer.go
+++ b/internal/outcome/spcontainer.go
@@ -16,9 +16,9 @@ import (
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/internal/validate"
 	"hakurei.app/message"
 )
diff --git a/internal/outcome/spcontainer_test.go b/internal/outcome/spcontainer_test.go
index d6999b9d..51a04020 100644
--- a/internal/outcome/spcontainer_test.go
+++ b/internal/outcome/spcontainer_test.go
@@ -14,9 +14,9 @@ import (
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 )
 
 func TestSpParamsOp(t *testing.T) {
diff --git a/internal/outcome/spdbus.go b/internal/outcome/spdbus.go
index c123135e..8b3fbdbc 100644
--- a/internal/outcome/spdbus.go
+++ b/internal/outcome/spdbus.go
@@ -5,8 +5,8 @@ import (
 
 	"hakurei.app/container/fhs"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 )
 
 func init() { gob.Register(new(spDBusOp)) }
diff --git a/internal/outcome/spdbus_test.go b/internal/outcome/spdbus_test.go
index 2e489c22..350fc326 100644
--- a/internal/outcome/spdbus_test.go
+++ b/internal/outcome/spdbus_test.go
@@ -7,10 +7,10 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
 	"hakurei.app/message"
 )
 
diff --git a/internal/outcome/sppulse_test.go b/internal/outcome/sppulse_test.go
index e988ec08..4ec445db 100644
--- a/internal/outcome/sppulse_test.go
+++ b/internal/outcome/sppulse_test.go
@@ -11,8 +11,8 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func TestSpPulseOp(t *testing.T) {
diff --git a/internal/outcome/spruntime.go b/internal/outcome/spruntime.go
index 34c16341..1e066bd4 100644
--- a/internal/outcome/spruntime.go
+++ b/internal/outcome/spruntime.go
@@ -7,8 +7,8 @@ import (
 	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 const (
diff --git a/internal/outcome/spruntime_test.go b/internal/outcome/spruntime_test.go
index b05cc1d9..18f3ce9c 100644
--- a/internal/outcome/spruntime_test.go
+++ b/internal/outcome/spruntime_test.go
@@ -8,8 +8,8 @@ import (
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func TestSpRuntimeOp(t *testing.T) {
diff --git a/internal/outcome/sptmpdir.go b/internal/outcome/sptmpdir.go
index dd675d67..9fb3f8d1 100644
--- a/internal/outcome/sptmpdir.go
+++ b/internal/outcome/sptmpdir.go
@@ -7,8 +7,8 @@ import (
 	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func init() { gob.Register(spTmpdirOp{}) }
diff --git a/internal/outcome/sptmpdir_test.go b/internal/outcome/sptmpdir_test.go
index ccc8f3d3..61290c8d 100644
--- a/internal/outcome/sptmpdir_test.go
+++ b/internal/outcome/sptmpdir_test.go
@@ -8,8 +8,8 @@ import (
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
 )
 
 func TestSpTmpdirOp(t *testing.T) {
diff --git a/internal/outcome/spwayland.go b/internal/outcome/spwayland.go
index a57c3c0a..7eccce2f 100644
--- a/internal/outcome/spwayland.go
+++ b/internal/outcome/spwayland.go
@@ -5,8 +5,8 @@ import (
 
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/wayland"
 )
 
 func init() { gob.Register(new(spWaylandOp)) }
diff --git a/internal/outcome/spwayland_test.go b/internal/outcome/spwayland_test.go
index 3c99abd7..828cc86c 100644
--- a/internal/outcome/spwayland_test.go
+++ b/internal/outcome/spwayland_test.go
@@ -6,9 +6,9 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/wayland"
 )
 
 func TestSpWaylandOp(t *testing.T) {
diff --git a/internal/outcome/spx11.go b/internal/outcome/spx11.go
index 8fb7ab4f..fd2b273a 100644
--- a/internal/outcome/spx11.go
+++ b/internal/outcome/spx11.go
@@ -11,7 +11,7 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/fhs"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 var absX11SocketDir = fhs.AbsTmp.Append(".X11-unix")
diff --git a/internal/outcome/spx11_test.go b/internal/outcome/spx11_test.go
index 794da6ad..d4c10902 100644
--- a/internal/outcome/spx11_test.go
+++ b/internal/outcome/spx11_test.go
@@ -7,7 +7,7 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 func TestSpX11Op(t *testing.T) {
diff --git a/internal/system/acl.go b/internal/system/acl.go
index 854e812b..060d8854 100644
--- a/internal/system/acl.go
+++ b/internal/system/acl.go
@@ -8,7 +8,7 @@ import (
 
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 // UpdatePerm calls UpdatePermType with the [Process] criteria.
diff --git a/internal/system/acl_test.go b/internal/system/acl_test.go
index 1fc3b1a2..f7829e24 100644
--- a/internal/system/acl_test.go
+++ b/internal/system/acl_test.go
@@ -7,7 +7,7 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
+	"hakurei.app/internal/acl"
 )
 
 func TestACLUpdateOp(t *testing.T) {
diff --git a/internal/system/dbus.go b/internal/system/dbus.go
index b9021b81..8e2a7ec7 100644
--- a/internal/system/dbus.go
+++ b/internal/system/dbus.go
@@ -13,7 +13,7 @@ import (
 
 	"hakurei.app/container"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/dbus"
+	"hakurei.app/internal/dbus"
 )
 
 // ErrDBusConfig is returned when a required [hst.BusConfig] argument is nil.
diff --git a/internal/system/dbus_test.go b/internal/system/dbus_test.go
index f79c8482..10d242ca 100644
--- a/internal/system/dbus_test.go
+++ b/internal/system/dbus_test.go
@@ -11,8 +11,8 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
-	"hakurei.app/internal/system/dbus"
 )
 
 func TestDBusProxyOp(t *testing.T) {
diff --git a/internal/system/dispatcher.go b/internal/system/dispatcher.go
index 86aebcaa..1ea9f108 100644
--- a/internal/system/dispatcher.go
+++ b/internal/system/dispatcher.go
@@ -7,9 +7,9 @@ import (
 	"os"
 
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
+	"hakurei.app/internal/xcb"
 )
 
 type osFile interface {
diff --git a/internal/system/dispatcher_test.go b/internal/system/dispatcher_test.go
index 8000f0c7..95aab3e4 100644
--- a/internal/system/dispatcher_test.go
+++ b/internal/system/dispatcher_test.go
@@ -10,9 +10,9 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/dbus"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/dbus"
+	"hakurei.app/internal/xcb"
 )
 
 // call initialises a [stub.Call].
diff --git a/internal/system/system_test.go b/internal/system/system_test.go
index b0773b0f..f36ff54e 100644
--- a/internal/system/system_test.go
+++ b/internal/system/system_test.go
@@ -11,7 +11,7 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 	"hakurei.app/message"
 )
 
diff --git a/internal/system/wayland.go b/internal/system/wayland.go
index 8883148e..c423fe24 100644
--- a/internal/system/wayland.go
+++ b/internal/system/wayland.go
@@ -7,8 +7,8 @@ import (
 
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/wayland"
 )
 
 type waylandConn interface {
diff --git a/internal/system/wayland_test.go b/internal/system/wayland_test.go
index 083c8ba7..4e7db513 100644
--- a/internal/system/wayland_test.go
+++ b/internal/system/wayland_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"hakurei.app/container/stub"
-	"hakurei.app/internal/system/acl"
-	"hakurei.app/internal/system/wayland"
+	"hakurei.app/internal/acl"
+	"hakurei.app/internal/wayland"
 )
 
 type stubWaylandConn struct {
diff --git a/internal/system/xhost.go b/internal/system/xhost.go
index 27e60c2b..be44ce1a 100644
--- a/internal/system/xhost.go
+++ b/internal/system/xhost.go
@@ -2,7 +2,7 @@ package system
 
 import (
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 )
 
 // ChangeHosts inserts the target user into X11 hosts and deletes it once its [Enablement] is no longer satisfied.
diff --git a/internal/system/xhost_test.go b/internal/system/xhost_test.go
index 853da651..75ad5b9b 100644
--- a/internal/system/xhost_test.go
+++ b/internal/system/xhost_test.go
@@ -5,7 +5,7 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
-	"hakurei.app/internal/system/xcb"
+	"hakurei.app/internal/xcb"
 )
 
 func TestXHostOp(t *testing.T) {
diff --git a/internal/system/wayland/conn.go b/internal/wayland/conn.go
index c55fe704..c55fe704 100644
--- a/internal/system/wayland/conn.go
+++ b/internal/wayland/conn.go
diff --git a/internal/system/wayland/security-context-v1-protocol.c b/internal/wayland/security-context-v1-protocol.c
index 5b15b1b4..5b15b1b4 100644
--- a/internal/system/wayland/security-context-v1-protocol.c
+++ b/internal/wayland/security-context-v1-protocol.c
diff --git a/internal/system/wayland/security-context-v1-protocol.h b/internal/wayland/security-context-v1-protocol.h
index f973619e..f973619e 100644
--- a/internal/system/wayland/security-context-v1-protocol.h
+++ b/internal/wayland/security-context-v1-protocol.h
diff --git a/internal/system/wayland/wayland-client-helper.c b/internal/wayland/wayland-client-helper.c
index 5a2c9a01..5a2c9a01 100644
--- a/internal/system/wayland/wayland-client-helper.c
+++ b/internal/wayland/wayland-client-helper.c
diff --git a/internal/system/wayland/wayland-client-helper.h b/internal/wayland/wayland-client-helper.h
index eae8936d..eae8936d 100644
--- a/internal/system/wayland/wayland-client-helper.h
+++ b/internal/wayland/wayland-client-helper.h
diff --git a/internal/system/wayland/wayland.go b/internal/wayland/wayland.go
index 7a8694cd..7a8694cd 100644
--- a/internal/system/wayland/wayland.go
+++ b/internal/wayland/wayland.go
diff --git a/internal/system/xcb/changehosts.go b/internal/xcb/changehosts.go
index 8b05614b..8b05614b 100644
--- a/internal/system/xcb/changehosts.go
+++ b/internal/xcb/changehosts.go
diff --git a/internal/system/xcb/xcb.go b/internal/xcb/xcb.go
index 3dc62c3f..3dc62c3f 100644
--- a/internal/system/xcb/xcb.go
+++ b/internal/xcb/xcb.go