diff --git a/.gitignore b/.gitignore
index 8a4975b..802e0fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ tests/*
 atomctl
 AGENTS.md
 atom
+atomctl-tests
diff --git a/templates/project/app/commands/event/event.go.tpl b/templates/project/app/commands/event/event.go.tpl
index 76de214..ba425f6 100644
--- a/templates/project/app/commands/event/event.go.tpl
+++ b/templates/project/app/commands/event/event.go.tpl
@@ -6,6 +6,7 @@ import (
 	"go.ipao.vip/atom"
 	"go.ipao.vip/atom/container"
 	"go.ipao.vip/atom/contracts"
+	"{{.ModuleName}}/app/commands"
 	"{{.ModuleName}}/app/events/subscribers"
 	"{{.ModuleName}}/providers/app"
 	"{{.ModuleName}}/providers/event"
@@ -17,7 +18,7 @@ import (
 )
 
 func defaultProviders() container.Providers {
-	return srv.Default(container.Providers{
+	return commands.Default(container.Providers{
 		postgres.DefaultProvider(),
 	}...)
 }
diff --git a/templates/project/app/commands/grpc/grpc.go.tpl b/templates/project/app/commands/grpc/grpc.go.tpl
index b9ba97b..f2c1589 100644
--- a/templates/project/app/commands/grpc/grpc.go.tpl
+++ b/templates/project/app/commands/grpc/grpc.go.tpl
@@ -4,6 +4,7 @@ import (
 	"go.ipao.vip/atom"
 	"go.ipao.vip/atom/container"
 	"go.ipao.vip/atom/contracts"
+	"{{.ModuleName}}/app/commands"
 	"{{.ModuleName}}/app/grpc/users"
 	"{{.ModuleName}}/providers/app"
 	"{{.ModuleName}}/providers/grpc"
@@ -15,7 +16,7 @@ import (
 )
 
 func defaultProviders() container.Providers {
-	return srv.Default(container.Providers{
+	return commands.Default(container.Providers{
 		postgres.DefaultProvider(),
 		grpc.DefaultProvider(),
 	}...)
diff --git a/templates/project/app/commands/http/http.go.tpl b/templates/project/app/commands/http/http.go.tpl
index 23c248d..ee8290a 100644
--- a/templates/project/app/commands/http/http.go.tpl
+++ b/templates/project/app/commands/http/http.go.tpl
@@ -6,6 +6,7 @@ import (
 	"go.ipao.vip/atom"
 	"go.ipao.vip/atom/container"
 	"go.ipao.vip/atom/contracts"
+	"{{.ModuleName}}/app/commands"
 	"{{.ModuleName}}/app/errorx"
 	"{{.ModuleName}}/app/jobs"
 	_ "{{.ModuleName}}/docs"
@@ -23,7 +24,7 @@ import (
 )
 
 func defaultProviders() container.Providers {
-	return srv.Default(container.Providers{
+	return commands.Default(container.Providers{
 		http.DefaultProvider(),
 		postgres.DefaultProvider(),
 		jwt.DefaultProvider(),
diff --git a/templates/project/app/commands/migrate/migrate.go.tpl b/templates/project/app/commands/migrate/migrate.go.tpl
index 37c13e6..44c8448 100644
--- a/templates/project/app/commands/migrate/migrate.go.tpl
+++ b/templates/project/app/commands/migrate/migrate.go.tpl
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 
+	"{{.ModuleName}}/app/commands"
 	"{{.ModuleName}}/database"
 	"{{.ModuleName}}/providers/postgres"
 
@@ -19,7 +20,7 @@ import (
 )
 
 func defaultProviders() container.Providers {
-	return srv.Default(container.Providers{
+	return commands.Default(container.Providers{
 		postgres.DefaultProvider(),
 	}...)
 }
diff --git a/templates/project/app/commands/queue/river.go.tpl b/templates/project/app/commands/queue/river.go.tpl
index 8ac1692..6204ee9 100644
--- a/templates/project/app/commands/queue/river.go.tpl
+++ b/templates/project/app/commands/queue/river.go.tpl
@@ -7,6 +7,7 @@ import (
 	"go.ipao.vip/atom/container"
 	"go.ipao.vip/atom/contracts"
 
+	"{{.ModuleName}}/app/commands"
 	"{{.ModuleName}}/app/jobs"
 	"{{.ModuleName}}/providers/app"
 	"{{.ModuleName}}/providers/job"
@@ -18,7 +19,7 @@ import (
 )
 
 func defaultProviders() container.Providers {
-	return srv.Default(container.Providers{
+	return commands.Default(container.Providers{
 		postgres.DefaultProvider(),
 		job.DefaultProvider(),
 	}...)
diff --git a/templates/project/app/commands/service.go.tpl b/templates/project/app/commands/service.go.tpl
index a0b058c..1717786 100644
--- a/templates/project/app/commands/service.go.tpl
+++ b/templates/project/app/commands/service.go.tpl
@@ -1,4 +1,4 @@
-package srv
+package commands
 
 import (
 	"go.ipao.vip/atom/container"