diff --git a/Makefile b/Makefile
index 2473faf..599a156 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ APP_ID ?= org.julianfamily.keepassgo
 APK_OUT ?= build/keepassgo.apk
 APK_VERSION ?= 0.1.0.1
 APP_VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
-GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo.appVersion=$(APP_VERSION)
+GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo/internal/appui.appVersion=$(APP_VERSION)
 ANDROID_MIN_SDK ?= 28
 ANDROID_TARGET_SDK ?= 35
 SIGNKEY ?=
diff --git a/README.md b/README.md
index 0691450..29f4929 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ By default, build outputs stamp the app version from `git describe --tags --alwa
 You can override the version shown in KeePassGO with:
 
 ```bash
-go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=v0.0.1" ./cmd/keepassgo
+go build -ldflags "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=v0.0.1" ./cmd/keepassgo
 ```
 
 ## Arch Linux Package
diff --git a/buildapk/config.go b/buildapk/config.go
index 6658884..35e53b3 100644
--- a/buildapk/config.go
+++ b/buildapk/config.go
@@ -13,7 +13,7 @@ const (
 	DefaultAppID     = "org.julianfamily.keepassgo"
 	DefaultAPKOut    = "build/keepassgo.apk"
 	DefaultVersion   = "0.1.0.1"
-	DefaultLdflags   = "-X git.julianfamily.org/keepassgo.appVersion=dev"
+	DefaultLdflags   = "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=dev"
 	DefaultMinSDK    = "28"
 	DefaultTargetSDK = "35"
 	DefaultIconPath  = "assets/keepassgo-icon.png"
diff --git a/cmd/keepassgo/main.go b/cmd/keepassgo/main.go
index c0387a2..b8a9aee 100644
--- a/cmd/keepassgo/main.go
+++ b/cmd/keepassgo/main.go
@@ -1,7 +1,7 @@
 package main
 
-import keepassgo "git.julianfamily.org/keepassgo"
+import "git.julianfamily.org/keepassgo/internal/appui"
 
 func main() {
-	keepassgo.Main()
+	appui.Main()
 }
diff --git a/android_share_android.go b/internal/appui/android_share_android.go
similarity index 99%
rename from android_share_android.go
rename to internal/appui/android_share_android.go
index 56022b7..a7d0769 100644
--- a/android_share_android.go
+++ b/internal/appui/android_share_android.go
@@ -1,6 +1,6 @@
 //go:build android
 
-package keepassgo
+package appui
 
 /*
 #cgo CFLAGS: -Werror
diff --git a/android_share_stub.go b/internal/appui/android_share_stub.go
similarity index 83%
rename from android_share_stub.go
rename to internal/appui/android_share_stub.go
index a57b5e7..9a557c5 100644
--- a/android_share_stub.go
+++ b/internal/appui/android_share_stub.go
@@ -1,6 +1,6 @@
 //go:build !android
 
-package keepassgo
+package appui
 
 func newPlatformVaultSharer(goos string) vaultSharer {
 	return nil
diff --git a/app.go b/internal/appui/app.go
similarity index 99%
rename from app.go
rename to internal/appui/app.go
index f32b357..5650081 100644
--- a/app.go
+++ b/internal/appui/app.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"crypto/sha256"
diff --git a/clipboard_gio.go b/internal/appui/clipboard_gio.go
similarity index 98%
rename from clipboard_gio.go
rename to internal/appui/clipboard_gio.go
index fd2c1fb..ac753fb 100644
--- a/clipboard_gio.go
+++ b/internal/appui/clipboard_gio.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"io"
diff --git a/clipboard_gio_test.go b/internal/appui/clipboard_gio_test.go
similarity index 98%
rename from clipboard_gio_test.go
rename to internal/appui/clipboard_gio_test.go
index 800e88a..18a6b35 100644
--- a/clipboard_gio_test.go
+++ b/internal/appui/clipboard_gio_test.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"slices"
diff --git a/main_test.go b/internal/appui/main_test.go
similarity index 99%
rename from main_test.go
rename to internal/appui/main_test.go
index 31e5dcf..fbc4b16 100644
--- a/main_test.go
+++ b/internal/appui/main_test.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"bytes"
diff --git a/ui_accessibility.go b/internal/appui/ui_accessibility.go
similarity index 99%
rename from ui_accessibility.go
rename to internal/appui/ui_accessibility.go
index 625eef0..2954f2b 100644
--- a/ui_accessibility.go
+++ b/internal/appui/ui_accessibility.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"fmt"
diff --git a/ui_api.go b/internal/appui/ui_api.go
similarity index 99%
rename from ui_api.go
rename to internal/appui/ui_api.go
index 1ea02fb..d1ba144 100644
--- a/ui_api.go
+++ b/internal/appui/ui_api.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"fmt"
diff --git a/ui_branding.go b/internal/appui/ui_branding.go
similarity index 98%
rename from ui_branding.go
rename to internal/appui/ui_branding.go
index d9da84a..396d742 100644
--- a/ui_branding.go
+++ b/internal/appui/ui_branding.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"image"
diff --git a/ui_editor.go b/internal/appui/ui_editor.go
similarity index 99%
rename from ui_editor.go
rename to internal/appui/ui_editor.go
index f7d8a00..f8a8155 100644
--- a/ui_editor.go
+++ b/internal/appui/ui_editor.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"fmt"
diff --git a/ui_forms.go b/internal/appui/ui_forms.go
similarity index 99%
rename from ui_forms.go
rename to internal/appui/ui_forms.go
index 8110614..eb80c7b 100644
--- a/ui_forms.go
+++ b/internal/appui/ui_forms.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"fmt"
diff --git a/ui_header_dropdown.go b/internal/appui/ui_header_dropdown.go
similarity index 99%
rename from ui_header_dropdown.go
rename to internal/appui/ui_header_dropdown.go
index 94c6c00..5a4f952 100644
--- a/ui_header_dropdown.go
+++ b/internal/appui/ui_header_dropdown.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"image"
diff --git a/ui_keyboard.go b/internal/appui/ui_keyboard.go
similarity index 99%
rename from ui_keyboard.go
rename to internal/appui/ui_keyboard.go
index 1af147d..0c0c70e 100644
--- a/ui_keyboard.go
+++ b/internal/appui/ui_keyboard.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"fmt"
diff --git a/ui_layout_header.go b/internal/appui/ui_layout_header.go
similarity index 99%
rename from ui_layout_header.go
rename to internal/appui/ui_layout_header.go
index 7fabfa2..83b73ac 100644
--- a/ui_layout_header.go
+++ b/internal/appui/ui_layout_header.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"image"
diff --git a/ui_layout_lifecycle.go b/internal/appui/ui_layout_lifecycle.go
similarity index 96%
rename from ui_layout_lifecycle.go
rename to internal/appui/ui_layout_lifecycle.go
index ecca665..77ee870 100644
--- a/ui_layout_lifecycle.go
+++ b/internal/appui/ui_layout_lifecycle.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"gioui.org/layout"
diff --git a/ui_preferences.go b/internal/appui/ui_preferences.go
similarity index 99%
rename from ui_preferences.go
rename to internal/appui/ui_preferences.go
index 13324f8..4ae7040 100644
--- a/ui_preferences.go
+++ b/internal/appui/ui_preferences.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"encoding/json"
diff --git a/ui_shortcuts.go b/internal/appui/ui_shortcuts.go
similarity index 99%
rename from ui_shortcuts.go
rename to internal/appui/ui_shortcuts.go
index fb4554d..6597259 100644
--- a/ui_shortcuts.go
+++ b/internal/appui/ui_shortcuts.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"strings"
diff --git a/ui_sync_dialog.go b/internal/appui/ui_sync_dialog.go
similarity index 99%
rename from ui_sync_dialog.go
rename to internal/appui/ui_sync_dialog.go
index bf847a1..02ad2a3 100644
--- a/ui_sync_dialog.go
+++ b/internal/appui/ui_sync_dialog.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"image/color"
diff --git a/ui_sync_menu_model.go b/internal/appui/ui_sync_menu_model.go
similarity index 99%
rename from ui_sync_menu_model.go
rename to internal/appui/ui_sync_menu_model.go
index 8ccc03c..e827f1e 100644
--- a/ui_sync_menu_model.go
+++ b/internal/appui/ui_sync_menu_model.go
@@ -1,4 +1,4 @@
-package keepassgo
+package appui
 
 import (
 	"runtime"
diff --git a/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl b/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl
index 83624c3..275088d 100644
--- a/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl
+++ b/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl
@@ -41,7 +41,7 @@ build() {
   export GOFLAGS="-trimpath"
   local app_version
   app_version="$(git describe --tags --always --dirty)"
-  go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo
+  go build -ldflags "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo
 }
 
 package() {