diff --git a/main.go b/cmd/tui/main.go
similarity index 98%
rename from main.go
rename to cmd/tui/main.go
index b0bb96f..1c39581 100644
--- a/main.go
+++ b/cmd/tui/main.go
@@ -2,17 +2,16 @@ package main
 
 import (
 	"fmt"
-	"log"
-	"strings"
-	//"whspbrd/systray"
-	"whspbrd/term_image"
-
-	//"image"
 	_ "image/jpeg"
 	_ "image/png"
+	"log"
+	"strings"
 
 	"github.com/jroimartin/gocui"
 	//"github.com/dolmen-go/kittyimg"
+
+	//"whspbrd/pkg/systray"
+	"whspbrd/pkg/term_image"
 )
 
 var messages []string
diff --git a/icons/iconunix.go b/pkg/icons/iconunix.go
similarity index 100%
rename from icons/iconunix.go
rename to pkg/icons/iconunix.go
diff --git a/icons/iconwin.go b/pkg/icons/iconwin.go
similarity index 100%
rename from icons/iconwin.go
rename to pkg/icons/iconwin.go
diff --git a/systray/systray.go b/pkg/systray/systray.go
similarity index 97%
rename from systray/systray.go
rename to pkg/systray/systray.go
index 8c61377..315ac54 100644
--- a/systray/systray.go
+++ b/pkg/systray/systray.go
@@ -3,7 +3,7 @@ package systray
 import (
 	"os"
 	"os/exec"
-	"whspbrd/icons"
+	"whspbrd/pkg/icons"
 
 	"github.com/getlantern/systray"
 )
diff --git a/term_image/render_image.go b/pkg/term_image/render_image.go
similarity index 100%
rename from term_image/render_image.go
rename to pkg/term_image/render_image.go