diff --git a/idiomatic/.gitignore b/template/.gitignore
similarity index 100%
rename from idiomatic/.gitignore
rename to template/.gitignore
diff --git a/idiomatic/Dockerfile b/template/Dockerfile
similarity index 100%
rename from idiomatic/Dockerfile
rename to template/Dockerfile
diff --git a/idiomatic/Makefile b/template/Makefile
similarity index 100%
rename from idiomatic/Makefile
rename to template/Makefile
diff --git a/idiomatic/README.md b/template/README.md
similarity index 100%
rename from idiomatic/README.md
rename to template/README.md
diff --git a/idiomatic/cmd/idiomatic/main.go b/template/cmd/idiomatic/main.go
similarity index 88%
rename from idiomatic/cmd/idiomatic/main.go
rename to template/cmd/idiomatic/main.go
index bf235ba..3948e07 100644
--- a/idiomatic/cmd/idiomatic/main.go
+++ b/template/cmd/idiomatic/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/micro/services/idiomatic/handler"
+	"github.com/micro/services/template/handler"
 
 	"github.com/micro/micro/v3/service"
 	"github.com/micro/micro/v3/service/logger"
diff --git a/template/cmd/template/main.go b/template/cmd/template/main.go
new file mode 100644
index 0000000..3948e07
--- /dev/null
+++ b/template/cmd/template/main.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"github.com/micro/services/template/handler"
+
+	"github.com/micro/micro/v3/service"
+	"github.com/micro/micro/v3/service/logger"
+)
+
+func main() {
+	// Create service
+	srv := service.New(
+		service.Name("idiomatic"),
+		service.Version("latest"),
+	)
+
+	// Register handler
+	srv.Handle(new(handler.Idiomatic))
+
+	// Run service
+	if err := srv.Run(); err != nil {
+		logger.Fatal(err)
+	}
+}
diff --git a/idiomatic/generate.go b/template/generate.go
similarity index 100%
rename from idiomatic/generate.go
rename to template/generate.go
diff --git a/idiomatic/handler/idiomatic.go b/template/handler/idiomatic.go
similarity index 95%
rename from idiomatic/handler/idiomatic.go
rename to template/handler/idiomatic.go
index bf0d7e2..4b2be89 100644
--- a/idiomatic/handler/idiomatic.go
+++ b/template/handler/idiomatic.go
@@ -5,7 +5,7 @@ import (
 
 	log "github.com/micro/micro/v3/service/logger"
 
-	idiomatic "github.com/micro/services/idiomatic/proto"
+	idiomatic "github.com/micro/services/template/proto"
 )
 
 type Idiomatic struct{}
diff --git a/idiomatic/proto/idiomatic.pb.go b/template/proto/idiomatic.pb.go
similarity index 100%
rename from idiomatic/proto/idiomatic.pb.go
rename to template/proto/idiomatic.pb.go
diff --git a/idiomatic/proto/idiomatic.pb.micro.go b/template/proto/idiomatic.pb.micro.go
similarity index 100%
rename from idiomatic/proto/idiomatic.pb.micro.go
rename to template/proto/idiomatic.pb.micro.go
diff --git a/idiomatic/proto/idiomatic.proto b/template/proto/idiomatic.proto
similarity index 100%
rename from idiomatic/proto/idiomatic.proto
rename to template/proto/idiomatic.proto