diff --git a/cmd/operator-sdk/add/api.go b/cmd/operator-sdk/add/api.go
index d4a4327d426..d9eac7047af 100644
--- a/cmd/operator-sdk/add/api.go
+++ b/cmd/operator-sdk/add/api.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 
 	"github.com/operator-framework/operator-sdk/cmd/operator-sdk/internal/genutil"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/operator-sdk/add/controller.go b/cmd/operator-sdk/add/controller.go
index d3ee17273a7..fde3646779a 100644
--- a/cmd/operator-sdk/add/controller.go
+++ b/cmd/operator-sdk/add/controller.go
@@ -17,9 +17,9 @@ package add
 import (
 	"fmt"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/operator-sdk/add/crd.go b/cmd/operator-sdk/add/crd.go
index 4c7c080924e..aa090f55bcb 100644
--- a/cmd/operator-sdk/add/crd.go
+++ b/cmd/operator-sdk/add/crd.go
@@ -20,9 +20,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/operator-sdk/build/cmd.go b/cmd/operator-sdk/build/cmd.go
index ebebb2fdff3..7e8961895d9 100644
--- a/cmd/operator-sdk/build/cmd.go
+++ b/cmd/operator-sdk/build/cmd.go
@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/pkg/test"
 
 	"github.com/ghodss/yaml"
diff --git a/cmd/operator-sdk/internal/genutil/genutil.go b/cmd/operator-sdk/internal/genutil/genutil.go
index c0f119e2848..be32d0e6459 100644
--- a/cmd/operator-sdk/internal/genutil/genutil.go
+++ b/cmd/operator-sdk/internal/genutil/genutil.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/cmd/operator-sdk/internal/genutil/k8s.go b/cmd/operator-sdk/internal/genutil/k8s.go
index 3bfa014ec91..2bfba291986 100644
--- a/cmd/operator-sdk/internal/genutil/k8s.go
+++ b/cmd/operator-sdk/internal/genutil/k8s.go
@@ -21,8 +21,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/cmd/operator-sdk/internal/genutil/openapi.go b/cmd/operator-sdk/internal/genutil/openapi.go
index 887846e13f8..333252e38cc 100644
--- a/cmd/operator-sdk/internal/genutil/openapi.go
+++ b/cmd/operator-sdk/internal/genutil/openapi.go
@@ -21,10 +21,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/cmd/operator-sdk/migrate/cmd.go b/cmd/operator-sdk/migrate/cmd.go
index c044da04bfe..aa8ad5ddc3d 100644
--- a/cmd/operator-sdk/migrate/cmd.go
+++ b/cmd/operator-sdk/migrate/cmd.go
@@ -19,11 +19,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/operator-sdk/new/cmd.go b/cmd/operator-sdk/new/cmd.go
index de93c751579..e10d5968bea 100644
--- a/cmd/operator-sdk/new/cmd.go
+++ b/cmd/operator-sdk/new/cmd.go
@@ -21,11 +21,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/operator-sdk/olmcatalog/gen-csv.go b/cmd/operator-sdk/olmcatalog/gen-csv.go
index 076e74140ff..720f60d5232 100644
--- a/cmd/operator-sdk/olmcatalog/gen-csv.go
+++ b/cmd/operator-sdk/olmcatalog/gen-csv.go
@@ -20,11 +20,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
+	catalog "github.com/operator-framework/operator-sdk/internal/pkg/scaffold/olm-catalog"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
-	catalog "github.com/operator-framework/operator-sdk/pkg/scaffold/olm-catalog"
 
 	"github.com/coreos/go-semver/semver"
 	log "github.com/sirupsen/logrus"
diff --git a/cmd/operator-sdk/printdeps/cmd.go b/cmd/operator-sdk/printdeps/cmd.go
index 4b8cfd6ad21..5a3ea3568d8 100644
--- a/cmd/operator-sdk/printdeps/cmd.go
+++ b/cmd/operator-sdk/printdeps/cmd.go
@@ -17,7 +17,7 @@ package printdeps
 import (
 	"fmt"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/operator-sdk/scorecard/cmd.go b/cmd/operator-sdk/scorecard/cmd.go
index bff50795e24..7acc21d9b0a 100644
--- a/cmd/operator-sdk/scorecard/cmd.go
+++ b/cmd/operator-sdk/scorecard/cmd.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/version"
 
 	log "github.com/sirupsen/logrus"
diff --git a/cmd/operator-sdk/scorecard/scorecard.go b/cmd/operator-sdk/scorecard/scorecard.go
index 82e88af5026..f3b35e207e3 100644
--- a/cmd/operator-sdk/scorecard/scorecard.go
+++ b/cmd/operator-sdk/scorecard/scorecard.go
@@ -22,10 +22,10 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 
 	"github.com/ghodss/yaml"
 	olmapiv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
diff --git a/cmd/operator-sdk/test/cluster.go b/cmd/operator-sdk/test/cluster.go
index ecefbb7cd8a..30777583539 100755
--- a/cmd/operator-sdk/test/cluster.go
+++ b/cmd/operator-sdk/test/cluster.go
@@ -20,12 +20,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 	k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
 	"github.com/operator-framework/operator-sdk/pkg/test"
 
 	log "github.com/sirupsen/logrus"
diff --git a/cmd/operator-sdk/test/local.go b/cmd/operator-sdk/test/local.go
index 06ef59d86a8..b2894df155d 100644
--- a/cmd/operator-sdk/test/local.go
+++ b/cmd/operator-sdk/test/local.go
@@ -22,10 +22,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/pkg/test"
 
 	"github.com/ghodss/yaml"
diff --git a/cmd/operator-sdk/up/local.go b/cmd/operator-sdk/up/local.go
index 9c115277291..e7ed894c052 100644
--- a/cmd/operator-sdk/up/local.go
+++ b/cmd/operator-sdk/up/local.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/pkg/ansible"
@@ -32,7 +33,6 @@ import (
 	hoflags "github.com/operator-framework/operator-sdk/pkg/helm/flags"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/log/zap"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 
 	log "github.com/sirupsen/logrus"
diff --git a/doc/dev/release.md b/doc/dev/release.md
index 9f2e2120b4b..719612676cb 100644
--- a/doc/dev/release.md
+++ b/doc/dev/release.md
@@ -174,13 +174,13 @@ $ git checkout -b release-v1.3.0
 Commit changes to the following six files:
 
 - `version/version.go`: update `Version` to `v1.3.0`.
-- `pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
+- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
   - Comment out `branch = "master"`
   - Un-comment `version = "v1.2.0"`
   - Change `v1.2.0` to `v1.3.0`
-- `pkg/scaffold/gopkgtoml_test.go`: same as for `pkg/scaffold/gopkgtoml.go`.
-- `pkg/scaffold/ansible/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
-- `pkg/scaffold/helm/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
+- `internal/pkg/scaffold/gopkgtoml_test.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
+- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
+- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
 - `CHANGELOG.md`: update the `## Unreleased` header to `## v1.3.0`.
 
 Create a new PR for `release-v1.3.0`.
@@ -214,12 +214,12 @@ Once this tag passes CI, go to step 3. For more info on tagging, see the [releas
 Check out a new branch from master (or use your `release-v1.3.0`) and commit the following changes:
 
 - `version/version.go`: update `Version` to `v1.3.0+git`.
-- `pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
+- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
   - Comment out `version = "v1.3.0"`
   - Un-comment `branch = "master"`
-- `pkg/scaffold/gopkgtoml_test.go`: same as for `pkg/scaffold/gopkgtoml.go`.
-- `pkg/scaffold/ansible/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
-- `pkg/scaffold/helm/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
+- `internal/pkg/scaffold/gopkgtoml_test.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
+- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
+- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
 - `CHANGELOG.md`: add the following as a new set of headers above `## v1.3.0`:
 
     ```markdown
diff --git a/doc/user/logging.md b/doc/user/logging.md
index ee1dd1baea0..20e04c13af9 100644
--- a/doc/user/logging.md
+++ b/doc/user/logging.md
@@ -117,5 +117,5 @@ If you do not want to use `logr` as your logging tool, you can remove `logr`-spe
 [godoc_logr_logger]:https://godoc.org/github.com/go-logr/logr#Logger
 [site_struct_logging]:https://www.client9.com/structured-logging-in-golang/
 [code_memcached_controller]:../../example/memcached-operator/memcached_controller.go.tmpl
-[code_set_logger]:https://github.com/operator-framework/operator-sdk/blob/ecd02000616f11303f1adecd3d4ceb4a8561a9ec/pkg/scaffold/cmd.go#L90-L94
+[code_set_logger]:https://github.com/operator-framework/operator-sdk/blob/4d66be409a69d169aaa29d470242a1defbaf08bb/internal/pkg/scaffold/cmd.go#L92-L96
 [zap_sampling]:https://github.com/uber-go/zap/blob/master/FAQ.md#why-sample-application-logs
diff --git a/hack/image/ansible/scaffold-ansible-image.go b/hack/image/ansible/scaffold-ansible-image.go
index 9031c7477f7..1a5d9c3a0b2 100644
--- a/hack/image/ansible/scaffold-ansible-image.go
+++ b/hack/image/ansible/scaffold-ansible-image.go
@@ -15,10 +15,10 @@
 package main
 
 import (
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/hack/image/helm/scaffold-helm-image.go b/hack/image/helm/scaffold-helm-image.go
index 1a0a5dd9e19..133a2d95a9c 100644
--- a/hack/image/helm/scaffold-helm-image.go
+++ b/hack/image/helm/scaffold-helm-image.go
@@ -17,10 +17,10 @@ package main
 import (
 	"log"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 )
 
 // main renders scaffolds that are required to build the helm operator base
diff --git a/pkg/scaffold/add_controller.go b/internal/pkg/scaffold/add_controller.go
similarity index 95%
rename from pkg/scaffold/add_controller.go
rename to internal/pkg/scaffold/add_controller.go
index a7f9310c71d..6545fb3c46a 100644
--- a/pkg/scaffold/add_controller.go
+++ b/internal/pkg/scaffold/add_controller.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // AddController is the input needed to generate a pkg/controller/add_<kind>.go file
diff --git a/pkg/scaffold/add_controller_test.go b/internal/pkg/scaffold/add_controller_test.go
similarity index 100%
rename from pkg/scaffold/add_controller_test.go
rename to internal/pkg/scaffold/add_controller_test.go
diff --git a/pkg/scaffold/addtoscheme.go b/internal/pkg/scaffold/addtoscheme.go
similarity index 95%
rename from pkg/scaffold/addtoscheme.go
rename to internal/pkg/scaffold/addtoscheme.go
index e289b1d75f0..6a1ea4f6bdd 100644
--- a/pkg/scaffold/addtoscheme.go
+++ b/internal/pkg/scaffold/addtoscheme.go
@@ -19,7 +19,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // AddToScheme is the input needed to generate an addtoscheme_<group>_<version>.go file
diff --git a/pkg/scaffold/addtoscheme_test.go b/internal/pkg/scaffold/addtoscheme_test.go
similarity index 100%
rename from pkg/scaffold/addtoscheme_test.go
rename to internal/pkg/scaffold/addtoscheme_test.go
diff --git a/pkg/scaffold/ansible/OWNERS b/internal/pkg/scaffold/ansible/OWNERS
similarity index 100%
rename from pkg/scaffold/ansible/OWNERS
rename to internal/pkg/scaffold/ansible/OWNERS
diff --git a/pkg/scaffold/ansible/ao_logs.go b/internal/pkg/scaffold/ansible/ao_logs.go
similarity index 94%
rename from pkg/scaffold/ansible/ao_logs.go
rename to internal/pkg/scaffold/ansible/ao_logs.go
index 49d4a2da17d..2c116aa99f9 100644
--- a/pkg/scaffold/ansible/ao_logs.go
+++ b/internal/pkg/scaffold/ansible/ao_logs.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 //DockerfileHybrid - Dockerfile for a hybrid operator
diff --git a/pkg/scaffold/ansible/build_dockerfile.go b/internal/pkg/scaffold/ansible/build_dockerfile.go
similarity index 91%
rename from pkg/scaffold/ansible/build_dockerfile.go
rename to internal/pkg/scaffold/ansible/build_dockerfile.go
index cff2153c892..0b1a47ce1d6 100644
--- a/pkg/scaffold/ansible/build_dockerfile.go
+++ b/internal/pkg/scaffold/ansible/build_dockerfile.go
@@ -18,8 +18,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/version"
 )
 
diff --git a/pkg/scaffold/ansible/build_test_framework_ansible_test_script.go b/internal/pkg/scaffold/ansible/build_test_framework_ansible_test_script.go
similarity index 90%
rename from pkg/scaffold/ansible/build_test_framework_ansible_test_script.go
rename to internal/pkg/scaffold/ansible/build_test_framework_ansible_test_script.go
index 58de541c3a2..f390b9f4d17 100644
--- a/pkg/scaffold/ansible/build_test_framework_ansible_test_script.go
+++ b/internal/pkg/scaffold/ansible/build_test_framework_ansible_test_script.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const BuildTestFrameworkAnsibleTestScriptFile = "ansible-test.sh"
diff --git a/pkg/scaffold/ansible/build_test_framework_dockerfile.go b/internal/pkg/scaffold/ansible/build_test_framework_dockerfile.go
similarity index 90%
rename from pkg/scaffold/ansible/build_test_framework_dockerfile.go
rename to internal/pkg/scaffold/ansible/build_test_framework_dockerfile.go
index 55539d98855..173ab04a265 100644
--- a/pkg/scaffold/ansible/build_test_framework_dockerfile.go
+++ b/internal/pkg/scaffold/ansible/build_test_framework_dockerfile.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const BuildTestFrameworkDockerfileFile = "Dockerfile"
diff --git a/pkg/scaffold/ansible/constants.go b/internal/pkg/scaffold/ansible/constants.go
similarity index 100%
rename from pkg/scaffold/ansible/constants.go
rename to internal/pkg/scaffold/ansible/constants.go
diff --git a/pkg/scaffold/ansible/deploy_operator.go b/internal/pkg/scaffold/ansible/deploy_operator.go
similarity index 94%
rename from pkg/scaffold/ansible/deploy_operator.go
rename to internal/pkg/scaffold/ansible/deploy_operator.go
index 7094807f562..b620051d515 100644
--- a/pkg/scaffold/ansible/deploy_operator.go
+++ b/internal/pkg/scaffold/ansible/deploy_operator.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const DeployOperatorFile = "operator.yaml"
diff --git a/pkg/scaffold/ansible/dockerfilehybrid.go b/internal/pkg/scaffold/ansible/dockerfilehybrid.go
similarity index 94%
rename from pkg/scaffold/ansible/dockerfilehybrid.go
rename to internal/pkg/scaffold/ansible/dockerfilehybrid.go
index 7d3d96f28c6..eb7db27dee1 100644
--- a/pkg/scaffold/ansible/dockerfilehybrid.go
+++ b/internal/pkg/scaffold/ansible/dockerfilehybrid.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 //DockerfileHybrid - Dockerfile for a hybrid operator
diff --git a/pkg/scaffold/ansible/entrypoint.go b/internal/pkg/scaffold/ansible/entrypoint.go
similarity index 94%
rename from pkg/scaffold/ansible/entrypoint.go
rename to internal/pkg/scaffold/ansible/entrypoint.go
index 333f9b92e57..0338cc5776f 100644
--- a/pkg/scaffold/ansible/entrypoint.go
+++ b/internal/pkg/scaffold/ansible/entrypoint.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // Entrypoint - entrypoint script
diff --git a/pkg/scaffold/ansible/gopkgtoml.go b/internal/pkg/scaffold/ansible/gopkgtoml.go
similarity index 91%
rename from pkg/scaffold/ansible/gopkgtoml.go
rename to internal/pkg/scaffold/ansible/gopkgtoml.go
index fd605839d8b..7f56593d98a 100644
--- a/pkg/scaffold/ansible/gopkgtoml.go
+++ b/internal/pkg/scaffold/ansible/gopkgtoml.go
@@ -15,8 +15,8 @@
 package ansible
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // GopkgToml - the Gopkg.toml file for a hybrid operator
diff --git a/pkg/scaffold/ansible/k8s_status.go b/internal/pkg/scaffold/ansible/k8s_status.go
similarity index 99%
rename from pkg/scaffold/ansible/k8s_status.go
rename to internal/pkg/scaffold/ansible/k8s_status.go
index 3d39e6171a0..aa6d61dcf1e 100644
--- a/pkg/scaffold/ansible/k8s_status.go
+++ b/internal/pkg/scaffold/ansible/k8s_status.go
@@ -15,7 +15,7 @@
 package ansible
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 
 	"github.com/spf13/afero"
 )
diff --git a/pkg/scaffold/ansible/main.go b/internal/pkg/scaffold/ansible/main.go
similarity index 95%
rename from pkg/scaffold/ansible/main.go
rename to internal/pkg/scaffold/ansible/main.go
index c4897159b5e..b457d06b84d 100644
--- a/pkg/scaffold/ansible/main.go
+++ b/internal/pkg/scaffold/ansible/main.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // Main - main source file for ansible operator
diff --git a/pkg/scaffold/ansible/molecule_default_asserts.go b/internal/pkg/scaffold/ansible/molecule_default_asserts.go
similarity index 95%
rename from pkg/scaffold/ansible/molecule_default_asserts.go
rename to internal/pkg/scaffold/ansible/molecule_default_asserts.go
index c477d5c3884..6ec54b3bef4 100644
--- a/pkg/scaffold/ansible/molecule_default_asserts.go
+++ b/internal/pkg/scaffold/ansible/molecule_default_asserts.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeDefaultAssertsFile = "asserts.yml"
diff --git a/pkg/scaffold/ansible/molecule_default_molecule.go b/internal/pkg/scaffold/ansible/molecule_default_molecule.go
similarity index 96%
rename from pkg/scaffold/ansible/molecule_default_molecule.go
rename to internal/pkg/scaffold/ansible/molecule_default_molecule.go
index 8ca9dd53558..5416cd27516 100644
--- a/pkg/scaffold/ansible/molecule_default_molecule.go
+++ b/internal/pkg/scaffold/ansible/molecule_default_molecule.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeDefaultMoleculeFile = "molecule.yml"
diff --git a/pkg/scaffold/ansible/molecule_default_playbook.go b/internal/pkg/scaffold/ansible/molecule_default_playbook.go
similarity index 91%
rename from pkg/scaffold/ansible/molecule_default_playbook.go
rename to internal/pkg/scaffold/ansible/molecule_default_playbook.go
index 6e73758dfea..28157ab40ff 100644
--- a/pkg/scaffold/ansible/molecule_default_playbook.go
+++ b/internal/pkg/scaffold/ansible/molecule_default_playbook.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeDefaultPlaybookFile = "playbook.yml"
diff --git a/pkg/scaffold/ansible/molecule_default_prepare.go b/internal/pkg/scaffold/ansible/molecule_default_prepare.go
similarity index 96%
rename from pkg/scaffold/ansible/molecule_default_prepare.go
rename to internal/pkg/scaffold/ansible/molecule_default_prepare.go
index b490c11a125..b84808dc8ed 100644
--- a/pkg/scaffold/ansible/molecule_default_prepare.go
+++ b/internal/pkg/scaffold/ansible/molecule_default_prepare.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeDefaultPrepareFile = "prepare.yml"
diff --git a/pkg/scaffold/ansible/molecule_test_cluster_molecule.go b/internal/pkg/scaffold/ansible/molecule_test_cluster_molecule.go
similarity index 96%
rename from pkg/scaffold/ansible/molecule_test_cluster_molecule.go
rename to internal/pkg/scaffold/ansible/molecule_test_cluster_molecule.go
index 5b8dc576673..930a42725cd 100644
--- a/pkg/scaffold/ansible/molecule_test_cluster_molecule.go
+++ b/internal/pkg/scaffold/ansible/molecule_test_cluster_molecule.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeTestClusterMoleculeFile = "molecule.yml"
diff --git a/pkg/scaffold/ansible/molecule_test_cluster_playbook.go b/internal/pkg/scaffold/ansible/molecule_test_cluster_playbook.go
similarity index 94%
rename from pkg/scaffold/ansible/molecule_test_cluster_playbook.go
rename to internal/pkg/scaffold/ansible/molecule_test_cluster_playbook.go
index 530c70c13f2..255c9088417 100644
--- a/pkg/scaffold/ansible/molecule_test_cluster_playbook.go
+++ b/internal/pkg/scaffold/ansible/molecule_test_cluster_playbook.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeTestClusterPlaybookFile = "playbook.yml"
diff --git a/pkg/scaffold/ansible/molecule_test_local_molecule.go b/internal/pkg/scaffold/ansible/molecule_test_local_molecule.go
similarity index 96%
rename from pkg/scaffold/ansible/molecule_test_local_molecule.go
rename to internal/pkg/scaffold/ansible/molecule_test_local_molecule.go
index ac5c8a7cd09..2b26e167e37 100644
--- a/pkg/scaffold/ansible/molecule_test_local_molecule.go
+++ b/internal/pkg/scaffold/ansible/molecule_test_local_molecule.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeTestLocalMoleculeFile = "molecule.yml"
diff --git a/pkg/scaffold/ansible/molecule_test_local_playbook.go b/internal/pkg/scaffold/ansible/molecule_test_local_playbook.go
similarity index 97%
rename from pkg/scaffold/ansible/molecule_test_local_playbook.go
rename to internal/pkg/scaffold/ansible/molecule_test_local_playbook.go
index 70da09ddf32..d31d0e6e9ed 100644
--- a/pkg/scaffold/ansible/molecule_test_local_playbook.go
+++ b/internal/pkg/scaffold/ansible/molecule_test_local_playbook.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeTestLocalPlaybookFile = "playbook.yml"
diff --git a/pkg/scaffold/ansible/molecule_test_local_prepare.go b/internal/pkg/scaffold/ansible/molecule_test_local_prepare.go
similarity index 93%
rename from pkg/scaffold/ansible/molecule_test_local_prepare.go
rename to internal/pkg/scaffold/ansible/molecule_test_local_prepare.go
index 743c8e85286..3603967c53c 100644
--- a/pkg/scaffold/ansible/molecule_test_local_prepare.go
+++ b/internal/pkg/scaffold/ansible/molecule_test_local_prepare.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const MoleculeTestLocalPrepareFile = "prepare.yml"
diff --git a/pkg/scaffold/ansible/playbook.go b/internal/pkg/scaffold/ansible/playbook.go
similarity index 88%
rename from pkg/scaffold/ansible/playbook.go
rename to internal/pkg/scaffold/ansible/playbook.go
index 711912e8d84..039172eb723 100644
--- a/pkg/scaffold/ansible/playbook.go
+++ b/internal/pkg/scaffold/ansible/playbook.go
@@ -15,8 +15,8 @@
 package ansible
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const PlaybookYamlFile = "playbook.yml"
diff --git a/pkg/scaffold/ansible/roles_defaults_main.go b/internal/pkg/scaffold/ansible/roles_defaults_main.go
similarity index 88%
rename from pkg/scaffold/ansible/roles_defaults_main.go
rename to internal/pkg/scaffold/ansible/roles_defaults_main.go
index 431517a6a34..0717ed8226c 100644
--- a/pkg/scaffold/ansible/roles_defaults_main.go
+++ b/internal/pkg/scaffold/ansible/roles_defaults_main.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesDefaultsMainFile = "defaults" + filePathSep + "main.yml"
diff --git a/pkg/scaffold/ansible/roles_files.go b/internal/pkg/scaffold/ansible/roles_files.go
similarity index 88%
rename from pkg/scaffold/ansible/roles_files.go
rename to internal/pkg/scaffold/ansible/roles_files.go
index f06f6744d43..d20205251c2 100644
--- a/pkg/scaffold/ansible/roles_files.go
+++ b/internal/pkg/scaffold/ansible/roles_files.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesFilesDir = "files" + filePathSep + ".placeholder"
diff --git a/pkg/scaffold/ansible/roles_handlers_main.go b/internal/pkg/scaffold/ansible/roles_handlers_main.go
similarity index 88%
rename from pkg/scaffold/ansible/roles_handlers_main.go
rename to internal/pkg/scaffold/ansible/roles_handlers_main.go
index 4822be4dbd7..67a2a62c860 100644
--- a/pkg/scaffold/ansible/roles_handlers_main.go
+++ b/internal/pkg/scaffold/ansible/roles_handlers_main.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesHandlersMainFile = "handlers" + filePathSep + "main.yml"
diff --git a/pkg/scaffold/ansible/roles_meta_main.go b/internal/pkg/scaffold/ansible/roles_meta_main.go
similarity index 95%
rename from pkg/scaffold/ansible/roles_meta_main.go
rename to internal/pkg/scaffold/ansible/roles_meta_main.go
index 91b4023d0b2..3be742ca643 100644
--- a/pkg/scaffold/ansible/roles_meta_main.go
+++ b/internal/pkg/scaffold/ansible/roles_meta_main.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesMetaMainFile = "meta" + filePathSep + "main.yml"
diff --git a/pkg/scaffold/ansible/roles_readme.go b/internal/pkg/scaffold/ansible/roles_readme.go
similarity index 94%
rename from pkg/scaffold/ansible/roles_readme.go
rename to internal/pkg/scaffold/ansible/roles_readme.go
index c6260ad3740..fbb6f161098 100644
--- a/pkg/scaffold/ansible/roles_readme.go
+++ b/internal/pkg/scaffold/ansible/roles_readme.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesReadmeFile = "README.md"
diff --git a/pkg/scaffold/ansible/roles_tasks_main.go b/internal/pkg/scaffold/ansible/roles_tasks_main.go
similarity index 88%
rename from pkg/scaffold/ansible/roles_tasks_main.go
rename to internal/pkg/scaffold/ansible/roles_tasks_main.go
index 85251a04c41..2c25a677d2a 100644
--- a/pkg/scaffold/ansible/roles_tasks_main.go
+++ b/internal/pkg/scaffold/ansible/roles_tasks_main.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesTasksMainFile = "tasks" + filePathSep + "main.yml"
diff --git a/pkg/scaffold/ansible/roles_templates.go b/internal/pkg/scaffold/ansible/roles_templates.go
similarity index 88%
rename from pkg/scaffold/ansible/roles_templates.go
rename to internal/pkg/scaffold/ansible/roles_templates.go
index 0ffa1ed9526..1450be7750b 100644
--- a/pkg/scaffold/ansible/roles_templates.go
+++ b/internal/pkg/scaffold/ansible/roles_templates.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesTemplatesDir = "templates" + filePathSep + ".placeholder"
diff --git a/pkg/scaffold/ansible/roles_vars_main.go b/internal/pkg/scaffold/ansible/roles_vars_main.go
similarity index 88%
rename from pkg/scaffold/ansible/roles_vars_main.go
rename to internal/pkg/scaffold/ansible/roles_vars_main.go
index af47c458fbf..b7e53f63db1 100644
--- a/pkg/scaffold/ansible/roles_vars_main.go
+++ b/internal/pkg/scaffold/ansible/roles_vars_main.go
@@ -17,8 +17,8 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RolesVarsMainFile = "vars" + filePathSep + "main.yml"
diff --git a/pkg/scaffold/ansible/travis.go b/internal/pkg/scaffold/ansible/travis.go
similarity index 92%
rename from pkg/scaffold/ansible/travis.go
rename to internal/pkg/scaffold/ansible/travis.go
index 31a6fc76f7f..979f7caa611 100644
--- a/pkg/scaffold/ansible/travis.go
+++ b/internal/pkg/scaffold/ansible/travis.go
@@ -14,7 +14,7 @@
 
 package ansible
 
-import "github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+import "github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 
 const TravisFile = ".travis.yml"
 
diff --git a/pkg/scaffold/ansible/usersetup.go b/internal/pkg/scaffold/ansible/usersetup.go
similarity index 94%
rename from pkg/scaffold/ansible/usersetup.go
rename to internal/pkg/scaffold/ansible/usersetup.go
index d4d2beb24a1..c9da484255e 100644
--- a/pkg/scaffold/ansible/usersetup.go
+++ b/internal/pkg/scaffold/ansible/usersetup.go
@@ -17,7 +17,7 @@ package ansible
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // UserSetup - userSetup script
diff --git a/pkg/scaffold/ansible/watches.go b/internal/pkg/scaffold/ansible/watches.go
similarity index 90%
rename from pkg/scaffold/ansible/watches.go
rename to internal/pkg/scaffold/ansible/watches.go
index ab9055572fd..10ca417c935 100644
--- a/pkg/scaffold/ansible/watches.go
+++ b/internal/pkg/scaffold/ansible/watches.go
@@ -15,8 +15,8 @@
 package ansible
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const WatchesFile = "watches.yaml"
diff --git a/pkg/scaffold/apis.go b/internal/pkg/scaffold/apis.go
similarity index 94%
rename from pkg/scaffold/apis.go
rename to internal/pkg/scaffold/apis.go
index 5f32d7ce5b5..6f994f83365 100644
--- a/pkg/scaffold/apis.go
+++ b/internal/pkg/scaffold/apis.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const ApisFile = "apis.go"
diff --git a/pkg/scaffold/apis_test.go b/internal/pkg/scaffold/apis_test.go
similarity index 100%
rename from pkg/scaffold/apis_test.go
rename to internal/pkg/scaffold/apis_test.go
diff --git a/pkg/scaffold/build_dockerfile.go b/internal/pkg/scaffold/build_dockerfile.go
similarity index 94%
rename from pkg/scaffold/build_dockerfile.go
rename to internal/pkg/scaffold/build_dockerfile.go
index 37d3c46aae1..b70dac7b547 100644
--- a/pkg/scaffold/build_dockerfile.go
+++ b/internal/pkg/scaffold/build_dockerfile.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const DockerfileFile = "Dockerfile"
diff --git a/pkg/scaffold/build_dockerfile_test.go b/internal/pkg/scaffold/build_dockerfile_test.go
similarity index 100%
rename from pkg/scaffold/build_dockerfile_test.go
rename to internal/pkg/scaffold/build_dockerfile_test.go
diff --git a/pkg/scaffold/cmd.go b/internal/pkg/scaffold/cmd.go
similarity index 98%
rename from pkg/scaffold/cmd.go
rename to internal/pkg/scaffold/cmd.go
index 8a61c808210..23c72e5af56 100644
--- a/pkg/scaffold/cmd.go
+++ b/internal/pkg/scaffold/cmd.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const CmdFile = "main.go"
diff --git a/pkg/scaffold/cmd_test.go b/internal/pkg/scaffold/cmd_test.go
similarity index 100%
rename from pkg/scaffold/cmd_test.go
rename to internal/pkg/scaffold/cmd_test.go
diff --git a/pkg/scaffold/constants.go b/internal/pkg/scaffold/constants.go
similarity index 100%
rename from pkg/scaffold/constants.go
rename to internal/pkg/scaffold/constants.go
diff --git a/pkg/scaffold/controller.go b/internal/pkg/scaffold/controller.go
similarity index 94%
rename from pkg/scaffold/controller.go
rename to internal/pkg/scaffold/controller.go
index d47fa919276..2e85971181d 100644
--- a/pkg/scaffold/controller.go
+++ b/internal/pkg/scaffold/controller.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const ControllerFile = "controller.go"
diff --git a/pkg/scaffold/controller_kind.go b/internal/pkg/scaffold/controller_kind.go
similarity index 98%
rename from pkg/scaffold/controller_kind.go
rename to internal/pkg/scaffold/controller_kind.go
index c0e0eb39699..38529fa9b5a 100644
--- a/pkg/scaffold/controller_kind.go
+++ b/internal/pkg/scaffold/controller_kind.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // ControllerKind is the input needed to generate a pkg/controller/<kind>/<kind>_controller.go file
diff --git a/pkg/scaffold/controller_kind_test.go b/internal/pkg/scaffold/controller_kind_test.go
similarity index 100%
rename from pkg/scaffold/controller_kind_test.go
rename to internal/pkg/scaffold/controller_kind_test.go
diff --git a/pkg/scaffold/controller_test.go b/internal/pkg/scaffold/controller_test.go
similarity index 100%
rename from pkg/scaffold/controller_test.go
rename to internal/pkg/scaffold/controller_test.go
diff --git a/pkg/scaffold/cr.go b/internal/pkg/scaffold/cr.go
similarity index 96%
rename from pkg/scaffold/cr.go
rename to internal/pkg/scaffold/cr.go
index b41a81c82fd..34418a350bb 100644
--- a/pkg/scaffold/cr.go
+++ b/internal/pkg/scaffold/cr.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // CR is the input needed to generate a deploy/crds/<group>_<version>_<kind>_cr.yaml file
diff --git a/pkg/scaffold/cr_test.go b/internal/pkg/scaffold/cr_test.go
similarity index 100%
rename from pkg/scaffold/cr_test.go
rename to internal/pkg/scaffold/cr_test.go
diff --git a/pkg/scaffold/crd.go b/internal/pkg/scaffold/crd.go
similarity index 98%
rename from pkg/scaffold/crd.go
rename to internal/pkg/scaffold/crd.go
index d46ca778710..a0b0f253fb7 100644
--- a/pkg/scaffold/crd.go
+++ b/internal/pkg/scaffold/crd.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	"github.com/ghodss/yaml"
 	"github.com/spf13/afero"
diff --git a/pkg/scaffold/crd_test.go b/internal/pkg/scaffold/crd_test.go
similarity index 98%
rename from pkg/scaffold/crd_test.go
rename to internal/pkg/scaffold/crd_test.go
index 39ca228363d..c4282aff37d 100644
--- a/pkg/scaffold/crd_test.go
+++ b/internal/pkg/scaffold/crd_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/diffutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 )
 
 func TestCRDGoProject(t *testing.T) {
diff --git a/pkg/scaffold/customrender.go b/internal/pkg/scaffold/customrender.go
similarity index 100%
rename from pkg/scaffold/customrender.go
rename to internal/pkg/scaffold/customrender.go
diff --git a/pkg/scaffold/doc.go b/internal/pkg/scaffold/doc.go
similarity index 94%
rename from pkg/scaffold/doc.go
rename to internal/pkg/scaffold/doc.go
index 99ed2f37fc4..51fb39ce8d7 100644
--- a/pkg/scaffold/doc.go
+++ b/internal/pkg/scaffold/doc.go
@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const DocFile = "doc.go"
diff --git a/pkg/scaffold/doc_test.go b/internal/pkg/scaffold/doc_test.go
similarity index 100%
rename from pkg/scaffold/doc_test.go
rename to internal/pkg/scaffold/doc_test.go
diff --git a/pkg/scaffold/entrypoint.go b/internal/pkg/scaffold/entrypoint.go
similarity index 94%
rename from pkg/scaffold/entrypoint.go
rename to internal/pkg/scaffold/entrypoint.go
index 9dda2e63951..f82d5e88cf4 100644
--- a/pkg/scaffold/entrypoint.go
+++ b/internal/pkg/scaffold/entrypoint.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const EntrypointFile = "entrypoint"
diff --git a/pkg/scaffold/entrypoint_test.go b/internal/pkg/scaffold/entrypoint_test.go
similarity index 100%
rename from pkg/scaffold/entrypoint_test.go
rename to internal/pkg/scaffold/entrypoint_test.go
diff --git a/pkg/scaffold/gitignore.go b/internal/pkg/scaffold/gitignore.go
similarity index 96%
rename from pkg/scaffold/gitignore.go
rename to internal/pkg/scaffold/gitignore.go
index b33b5f50697..2727494a1f0 100644
--- a/pkg/scaffold/gitignore.go
+++ b/internal/pkg/scaffold/gitignore.go
@@ -15,7 +15,7 @@
 package scaffold
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const GitignoreFile = ".gitignore"
diff --git a/pkg/scaffold/gitignore_test.go b/internal/pkg/scaffold/gitignore_test.go
similarity index 100%
rename from pkg/scaffold/gitignore_test.go
rename to internal/pkg/scaffold/gitignore_test.go
diff --git a/pkg/scaffold/go_test_script.go b/internal/pkg/scaffold/go_test_script.go
similarity index 93%
rename from pkg/scaffold/go_test_script.go
rename to internal/pkg/scaffold/go_test_script.go
index 2a4427887b9..8abb385de43 100644
--- a/pkg/scaffold/go_test_script.go
+++ b/internal/pkg/scaffold/go_test_script.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const GoTestScriptFile = "go-test.sh"
diff --git a/pkg/scaffold/go_test_script_test.go b/internal/pkg/scaffold/go_test_script_test.go
similarity index 100%
rename from pkg/scaffold/go_test_script_test.go
rename to internal/pkg/scaffold/go_test_script_test.go
diff --git a/pkg/scaffold/gopkgtoml.go b/internal/pkg/scaffold/gopkgtoml.go
similarity index 98%
rename from pkg/scaffold/gopkgtoml.go
rename to internal/pkg/scaffold/gopkgtoml.go
index cb5e6a89147..1079ad76f2a 100644
--- a/pkg/scaffold/gopkgtoml.go
+++ b/internal/pkg/scaffold/gopkgtoml.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 
 	"github.com/BurntSushi/toml"
 )
diff --git a/pkg/scaffold/gopkgtoml_test.go b/internal/pkg/scaffold/gopkgtoml_test.go
similarity index 100%
rename from pkg/scaffold/gopkgtoml_test.go
rename to internal/pkg/scaffold/gopkgtoml_test.go
diff --git a/pkg/scaffold/helm/chart.go b/internal/pkg/scaffold/helm/chart.go
similarity index 99%
rename from pkg/scaffold/helm/chart.go
rename to internal/pkg/scaffold/helm/chart.go
index 04de74b7230..89fcc51bc11 100644
--- a/pkg/scaffold/helm/chart.go
+++ b/internal/pkg/scaffold/helm/chart.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 
 	"github.com/iancoleman/strcase"
 	log "github.com/sirupsen/logrus"
diff --git a/pkg/scaffold/helm/dockerfile.go b/internal/pkg/scaffold/helm/dockerfile.go
similarity index 90%
rename from pkg/scaffold/helm/dockerfile.go
rename to internal/pkg/scaffold/helm/dockerfile.go
index f1e19d413ce..094d74a23a6 100644
--- a/pkg/scaffold/helm/dockerfile.go
+++ b/internal/pkg/scaffold/helm/dockerfile.go
@@ -18,8 +18,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/version"
 )
 
diff --git a/pkg/scaffold/helm/dockerfilehybrid.go b/internal/pkg/scaffold/helm/dockerfilehybrid.go
similarity index 92%
rename from pkg/scaffold/helm/dockerfilehybrid.go
rename to internal/pkg/scaffold/helm/dockerfilehybrid.go
index 583c5552535..ee6c2b57e9c 100644
--- a/pkg/scaffold/helm/dockerfilehybrid.go
+++ b/internal/pkg/scaffold/helm/dockerfilehybrid.go
@@ -17,8 +17,8 @@ package helm
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 //DockerfileHybrid - Dockerfile for a hybrid operator
diff --git a/pkg/scaffold/helm/entrypoint.go b/internal/pkg/scaffold/helm/entrypoint.go
similarity index 94%
rename from pkg/scaffold/helm/entrypoint.go
rename to internal/pkg/scaffold/helm/entrypoint.go
index 69c4125e820..d4503407a08 100644
--- a/pkg/scaffold/helm/entrypoint.go
+++ b/internal/pkg/scaffold/helm/entrypoint.go
@@ -17,7 +17,7 @@ package helm
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // Entrypoint - entrypoint script
diff --git a/pkg/scaffold/helm/gopkgtoml.go b/internal/pkg/scaffold/helm/gopkgtoml.go
similarity index 94%
rename from pkg/scaffold/helm/gopkgtoml.go
rename to internal/pkg/scaffold/helm/gopkgtoml.go
index 7cf0e96fd78..9463bfe31e5 100644
--- a/pkg/scaffold/helm/gopkgtoml.go
+++ b/internal/pkg/scaffold/helm/gopkgtoml.go
@@ -15,8 +15,8 @@
 package helm
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // GopkgToml - the Gopkg.toml file for a hybrid operator
diff --git a/pkg/scaffold/helm/main.go b/internal/pkg/scaffold/helm/main.go
similarity index 95%
rename from pkg/scaffold/helm/main.go
rename to internal/pkg/scaffold/helm/main.go
index e43ac8284d8..9857ae30d67 100644
--- a/pkg/scaffold/helm/main.go
+++ b/internal/pkg/scaffold/helm/main.go
@@ -17,7 +17,7 @@ package helm
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // Main - main source file for helm operator
diff --git a/pkg/scaffold/helm/operator.go b/internal/pkg/scaffold/helm/operator.go
similarity index 93%
rename from pkg/scaffold/helm/operator.go
rename to internal/pkg/scaffold/helm/operator.go
index a33c12ee3ac..d3c98fa88d2 100644
--- a/pkg/scaffold/helm/operator.go
+++ b/internal/pkg/scaffold/helm/operator.go
@@ -17,8 +17,8 @@ package helm
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // Operator specifies the Helm operator.yaml manifest scaffold
diff --git a/pkg/scaffold/helm/usersetup.go b/internal/pkg/scaffold/helm/usersetup.go
similarity index 94%
rename from pkg/scaffold/helm/usersetup.go
rename to internal/pkg/scaffold/helm/usersetup.go
index b76f57b39f8..efd60bc4fc8 100644
--- a/pkg/scaffold/helm/usersetup.go
+++ b/internal/pkg/scaffold/helm/usersetup.go
@@ -17,7 +17,7 @@ package helm
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // UserSetup - userSetup script
diff --git a/pkg/scaffold/helm/watches.go b/internal/pkg/scaffold/helm/watches.go
similarity index 90%
rename from pkg/scaffold/helm/watches.go
rename to internal/pkg/scaffold/helm/watches.go
index e8e6db626a9..1de6ccaa021 100644
--- a/pkg/scaffold/helm/watches.go
+++ b/internal/pkg/scaffold/helm/watches.go
@@ -15,8 +15,8 @@
 package helm
 
 import (
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const WatchesYamlFile = "watches.yaml"
diff --git a/pkg/scaffold/input/input.go b/internal/pkg/scaffold/input/input.go
similarity index 100%
rename from pkg/scaffold/input/input.go
rename to internal/pkg/scaffold/input/input.go
diff --git a/pkg/scaffold/olm-catalog/config.go b/internal/pkg/scaffold/olm-catalog/config.go
similarity index 97%
rename from pkg/scaffold/olm-catalog/config.go
rename to internal/pkg/scaffold/olm-catalog/config.go
index d0dbdd9f7c4..52e0381918d 100644
--- a/pkg/scaffold/olm-catalog/config.go
+++ b/internal/pkg/scaffold/olm-catalog/config.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 
 	"github.com/ghodss/yaml"
 )
diff --git a/pkg/scaffold/olm-catalog/config_test.go b/internal/pkg/scaffold/olm-catalog/config_test.go
similarity index 95%
rename from pkg/scaffold/olm-catalog/config_test.go
rename to internal/pkg/scaffold/olm-catalog/config_test.go
index da5582493fc..d882e6af19c 100644
--- a/pkg/scaffold/olm-catalog/config_test.go
+++ b/internal/pkg/scaffold/olm-catalog/config_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 )
 
 func TestConfig(t *testing.T) {
diff --git a/pkg/scaffold/olm-catalog/csv.go b/internal/pkg/scaffold/olm-catalog/csv.go
similarity index 98%
rename from pkg/scaffold/olm-catalog/csv.go
rename to internal/pkg/scaffold/olm-catalog/csv.go
index 5436e152b89..379699db4a5 100644
--- a/pkg/scaffold/olm-catalog/csv.go
+++ b/internal/pkg/scaffold/olm-catalog/csv.go
@@ -24,10 +24,10 @@ import (
 	"sync"
 	"unicode"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/ghodss/yaml"
diff --git a/pkg/scaffold/olm-catalog/csv_test.go b/internal/pkg/scaffold/olm-catalog/csv_test.go
similarity index 97%
rename from pkg/scaffold/olm-catalog/csv_test.go
rename to internal/pkg/scaffold/olm-catalog/csv_test.go
index efd5d006f57..b2e8cbdc8c3 100644
--- a/pkg/scaffold/olm-catalog/csv_test.go
+++ b/internal/pkg/scaffold/olm-catalog/csv_test.go
@@ -22,10 +22,10 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/diffutil"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/ghodss/yaml"
diff --git a/pkg/scaffold/olm-catalog/csv_updaters.go b/internal/pkg/scaffold/olm-catalog/csv_updaters.go
similarity index 100%
rename from pkg/scaffold/olm-catalog/csv_updaters.go
rename to internal/pkg/scaffold/olm-catalog/csv_updaters.go
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_cr.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_cr.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_cr.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_cr.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_crd.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_crd.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_crd.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_crd.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha2_app_crd.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha2_app_crd.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha2_app_crd.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha2_app_crd.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/app-operator/0.1.0/app-operator.v0.1.0.clusterserviceversion.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/app-operator/0.1.0/app-operator.v0.1.0.clusterserviceversion.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/app-operator/0.1.0/app-operator.v0.1.0.clusterserviceversion.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/app-operator/0.1.0/app-operator.v0.1.0.clusterserviceversion.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/csv-config.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/csv-config.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/csv-config.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/olm-catalog/csv-config.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/operator.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/operator.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/operator.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/operator.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/role.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/role.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/role.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/role.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/role_binding.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/role_binding.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/role_binding.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/role_binding.yaml
diff --git a/pkg/scaffold/olm-catalog/testdata/deploy/service_account.yaml b/internal/pkg/scaffold/olm-catalog/testdata/deploy/service_account.yaml
similarity index 100%
rename from pkg/scaffold/olm-catalog/testdata/deploy/service_account.yaml
rename to internal/pkg/scaffold/olm-catalog/testdata/deploy/service_account.yaml
diff --git a/pkg/scaffold/operator.go b/internal/pkg/scaffold/operator.go
similarity index 96%
rename from pkg/scaffold/operator.go
rename to internal/pkg/scaffold/operator.go
index b67969442f4..c2bc73ff10c 100644
--- a/pkg/scaffold/operator.go
+++ b/internal/pkg/scaffold/operator.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const OperatorYamlFile = "operator.yaml"
diff --git a/pkg/scaffold/operator_test.go b/internal/pkg/scaffold/operator_test.go
similarity index 100%
rename from pkg/scaffold/operator_test.go
rename to internal/pkg/scaffold/operator_test.go
diff --git a/pkg/scaffold/register.go b/internal/pkg/scaffold/register.go
similarity index 96%
rename from pkg/scaffold/register.go
rename to internal/pkg/scaffold/register.go
index 2ae1e1de9ea..b562cd254aa 100644
--- a/pkg/scaffold/register.go
+++ b/internal/pkg/scaffold/register.go
@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RegisterFile = "register.go"
diff --git a/pkg/scaffold/register_test.go b/internal/pkg/scaffold/register_test.go
similarity index 100%
rename from pkg/scaffold/register_test.go
rename to internal/pkg/scaffold/register_test.go
diff --git a/pkg/scaffold/resource.go b/internal/pkg/scaffold/resource.go
similarity index 100%
rename from pkg/scaffold/resource.go
rename to internal/pkg/scaffold/resource.go
diff --git a/pkg/scaffold/role.go b/internal/pkg/scaffold/role.go
similarity index 98%
rename from pkg/scaffold/role.go
rename to internal/pkg/scaffold/role.go
index 075f09d47a7..da1cbe827a6 100644
--- a/pkg/scaffold/role.go
+++ b/internal/pkg/scaffold/role.go
@@ -21,8 +21,8 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	yaml "gopkg.in/yaml.v2"
diff --git a/pkg/scaffold/role_test.go b/internal/pkg/scaffold/role_test.go
similarity index 100%
rename from pkg/scaffold/role_test.go
rename to internal/pkg/scaffold/role_test.go
diff --git a/pkg/scaffold/rolebinding.go b/internal/pkg/scaffold/rolebinding.go
similarity index 95%
rename from pkg/scaffold/rolebinding.go
rename to internal/pkg/scaffold/rolebinding.go
index 96d85f82cbe..482812b6f16 100644
--- a/pkg/scaffold/rolebinding.go
+++ b/internal/pkg/scaffold/rolebinding.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const RoleBindingYamlFile = "role_binding.yaml"
diff --git a/pkg/scaffold/rolebinding_test.go b/internal/pkg/scaffold/rolebinding_test.go
similarity index 100%
rename from pkg/scaffold/rolebinding_test.go
rename to internal/pkg/scaffold/rolebinding_test.go
diff --git a/pkg/scaffold/scaffold.go b/internal/pkg/scaffold/scaffold.go
similarity index 98%
rename from pkg/scaffold/scaffold.go
rename to internal/pkg/scaffold/scaffold.go
index 6235cf1f6a3..d84c08dd37a 100644
--- a/pkg/scaffold/scaffold.go
+++ b/internal/pkg/scaffold/scaffold.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
diff --git a/pkg/scaffold/service_account.go b/internal/pkg/scaffold/service_account.go
similarity index 93%
rename from pkg/scaffold/service_account.go
rename to internal/pkg/scaffold/service_account.go
index 456f89a4921..cdb1d4e66b6 100644
--- a/pkg/scaffold/service_account.go
+++ b/internal/pkg/scaffold/service_account.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const ServiceAccountYamlFile = "service_account.yaml"
diff --git a/pkg/scaffold/service_account_test.go b/internal/pkg/scaffold/service_account_test.go
similarity index 100%
rename from pkg/scaffold/service_account_test.go
rename to internal/pkg/scaffold/service_account_test.go
diff --git a/pkg/scaffold/test_framework_dockerfile.go b/internal/pkg/scaffold/test_framework_dockerfile.go
similarity index 94%
rename from pkg/scaffold/test_framework_dockerfile.go
rename to internal/pkg/scaffold/test_framework_dockerfile.go
index 618c6bd912b..9f3e3eb4f94 100644
--- a/pkg/scaffold/test_framework_dockerfile.go
+++ b/internal/pkg/scaffold/test_framework_dockerfile.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 type TestFrameworkDockerfile struct {
diff --git a/pkg/scaffold/test_framework_dockerfile_test.go b/internal/pkg/scaffold/test_framework_dockerfile_test.go
similarity index 100%
rename from pkg/scaffold/test_framework_dockerfile_test.go
rename to internal/pkg/scaffold/test_framework_dockerfile_test.go
diff --git a/pkg/scaffold/test_pod.go b/internal/pkg/scaffold/test_pod.go
similarity index 95%
rename from pkg/scaffold/test_pod.go
rename to internal/pkg/scaffold/test_pod.go
index 0bb423530b7..76bff7f92e6 100644
--- a/pkg/scaffold/test_pod.go
+++ b/internal/pkg/scaffold/test_pod.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const TestPodYamlFile = "test-pod.yaml"
diff --git a/pkg/scaffold/test_pod_test.go b/internal/pkg/scaffold/test_pod_test.go
similarity index 100%
rename from pkg/scaffold/test_pod_test.go
rename to internal/pkg/scaffold/test_pod_test.go
diff --git a/pkg/scaffold/test_setup.go b/internal/pkg/scaffold/test_setup.go
similarity index 95%
rename from pkg/scaffold/test_setup.go
rename to internal/pkg/scaffold/test_setup.go
index 424d23e1552..d0e76dbc65c 100644
--- a/pkg/scaffold/test_setup.go
+++ b/internal/pkg/scaffold/test_setup.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/pkg/scaffold/types.go b/internal/pkg/scaffold/types.go
similarity index 97%
rename from pkg/scaffold/types.go
rename to internal/pkg/scaffold/types.go
index 98e129eb6ab..afed2a1de76 100644
--- a/pkg/scaffold/types.go
+++ b/internal/pkg/scaffold/types.go
@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 // Types is the input needed to generate a pkg/apis/<group>/<version>/<kind>_types.go file
diff --git a/pkg/scaffold/types_test.go b/internal/pkg/scaffold/types_test.go
similarity index 100%
rename from pkg/scaffold/types_test.go
rename to internal/pkg/scaffold/types_test.go
diff --git a/pkg/scaffold/usersetup.go b/internal/pkg/scaffold/usersetup.go
similarity index 94%
rename from pkg/scaffold/usersetup.go
rename to internal/pkg/scaffold/usersetup.go
index d8e77aa9776..1169d61cafb 100644
--- a/pkg/scaffold/usersetup.go
+++ b/internal/pkg/scaffold/usersetup.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const UserSetupFile = "user_setup"
diff --git a/pkg/scaffold/usersetup_test.go b/internal/pkg/scaffold/usersetup_test.go
similarity index 100%
rename from pkg/scaffold/usersetup_test.go
rename to internal/pkg/scaffold/usersetup_test.go
diff --git a/pkg/scaffold/version.go b/internal/pkg/scaffold/version.go
similarity index 92%
rename from pkg/scaffold/version.go
rename to internal/pkg/scaffold/version.go
index f844062a6ca..8bd2ccf13a4 100644
--- a/pkg/scaffold/version.go
+++ b/internal/pkg/scaffold/version.go
@@ -17,7 +17,7 @@ package scaffold
 import (
 	"path/filepath"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
 )
 
 const VersionFile = "version.go"
diff --git a/pkg/scaffold/version_test.go b/internal/pkg/scaffold/version_test.go
similarity index 100%
rename from pkg/scaffold/version_test.go
rename to internal/pkg/scaffold/version_test.go
diff --git a/internal/util/projutil/project_util.go b/internal/util/projutil/project_util.go
index bc30189a25d..be56975e048 100644
--- a/internal/util/projutil/project_util.go
+++ b/internal/util/projutil/project_util.go
@@ -22,9 +22,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/internal/util/yamlutil/manifest.go b/internal/util/yamlutil/manifest.go
index 116fc3606cb..0644811017f 100644
--- a/internal/util/yamlutil/manifest.go
+++ b/internal/util/yamlutil/manifest.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/pkg/test/main_entry.go b/pkg/test/main_entry.go
index ddabe5f38bc..940f45f57f7 100644
--- a/pkg/test/main_entry.go
+++ b/pkg/test/main_entry.go
@@ -28,9 +28,9 @@ import (
 
 	"k8s.io/client-go/tools/clientcmd"
 
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/release.sh b/release.sh
index 618cee55755..a9228bedcc9 100755
--- a/release.sh
+++ b/release.sh
@@ -31,9 +31,9 @@ fi
 
 # Detect whether versions in code were updated.
 VER_FILE="version/version.go"
-TOML_TMPL_FILE="pkg/scaffold/gopkgtoml.go"
-ANS_TOML_TMPL_FILE="pkg/scaffold/ansible/gopkgtoml.go"
-HELM_TOML_TMPL_FILE="pkg/scaffold/helm/gopkgtoml.go"
+TOML_TMPL_FILE="internal/pkg/scaffold/gopkgtoml.go"
+ANS_TOML_TMPL_FILE="internal/pkg/scaffold/ansible/gopkgtoml.go"
+HELM_TOML_TMPL_FILE="internal/pkg/scaffold/helm/gopkgtoml.go"
 CURR_VER_VER_FILE="$(sed -nr 's/Version = "(.+)"/\1/p' "$VER_FILE" | tr -d ' \t\n')"
 CURR_VER_TMPL_FILE="$(sed -nr 's/.*".*v(.+)".*#osdk_version_annotation/v\1/p' "$TOML_TMPL_FILE" | tr -d ' \t\n')"
 if [[ "$VER" != "$CURR_VER_VER_FILE" || "$VER" != "$CURR_VER_TMPL_FILE" ]]; then
diff --git a/test/e2e/memcached_test.go b/test/e2e/memcached_test.go
index 931bbf302e3..7b5e4d25a45 100644
--- a/test/e2e/memcached_test.go
+++ b/test/e2e/memcached_test.go
@@ -29,10 +29,10 @@ import (
 	"time"
 
 	"github.com/ghodss/yaml"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
-	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
 	"github.com/operator-framework/operator-sdk/pkg/test/e2eutil"