diff --git a/Taskfile.yml b/Taskfile.yml
index b1d1188..33a79aa 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -3,5 +3,4 @@ version: '3'
 tasks:
   package-w:
     cmds:
-      - go build .
-      - fyne package -os windows -icon asset/icon.jpg -name AnimeGUI
\ No newline at end of file
+      - fyne package --sourceDir ./src/ -os windows -icon ../asset/icon.jpg -name AnimeGUI
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 2264c17..bff7df0 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/bep/debounce v1.2.1
 	github.com/charmbracelet/log v0.4.0
 	github.com/rl404/verniy v0.3.1
-	github.com/wraient/curd v1.0.5
 )
 
 require (
diff --git a/addingAnime.go b/src/addingAnime.go
similarity index 95%
rename from addingAnime.go
rename to src/addingAnime.go
index da0c469..65b2c0b 100644
--- a/addingAnime.go
+++ b/src/addingAnime.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"AnimeGUI/anilist"
+	"AnimeGUI/src/anilist"
 	"fmt"
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
@@ -49,6 +49,7 @@ func setDialogAddAnime() {
 		fmt.Printf("Result: %+v\n", result)
 	}
 	buttonSearch := widget.NewButtonWithIcon("", theme.SearchIcon(), func() { inputSearch.OnSubmitted(inputSearch.Text) })
+	buttonSearch.Importance = widget.WarningImportance
 	searchBar := container.NewBorder(nil, nil, nil, buttonSearch, inputSearch)
 
 	dialogAdd := dialog.NewCustom("Add new anime from Anilist", "Cancel", container.NewBorder(searchBar, nil, nil, nil, listContainer), window)
diff --git a/anilist/anilist.go b/src/anilist/anilist.go
similarity index 100%
rename from anilist/anilist.go
rename to src/anilist/anilist.go
diff --git a/curdIntegration.go b/src/curdIntegration.go
similarity index 100%
rename from curdIntegration.go
rename to src/curdIntegration.go
diff --git a/main.go b/src/main.go
similarity index 99%
rename from main.go
rename to src/main.go
index bea270b..6ba365c 100644
--- a/main.go
+++ b/src/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"AnimeGUI/anilist"
 	curd "AnimeGUI/curdInteg"
+	"AnimeGUI/src/anilist"
 	"fmt"
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
@@ -173,7 +173,7 @@ func initMainApp() {
 		})
 
 	input := widget.NewEntry()
-	input.SetPlaceHolder("Anime name")
+	input.SetPlaceHolder("Filter anime name")
 	input.OnChanged = func(s string) {
 		debounced(func() {
 			fmt.Println(s)
@@ -192,12 +192,12 @@ func initMainApp() {
 	radiobox.Horizontal = true
 
 	toolbar := widget.NewToolbar(
+		widget.NewToolbarAction(theme.ViewRefreshIcon(), func() {}),
+		widget.NewToolbarSeparator(),
 		widget.NewToolbarAction(theme.ContentAddIcon(), func() {
 			setDialogAddAnime()
 		}),
 		widget.NewToolbarSeparator(),
-		widget.NewToolbarAction(theme.ViewRefreshIcon(), func() {}),
-		widget.NewToolbarSeparator(),
 		widget.NewToolbarAction(theme.MailAttachmentIcon(), func() {
 			if animeSelected == nil {
 				_ = appW.OpenURL(&url.URL{Scheme: "https", Host: "anilist.co", Path: "search/anime"})
diff --git a/mpvInstall.go b/src/mpvInstall.go
similarity index 100%
rename from mpvInstall.go
rename to src/mpvInstall.go
diff --git a/setToken.go b/src/setToken.go
similarity index 100%
rename from setToken.go
rename to src/setToken.go
diff --git a/theme.go b/src/theme.go
similarity index 100%
rename from theme.go
rename to src/theme.go