diff --git a/Makefile b/Makefile
index 245001aaf..d2772bcb4 100644
--- a/Makefile
+++ b/Makefile
@@ -39,16 +39,16 @@ checks:
 .PHONY: patch minor major detach
 
 patch:
-	go run ./internal/releaser/ release -m patch
+	go run ./internal/generators/releaser/ release -m patch
 
 minor:
-	go run ./internal/releaser/ release -m minor
+	go run ./internal/generators/releaser/ release -m minor
 
 major:
-	go run ./internal/releaser/ release -m major
+	go run ./internal/generators/releaser/ release -m major
 
 detach:
-	go run ./internal/releaser/ detach
+	go run ./internal/generators/releaser/ detach
 
 # Docs
 .PHONY: docs-build docs-serve docs-themes
diff --git a/internal/clihelp/generator.go b/internal/generators/clihelp/generator.go
similarity index 97%
rename from internal/clihelp/generator.go
rename to internal/generators/clihelp/generator.go
index 48fd10708..9bb5a71c6 100644
--- a/internal/clihelp/generator.go
+++ b/internal/generators/clihelp/generator.go
@@ -15,7 +15,7 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
-const outputFile = "../../docs/data/zz_cli_help.toml"
+const outputFile = "../../../docs/data/zz_cli_help.toml"
 
 const baseTemplate = `# THIS FILE IS AUTO-GENERATED. PLEASE DO NOT EDIT.
 
diff --git a/internal/dns/descriptors/descriptors.go b/internal/generators/dns/descriptors/descriptors.go
similarity index 100%
rename from internal/dns/descriptors/descriptors.go
rename to internal/generators/dns/descriptors/descriptors.go
diff --git a/internal/dns/docs/generator.go b/internal/generators/dns/docs/generator.go
similarity index 97%
rename from internal/dns/docs/generator.go
rename to internal/generators/dns/docs/generator.go
index 100b1b603..48b835963 100644
--- a/internal/dns/docs/generator.go
+++ b/internal/generators/dns/docs/generator.go
@@ -17,14 +17,14 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/go-acme/lego/v5/internal/dns/descriptors"
+	"github.com/go-acme/lego/v5/internal/generators/dns/descriptors"
 )
 
 //go:embed templates
 var templateFS embed.FS
 
 const (
-	root = "../../../"
+	root = "../../../../"
 
 	cliOutput  = root + "cmd/zz_gen_cmd_dnshelp.go"
 	docOutput  = root + "docs/content/dns"
diff --git a/internal/dns/docs/templates/dns.go.tmpl b/internal/generators/dns/docs/templates/dns.go.tmpl
similarity index 100%
rename from internal/dns/docs/templates/dns.go.tmpl
rename to internal/generators/dns/docs/templates/dns.go.tmpl
diff --git a/internal/dns/docs/templates/dns.md.tmpl b/internal/generators/dns/docs/templates/dns.md.tmpl
similarity index 100%
rename from internal/dns/docs/templates/dns.md.tmpl
rename to internal/generators/dns/docs/templates/dns.md.tmpl
diff --git a/internal/dns/docs/templates/readme.md.tmpl b/internal/generators/dns/docs/templates/readme.md.tmpl
similarity index 100%
rename from internal/dns/docs/templates/readme.md.tmpl
rename to internal/generators/dns/docs/templates/readme.md.tmpl
diff --git a/internal/dns/providers/dns_providers.go.tmpl b/internal/generators/dns/providers/dns_providers.go.tmpl
similarity index 100%
rename from internal/dns/providers/dns_providers.go.tmpl
rename to internal/generators/dns/providers/dns_providers.go.tmpl
diff --git a/internal/dns/providers/generator.go b/internal/generators/dns/providers/generator.go
similarity index 92%
rename from internal/dns/providers/generator.go
rename to internal/generators/dns/providers/generator.go
index df1434566..ef33a17ba 100644
--- a/internal/dns/providers/generator.go
+++ b/internal/generators/dns/providers/generator.go
@@ -13,11 +13,11 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/go-acme/lego/v5/internal/dns/descriptors"
+	"github.com/go-acme/lego/v5/internal/generators/dns/descriptors"
 )
 
 const (
-	root = "../../../"
+	root = "../../../../"
 
 	outputPath = "providers/dns/zz_gen_dns_providers.go"
 )
diff --git a/internal/releaser/generator.go b/internal/generators/releaser/generator.go
similarity index 100%
rename from internal/releaser/generator.go
rename to internal/generators/releaser/generator.go
diff --git a/internal/releaser/releaser.go b/internal/generators/releaser/releaser.go
similarity index 100%
rename from internal/releaser/releaser.go
rename to internal/generators/releaser/releaser.go
diff --git a/internal/releaser/templates/dns.go.tmpl b/internal/generators/releaser/templates/dns.go.tmpl
similarity index 100%
rename from internal/releaser/templates/dns.go.tmpl
rename to internal/generators/releaser/templates/dns.go.tmpl
diff --git a/internal/releaser/templates/sender.go.tmpl b/internal/generators/releaser/templates/sender.go.tmpl
similarity index 100%
rename from internal/releaser/templates/sender.go.tmpl
rename to internal/generators/releaser/templates/sender.go.tmpl
diff --git a/internal/releaser/templates/version.go.tmpl b/internal/generators/releaser/templates/version.go.tmpl
similarity index 100%
rename from internal/releaser/templates/version.go.tmpl
rename to internal/generators/releaser/templates/version.go.tmpl