diff --git a/command/meta_providers.go b/command/meta_providers.go
index b3b281a6a..eb77eb93a 100644
--- a/command/meta_providers.go
+++ b/command/meta_providers.go
@@ -12,7 +12,7 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 
 	"github.com/hashicorp/terraform/addrs"
-	terraformProvider "github.com/hashicorp/terraform/builtin/providers/terraform"
+	terraformProvider "github.com/hashicorp/terraform/internal/builtin/providers/terraform"
 	"github.com/hashicorp/terraform/internal/getproviders"
 	"github.com/hashicorp/terraform/internal/logging"
 	"github.com/hashicorp/terraform/internal/moduletest"
diff --git a/command/plugins.go b/command/plugins.go
index e2fb79aa6..80fd76b87 100644
--- a/command/plugins.go
+++ b/command/plugins.go
@@ -13,9 +13,9 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 	"github.com/kardianos/osext"
 
-	fileprovisioner "github.com/hashicorp/terraform/builtin/provisioners/file"
-	localexec "github.com/hashicorp/terraform/builtin/provisioners/local-exec"
-	remoteexec "github.com/hashicorp/terraform/builtin/provisioners/remote-exec"
+	fileprovisioner "github.com/hashicorp/terraform/internal/builtin/provisioners/file"
+	localexec "github.com/hashicorp/terraform/internal/builtin/provisioners/local-exec"
+	remoteexec "github.com/hashicorp/terraform/internal/builtin/provisioners/remote-exec"
 	"github.com/hashicorp/terraform/internal/logging"
 	tfplugin "github.com/hashicorp/terraform/plugin"
 	"github.com/hashicorp/terraform/plugin/discovery"
diff --git a/builtin/providers/README b/internal/builtin/providers/README
similarity index 100%
rename from builtin/providers/README
rename to internal/builtin/providers/README
diff --git a/builtin/providers/terraform/data_source_state.go b/internal/builtin/providers/terraform/data_source_state.go
similarity index 100%
rename from builtin/providers/terraform/data_source_state.go
rename to internal/builtin/providers/terraform/data_source_state.go
diff --git a/builtin/providers/terraform/data_source_state_test.go b/internal/builtin/providers/terraform/data_source_state_test.go
similarity index 100%
rename from builtin/providers/terraform/data_source_state_test.go
rename to internal/builtin/providers/terraform/data_source_state_test.go
diff --git a/builtin/providers/terraform/provider.go b/internal/builtin/providers/terraform/provider.go
similarity index 100%
rename from builtin/providers/terraform/provider.go
rename to internal/builtin/providers/terraform/provider.go
diff --git a/builtin/providers/terraform/provider_test.go b/internal/builtin/providers/terraform/provider_test.go
similarity index 100%
rename from builtin/providers/terraform/provider_test.go
rename to internal/builtin/providers/terraform/provider_test.go
diff --git a/builtin/providers/terraform/testdata/basic.tfstate b/internal/builtin/providers/terraform/testdata/basic.tfstate
similarity index 100%
rename from builtin/providers/terraform/testdata/basic.tfstate
rename to internal/builtin/providers/terraform/testdata/basic.tfstate
diff --git a/builtin/providers/terraform/testdata/complex_outputs.tfstate b/internal/builtin/providers/terraform/testdata/complex_outputs.tfstate
similarity index 100%
rename from builtin/providers/terraform/testdata/complex_outputs.tfstate
rename to internal/builtin/providers/terraform/testdata/complex_outputs.tfstate
diff --git a/builtin/providers/terraform/testdata/empty.tfstate b/internal/builtin/providers/terraform/testdata/empty.tfstate
similarity index 100%
rename from builtin/providers/terraform/testdata/empty.tfstate
rename to internal/builtin/providers/terraform/testdata/empty.tfstate
diff --git a/builtin/providers/terraform/testdata/null_outputs.tfstate b/internal/builtin/providers/terraform/testdata/null_outputs.tfstate
similarity index 100%
rename from builtin/providers/terraform/testdata/null_outputs.tfstate
rename to internal/builtin/providers/terraform/testdata/null_outputs.tfstate
diff --git a/builtin/provisioners/file/resource_provisioner.go b/internal/builtin/provisioners/file/resource_provisioner.go
similarity index 100%
rename from builtin/provisioners/file/resource_provisioner.go
rename to internal/builtin/provisioners/file/resource_provisioner.go
diff --git a/builtin/provisioners/file/resource_provisioner_test.go b/internal/builtin/provisioners/file/resource_provisioner_test.go
similarity index 100%
rename from builtin/provisioners/file/resource_provisioner_test.go
rename to internal/builtin/provisioners/file/resource_provisioner_test.go
diff --git a/builtin/provisioners/local-exec/resource_provisioner.go b/internal/builtin/provisioners/local-exec/resource_provisioner.go
similarity index 100%
rename from builtin/provisioners/local-exec/resource_provisioner.go
rename to internal/builtin/provisioners/local-exec/resource_provisioner.go
diff --git a/builtin/provisioners/local-exec/resource_provisioner_test.go b/internal/builtin/provisioners/local-exec/resource_provisioner_test.go
similarity index 100%
rename from builtin/provisioners/local-exec/resource_provisioner_test.go
rename to internal/builtin/provisioners/local-exec/resource_provisioner_test.go
diff --git a/builtin/provisioners/remote-exec/resource_provisioner.go b/internal/builtin/provisioners/remote-exec/resource_provisioner.go
similarity index 100%
rename from builtin/provisioners/remote-exec/resource_provisioner.go
rename to internal/builtin/provisioners/remote-exec/resource_provisioner.go
diff --git a/builtin/provisioners/remote-exec/resource_provisioner_test.go b/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go
similarity index 100%
rename from builtin/provisioners/remote-exec/resource_provisioner_test.go
rename to internal/builtin/provisioners/remote-exec/resource_provisioner_test.go
diff --git a/builtin/provisioners/remote-exec/testdata/script1.sh b/internal/builtin/provisioners/remote-exec/testdata/script1.sh
similarity index 100%
rename from builtin/provisioners/remote-exec/testdata/script1.sh
rename to internal/builtin/provisioners/remote-exec/testdata/script1.sh
diff --git a/internal/provider-terraform/main/main.go b/internal/provider-terraform/main/main.go
index a8ad4bd49..51b463f4f 100644
--- a/internal/provider-terraform/main/main.go
+++ b/internal/provider-terraform/main/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/terraform"
+	"github.com/hashicorp/terraform/internal/builtin/providers/terraform"
 	"github.com/hashicorp/terraform/internal/grpcwrap"
 	"github.com/hashicorp/terraform/internal/tfplugin5"
 	"github.com/hashicorp/terraform/plugin"
diff --git a/internal/provisioner-local-exec/main/main.go b/internal/provisioner-local-exec/main/main.go
index 86a6f07fc..9920136f8 100644
--- a/internal/provisioner-local-exec/main/main.go
+++ b/internal/provisioner-local-exec/main/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	localexec "github.com/hashicorp/terraform/builtin/provisioners/local-exec"
+	localexec "github.com/hashicorp/terraform/internal/builtin/provisioners/local-exec"
 	"github.com/hashicorp/terraform/internal/grpcwrap"
 	"github.com/hashicorp/terraform/internal/tfplugin5"
 	"github.com/hashicorp/terraform/plugin"