diff --git a/tpl/diagrams/diagrams.go b/tpl/diagrams/diagrams.go
index d5d19b08b..dfa29a978 100644
--- a/tpl/diagrams/diagrams.go
+++ b/tpl/diagrams/diagrams.go
@@ -14,14 +14,7 @@
 package diagrams
 
 import (
-	"bytes"
 	"html/template"
-	"io"
-	"strings"
-
-	"github.com/bep/goat"
-	"github.com/gohugoio/hugo/deps"
-	"github.com/spf13/cast"
 )
 
 type SVGDiagram interface {
@@ -38,46 +31,3 @@ type SVGDiagram interface {
 	// Height returns the height of the SVG.
 	Height() int
 }
-
-type goatDiagram struct {
-	d goat.SVG
-}
-
-func (d goatDiagram) Inner() template.HTML {
-	return template.HTML(d.d.Body)
-}
-
-func (d goatDiagram) Wrapped() template.HTML {
-	return template.HTML(d.d.String())
-}
-
-func (d goatDiagram) Width() int {
-	return d.d.Width
-}
-
-func (d goatDiagram) Height() int {
-	return d.d.Height
-}
-
-// Namespace provides template functions for the diagrams namespace.
-type Namespace struct {
-	d *deps.Deps
-}
-
-// Goat creates a new SVG diagram from input v.
-func (d *Namespace) Goat(v any) SVGDiagram {
-	var r io.Reader
-
-	switch vv := v.(type) {
-	case io.Reader:
-		r = vv
-	case []byte:
-		r = bytes.NewReader(vv)
-	default:
-		r = strings.NewReader(cast.ToString(v))
-	}
-
-	return goatDiagram{
-		d: goat.BuildSVG(r),
-	}
-}
diff --git a/tpl/diagrams/goat.go b/tpl/diagrams/goat.go
new file mode 100644
index 000000000..f3d4f4bfb
--- /dev/null
+++ b/tpl/diagrams/goat.go
@@ -0,0 +1,68 @@
+// Copyright 2022 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package diagrams
+
+import (
+	"bytes"
+	"html/template"
+	"io"
+	"strings"
+
+	"github.com/bep/goat"
+	"github.com/gohugoio/hugo/deps"
+	"github.com/spf13/cast"
+)
+
+type goatDiagram struct {
+	d goat.SVG
+}
+
+func (d goatDiagram) Inner() template.HTML {
+	return template.HTML(d.d.Body)
+}
+
+func (d goatDiagram) Wrapped() template.HTML {
+	return template.HTML(d.d.String())
+}
+
+func (d goatDiagram) Width() int {
+	return d.d.Width
+}
+
+func (d goatDiagram) Height() int {
+	return d.d.Height
+}
+
+// Namespace provides template functions for the diagrams namespace.
+type Namespace struct {
+	d *deps.Deps
+}
+
+// Goat creates a new SVG diagram from input v.
+func (d *Namespace) Goat(v any) SVGDiagram {
+	var r io.Reader
+
+	switch vv := v.(type) {
+	case io.Reader:
+		r = vv
+	case []byte:
+		r = bytes.NewReader(vv)
+	default:
+		r = strings.NewReader(cast.ToString(v))
+	}
+
+	return goatDiagram{
+		d: goat.BuildSVG(r),
+	}
+}