diff --git a/internal/builtin/provisioners/file/resource_provisioner.go b/internal/builtin/provisioners/file/resource_provisioner.go
index 29ed85875..7f35114ee 100644
--- a/internal/builtin/provisioners/file/resource_provisioner.go
+++ b/internal/builtin/provisioners/file/resource_provisioner.go
@@ -7,8 +7,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/hashicorp/terraform/communicator"
 	"github.com/hashicorp/terraform/configs/configschema"
+	"github.com/hashicorp/terraform/internal/communicator"
 	"github.com/hashicorp/terraform/provisioners"
 	"github.com/mitchellh/go-homedir"
 	"github.com/zclconf/go-cty/cty"
diff --git a/internal/builtin/provisioners/remote-exec/resource_provisioner.go b/internal/builtin/provisioners/remote-exec/resource_provisioner.go
index 1abc562e6..4ea765e0e 100644
--- a/internal/builtin/provisioners/remote-exec/resource_provisioner.go
+++ b/internal/builtin/provisioners/remote-exec/resource_provisioner.go
@@ -11,9 +11,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/terraform/communicator"
-	"github.com/hashicorp/terraform/communicator/remote"
 	"github.com/hashicorp/terraform/configs/configschema"
+	"github.com/hashicorp/terraform/internal/communicator"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/hashicorp/terraform/provisioners"
 	"github.com/mitchellh/go-linereader"
 	"github.com/zclconf/go-cty/cty"
diff --git a/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go b/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go
index eb9da611d..2bebbebf4 100644
--- a/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go
+++ b/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go
@@ -11,8 +11,8 @@ import (
 
 	"strings"
 
-	"github.com/hashicorp/terraform/communicator"
-	"github.com/hashicorp/terraform/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/hashicorp/terraform/provisioners"
 	"github.com/mitchellh/cli"
 	"github.com/zclconf/go-cty/cty"
diff --git a/communicator/communicator.go b/internal/communicator/communicator.go
similarity index 93%
rename from communicator/communicator.go
rename to internal/communicator/communicator.go
index 27261421e..80faa2543 100644
--- a/communicator/communicator.go
+++ b/internal/communicator/communicator.go
@@ -8,10 +8,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/terraform/communicator/remote"
-	"github.com/hashicorp/terraform/communicator/shared"
-	"github.com/hashicorp/terraform/communicator/ssh"
-	"github.com/hashicorp/terraform/communicator/winrm"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator/shared"
+	"github.com/hashicorp/terraform/internal/communicator/ssh"
+	"github.com/hashicorp/terraform/internal/communicator/winrm"
 	"github.com/hashicorp/terraform/provisioners"
 	"github.com/zclconf/go-cty/cty"
 )
diff --git a/communicator/communicator_mock.go b/internal/communicator/communicator_mock.go
similarity index 97%
rename from communicator/communicator_mock.go
rename to internal/communicator/communicator_mock.go
index b619560c0..89fbaf7c9 100644
--- a/communicator/communicator_mock.go
+++ b/internal/communicator/communicator_mock.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/hashicorp/terraform/provisioners"
 )
 
diff --git a/communicator/communicator_test.go b/internal/communicator/communicator_test.go
similarity index 100%
rename from communicator/communicator_test.go
rename to internal/communicator/communicator_test.go
diff --git a/communicator/remote/command.go b/internal/communicator/remote/command.go
similarity index 100%
rename from communicator/remote/command.go
rename to internal/communicator/remote/command.go
diff --git a/communicator/remote/command_test.go b/internal/communicator/remote/command_test.go
similarity index 100%
rename from communicator/remote/command_test.go
rename to internal/communicator/remote/command_test.go
diff --git a/communicator/shared/shared.go b/internal/communicator/shared/shared.go
similarity index 100%
rename from communicator/shared/shared.go
rename to internal/communicator/shared/shared.go
diff --git a/communicator/shared/shared_test.go b/internal/communicator/shared/shared_test.go
similarity index 100%
rename from communicator/shared/shared_test.go
rename to internal/communicator/shared/shared_test.go
diff --git a/communicator/ssh/communicator.go b/internal/communicator/ssh/communicator.go
similarity index 99%
rename from communicator/ssh/communicator.go
rename to internal/communicator/ssh/communicator.go
index afbe54945..2cd1b56a7 100644
--- a/communicator/ssh/communicator.go
+++ b/internal/communicator/ssh/communicator.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/errwrap"
-	"github.com/hashicorp/terraform/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/hashicorp/terraform/provisioners"
 	"github.com/zclconf/go-cty/cty"
 	"golang.org/x/crypto/ssh"
diff --git a/communicator/ssh/communicator_test.go b/internal/communicator/ssh/communicator_test.go
similarity index 99%
rename from communicator/ssh/communicator_test.go
rename to internal/communicator/ssh/communicator_test.go
index b553576f8..c0bbeba77 100644
--- a/communicator/ssh/communicator_test.go
+++ b/internal/communicator/ssh/communicator_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/terraform/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/zclconf/go-cty/cty"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/communicator/ssh/password.go b/internal/communicator/ssh/password.go
similarity index 100%
rename from communicator/ssh/password.go
rename to internal/communicator/ssh/password.go
diff --git a/communicator/ssh/password_test.go b/internal/communicator/ssh/password_test.go
similarity index 100%
rename from communicator/ssh/password_test.go
rename to internal/communicator/ssh/password_test.go
diff --git a/communicator/ssh/provisioner.go b/internal/communicator/ssh/provisioner.go
similarity index 99%
rename from communicator/ssh/provisioner.go
rename to internal/communicator/ssh/provisioner.go
index 666f8fbea..438ba93e2 100644
--- a/communicator/ssh/provisioner.go
+++ b/internal/communicator/ssh/provisioner.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform/communicator/shared"
+	"github.com/hashicorp/terraform/internal/communicator/shared"
 	sshagent "github.com/xanzy/ssh-agent"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/gocty"
diff --git a/communicator/ssh/provisioner_test.go b/internal/communicator/ssh/provisioner_test.go
similarity index 100%
rename from communicator/ssh/provisioner_test.go
rename to internal/communicator/ssh/provisioner_test.go
diff --git a/communicator/ssh/ssh_test.go b/internal/communicator/ssh/ssh_test.go
similarity index 100%
rename from communicator/ssh/ssh_test.go
rename to internal/communicator/ssh/ssh_test.go
diff --git a/communicator/winrm/communicator.go b/internal/communicator/winrm/communicator.go
similarity index 98%
rename from communicator/winrm/communicator.go
rename to internal/communicator/winrm/communicator.go
index d877e3065..d9aa20160 100644
--- a/communicator/winrm/communicator.go
+++ b/internal/communicator/winrm/communicator.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
 	"github.com/hashicorp/terraform/provisioners"
 	"github.com/masterzen/winrm"
 	"github.com/packer-community/winrmcp/winrmcp"
diff --git a/communicator/winrm/communicator_test.go b/internal/communicator/winrm/communicator_test.go
similarity index 97%
rename from communicator/winrm/communicator_test.go
rename to internal/communicator/winrm/communicator_test.go
index bd8d2ecd5..bc1de8e30 100644
--- a/communicator/winrm/communicator_test.go
+++ b/internal/communicator/winrm/communicator_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/dylanmei/winrmtest"
-	"github.com/hashicorp/terraform/communicator/remote"
-	"github.com/hashicorp/terraform/communicator/shared"
+	"github.com/hashicorp/terraform/internal/communicator/remote"
+	"github.com/hashicorp/terraform/internal/communicator/shared"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/communicator/winrm/provisioner.go b/internal/communicator/winrm/provisioner.go
similarity index 98%
rename from communicator/winrm/provisioner.go
rename to internal/communicator/winrm/provisioner.go
index f77918ec8..3843c9d00 100644
--- a/communicator/winrm/provisioner.go
+++ b/internal/communicator/winrm/provisioner.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform/communicator/shared"
+	"github.com/hashicorp/terraform/internal/communicator/shared"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/gocty"
 )
diff --git a/communicator/winrm/provisioner_test.go b/internal/communicator/winrm/provisioner_test.go
similarity index 100%
rename from communicator/winrm/provisioner_test.go
rename to internal/communicator/winrm/provisioner_test.go
diff --git a/internal/grpcwrap/provisioner.go b/internal/grpcwrap/provisioner.go
index 8213b5082..9e11d6f32 100644
--- a/internal/grpcwrap/provisioner.go
+++ b/internal/grpcwrap/provisioner.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/hashicorp/terraform/communicator/shared"
 	"github.com/hashicorp/terraform/configs/configschema"
+	"github.com/hashicorp/terraform/internal/communicator/shared"
 	"github.com/hashicorp/terraform/internal/tfplugin5"
 	"github.com/hashicorp/terraform/plugin/convert"
 	"github.com/hashicorp/terraform/provisioners"