diff --git a/main.go b/main.go
index 1e946d8..866177d 100644
--- a/main.go
+++ b/main.go
@@ -4,34 +4,17 @@ import (
 	"fmt"
 
 	"git.dotya.ml/wanderer/go-xkcdreader/cmd"
-
-	"fyne.io/fyne/v2/app"
-	"fyne.io/fyne/v2/widget"
+	"git.dotya.ml/wanderer/go-xkcdreader/xkcdreader"
 )
 
-const appGreeting = "welcome to go-xkcdreader"
-
 var version = cmd.GetShortVersion()
 
 func main() {
 	cmd.Execute()
 
-	fmt.Println("Starting " + cmd.GetAppName() + " " + getVersion())
+	fmt.Println("Starting " + cmd.GetAppName() + " " + version)
 
-	a := app.New()
-	w := a.NewWindow(cmd.GetAppName())
-
-	w.SetContent(makeGreeting())
-
-	w.ShowAndRun()
+	xkcdreader.RunApp()
 
 	fmt.Println("Exited")
 }
-
-func makeGreeting() *widget.Label {
-	return widget.NewLabel(appGreeting)
-}
-
-func getVersion() string {
-	return version
-}
diff --git a/main_test.go b/main_test.go
index 7f8aa89..2c59d34 100644
--- a/main_test.go
+++ b/main_test.go
@@ -2,28 +2,8 @@ package main
 
 import (
 	"testing"
-
-	"git.dotya.ml/wanderer/go-xkcdreader/cmd"
 )
 
-func TestGreetingText(t *testing.T) {
-	want := "welcome to " + cmd.GetAppName()
-	got := makeGreeting()
-
-	if got.Text != want {
-		t.Errorf("Incorrect initial greeting, want: %q, got: %q", want, got.Text)
-	}
-}
-
-func TestLocalgetVersion(t *testing.T) {
-	want := version
-	got := getVersion()
-
-	if got != want {
-		t.Errorf("Incorrect version from getVersion, want: %q, got: %q", want, got)
-	}
-}
-
 // does this test even make sense?
 func TestExecMain(t *testing.T) {
 	go main()
diff --git a/xkcdreader/app.go b/xkcdreader/app.go
new file mode 100644
index 0000000..b1740d0
--- /dev/null
+++ b/xkcdreader/app.go
@@ -0,0 +1,24 @@
+package xkcdreader
+
+import (
+	"fyne.io/fyne/v2/app"
+	"fyne.io/fyne/v2/widget"
+	"git.dotya.ml/wanderer/go-xkcdreader/cmd"
+)
+
+const appGreeting = "welcome to go-xkcdreader"
+
+// RunApp performs sets up and runs the main application
+func RunApp() {
+	a := app.New()
+	w := a.NewWindow(cmd.GetAppName())
+
+	w.SetContent(makeGreeting())
+
+	w.ShowAndRun()
+}
+
+// makeGreeting creates a greeting label
+func makeGreeting() *widget.Label {
+	return widget.NewLabel(appGreeting)
+}
diff --git a/xkcdreader/app_test.go b/xkcdreader/app_test.go
new file mode 100644
index 0000000..48684dc
--- /dev/null
+++ b/xkcdreader/app_test.go
@@ -0,0 +1,16 @@
+package xkcdreader
+
+import (
+	"testing"
+
+	"git.dotya.ml/wanderer/go-xkcdreader/cmd"
+)
+
+func TestGreetingText(t *testing.T) {
+	want := "welcome to " + cmd.GetAppName()
+	got := makeGreeting()
+
+	if got.Text != want {
+		t.Errorf("Incorrect initial greeting, want: %q, got: %q", want, got.Text)
+	}
+}