diff --git a/cli/htmgo/debounce.go b/cli/htmgo/debounce.go
index 95f173b..67c4759 100644
--- a/cli/htmgo/debounce.go
+++ b/cli/htmgo/debounce.go
@@ -1,4 +1,4 @@
-package htmgo
+package main
 
 import (
 	"sync"
diff --git a/cli/htmgo/logger.go b/cli/htmgo/logger.go
index f486709..053adc8 100644
--- a/cli/htmgo/logger.go
+++ b/cli/htmgo/logger.go
@@ -1,4 +1,4 @@
-package htmgo
+package main
 
 import (
 	"log/slog"
diff --git a/cli/htmgo/runner.go b/cli/htmgo/runner.go
index 9a0cf61..d835fcf 100644
--- a/cli/htmgo/runner.go
+++ b/cli/htmgo/runner.go
@@ -4,13 +4,13 @@ import (
 	"bufio"
 	"flag"
 	"fmt"
-	"github.com/maddalax/htmgo/cli/tasks/astgen"
-	"github.com/maddalax/htmgo/cli/tasks/copyassets"
-	"github.com/maddalax/htmgo/cli/tasks/css"
-	"github.com/maddalax/htmgo/cli/tasks/downloadtemplate"
-	"github.com/maddalax/htmgo/cli/tasks/process"
-	"github.com/maddalax/htmgo/cli/tasks/reloader"
-	"github.com/maddalax/htmgo/cli/tasks/run"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/astgen"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/copyassets"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/css"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/downloadtemplate"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/reloader"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/run"
 	"log/slog"
 	"os"
 	"strings"
diff --git a/cli/htmgo/signals.go b/cli/htmgo/signals.go
index b1552d5..e7c4497 100644
--- a/cli/htmgo/signals.go
+++ b/cli/htmgo/signals.go
@@ -1,8 +1,8 @@
-package htmgo
+package main
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/cli/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 	"os"
 	"os/signal"
 	"syscall"
diff --git a/cli/htmgo/tasks/astgen/entry.go b/cli/htmgo/tasks/astgen/entry.go
index 96454db..97d12c2 100644
--- a/cli/htmgo/tasks/astgen/entry.go
+++ b/cli/htmgo/tasks/astgen/entry.go
@@ -2,7 +2,7 @@ package astgen
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/cli/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 	"go/ast"
 	"go/parser"
 	"go/token"
diff --git a/cli/htmgo/tasks/astgen/writer.go b/cli/htmgo/tasks/astgen/writer.go
index e2a1822..f19241d 100644
--- a/cli/htmgo/tasks/astgen/writer.go
+++ b/cli/htmgo/tasks/astgen/writer.go
@@ -1,7 +1,7 @@
 package astgen
 
 import (
-	"github.com/maddalax/htmgo/cli/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 	"go/ast"
 	"go/format"
 	"go/parser"
diff --git a/cli/htmgo/tasks/copyassets/bundle.go b/cli/htmgo/tasks/copyassets/bundle.go
index 71ad73c..fd5285f 100644
--- a/cli/htmgo/tasks/copyassets/bundle.go
+++ b/cli/htmgo/tasks/copyassets/bundle.go
@@ -2,8 +2,8 @@ package copyassets
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/cli/tasks/module"
-	"github.com/maddalax/htmgo/cli/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/module"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 	"golang.org/x/mod/modfile"
 	"io"
 	"log"
diff --git a/cli/htmgo/tasks/css/css.go b/cli/htmgo/tasks/css/css.go
index 1e8a20a..3e2f8f1 100644
--- a/cli/htmgo/tasks/css/css.go
+++ b/cli/htmgo/tasks/css/css.go
@@ -1,6 +1,6 @@
 package css
 
-import "github.com/maddalax/htmgo/cli/tasks/process"
+import "github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 
 func GenerateCss(flags ...process.RunFlag) error {
 	return process.RunMany([]string{
diff --git a/cli/htmgo/tasks/downloadtemplate/main.go b/cli/htmgo/tasks/downloadtemplate/main.go
index 63cc955..c176386 100644
--- a/cli/htmgo/tasks/downloadtemplate/main.go
+++ b/cli/htmgo/tasks/downloadtemplate/main.go
@@ -3,9 +3,9 @@ package downloadtemplate
 import (
 	"flag"
 	"fmt"
-	"github.com/maddalax/htmgo/cli/tasks/process"
-	"github.com/maddalax/htmgo/cli/tasks/run"
-	"github.com/maddalax/htmgo/cli/tasks/util"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/run"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/util"
 	"os"
 	"os/exec"
 	"path/filepath"
diff --git a/cli/htmgo/tasks/reloader/reloader.go b/cli/htmgo/tasks/reloader/reloader.go
index 8d23eda..1878cb5 100644
--- a/cli/htmgo/tasks/reloader/reloader.go
+++ b/cli/htmgo/tasks/reloader/reloader.go
@@ -3,10 +3,10 @@ package reloader
 import (
 	"fmt"
 	"github.com/fsnotify/fsnotify"
-	"github.com/maddalax/htmgo/cli/tasks/astgen"
-	"github.com/maddalax/htmgo/cli/tasks/process"
-	"github.com/maddalax/htmgo/cli/tasks/run"
-	"github.com/maddalax/htmgo/cli/tasks/util"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/astgen"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/run"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/util"
 	"log/slog"
 	"strings"
 	"sync"
diff --git a/cli/htmgo/tasks/run/build.go b/cli/htmgo/tasks/run/build.go
index dcfa6ce..6f2d530 100644
--- a/cli/htmgo/tasks/run/build.go
+++ b/cli/htmgo/tasks/run/build.go
@@ -1,9 +1,9 @@
 package run
 
 import (
-	"github.com/maddalax/htmgo/cli/tasks/astgen"
-	"github.com/maddalax/htmgo/cli/tasks/css"
-	"github.com/maddalax/htmgo/cli/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/astgen"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/css"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 )
 
 func Build() {
diff --git a/cli/htmgo/tasks/run/entschema.go b/cli/htmgo/tasks/run/entschema.go
index e9a9daa..168fc3a 100644
--- a/cli/htmgo/tasks/run/entschema.go
+++ b/cli/htmgo/tasks/run/entschema.go
@@ -1,6 +1,6 @@
 package run
 
-import "github.com/maddalax/htmgo/cli/tasks/process"
+import "github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 
 func EntNewSchema(name string) {
 	process.RunOrExit("bash -c GOWORK=off go run -mod=mod entgo.io/ent/cmd/ent new " + name)
diff --git a/cli/htmgo/tasks/run/runserver.go b/cli/htmgo/tasks/run/runserver.go
index 4547cad..02116b3 100644
--- a/cli/htmgo/tasks/run/runserver.go
+++ b/cli/htmgo/tasks/run/runserver.go
@@ -1,6 +1,6 @@
 package run
 
-import "github.com/maddalax/htmgo/cli/tasks/process"
+import "github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 
 func Server(flags ...process.RunFlag) error {
 	return process.Run("go run .", flags...)
diff --git a/cli/htmgo/tasks/run/setup.go b/cli/htmgo/tasks/run/setup.go
index b7d7499..39e202a 100644
--- a/cli/htmgo/tasks/run/setup.go
+++ b/cli/htmgo/tasks/run/setup.go
@@ -1,10 +1,10 @@
 package run
 
 import (
-	"github.com/maddalax/htmgo/cli/tasks/astgen"
-	"github.com/maddalax/htmgo/cli/tasks/copyassets"
-	"github.com/maddalax/htmgo/cli/tasks/css"
-	"github.com/maddalax/htmgo/cli/tasks/process"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/astgen"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/copyassets"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/css"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 )
 
 func Setup() {
diff --git a/cli/htmgo/watcher.go b/cli/htmgo/watcher.go
index 704f680..930017f 100644
--- a/cli/htmgo/watcher.go
+++ b/cli/htmgo/watcher.go
@@ -1,4 +1,4 @@
-package htmgo
+package main
 
 import (
 	"github.com/fsnotify/fsnotify"