diff --git a/plugin/pluginator/main.go b/cmd/pluginator/main.go
similarity index 98%
rename from plugin/pluginator/main.go
rename to cmd/pluginator/main.go
index 91c13e532..cd44002cc 100644
--- a/plugin/pluginator/main.go
+++ b/cmd/pluginator/main.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-// See plugin/doc.go for an explanation.
+// See /plugin/doc.go for an explanation.
 package main
 
 import (
diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go
index d6e2c5ad0..9bc4a89ae 100644
--- a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go
+++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go
index 6a64e0d6b..880186715 100644
--- a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go
+++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/hashtransformer/HashTransformer.go b/plugin/builtin/hashtransformer/HashTransformer.go
index 467699101..bb8231355 100644
--- a/plugin/builtin/hashtransformer/HashTransformer.go
+++ b/plugin/builtin/hashtransformer/HashTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go
index 3ac9b48c3..669833015 100644
--- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go
+++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go
index 5badffa1c..d7af26b65 100644
--- a/plugin/builtin/inventorytransformer/InventoryTransformer.go
+++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/labeltransformer/LabelTransformer.go b/plugin/builtin/labeltransformer/LabelTransformer.go
index 65e8f0bb2..804930d0c 100644
--- a/plugin/builtin/labeltransformer/LabelTransformer.go
+++ b/plugin/builtin/labeltransformer/LabelTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go
index a0e9a6fce..6e0ec7184 100644
--- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go
+++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer.go b/plugin/builtin/namespacetransformer/NamespaceTransformer.go
index def43993a..6cfa167b7 100644
--- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go
+++ b/plugin/builtin/namespacetransformer/NamespaceTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go
index 1cd0027e4..24ea388ad 100644
--- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go
+++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go
index 7024f3f4e..e800afcde 100644
--- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go
+++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go
index fe264ee61..b03062399 100644
--- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go
+++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/builtin/secretgenerator/SecretGenerator.go b/plugin/builtin/secretgenerator/SecretGenerator.go
index aa955304b..4512dc8ad 100644
--- a/plugin/builtin/secretgenerator/SecretGenerator.go
+++ b/plugin/builtin/secretgenerator/SecretGenerator.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:generate go run sigs.k8s.io/kustomize/plugin/pluginator
+//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator
 package main
 
 import (
diff --git a/plugin/doc.go b/plugin/doc.go
index 40f9da59d..e79bfaaf8 100644
--- a/plugin/doc.go
+++ b/plugin/doc.go
@@ -4,14 +4,12 @@
 /*
 
 Package plugin contains builtin and example
-plugins, tests and test libraries, and a code
-generator for converting a plugin to statically
-loadable code (see pluginator).
+plugins, tests and test libraries.
 
-See ../../docs/plugins.md for a description of
+See /docs/plugins.md for a description of
 writing and testing a plugin.  The information
 here is supplemental to that, and more oriented to
-how the builting plugins work.
+how the builtin plugins work.
 
 
 HOW PLUGINS RUN
diff --git a/plugin/generateBuiltins.sh b/plugin/generateBuiltins.sh
index e12db613b..4ab12eed5 100755
--- a/plugin/generateBuiltins.sh
+++ b/plugin/generateBuiltins.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 #
-# This script creates the generator and
+# Generate the Go code for the generator and
 # transformer factory functions in
+#
 #   sigs.k8s.io/kustomize/plugin/builtin
-# by generating code based on the plugins
-# found below that directory.
+#
+# from the raw plugin directories found _below_
+# that directory.
 
 set -e