diff --git a/website/docs/providers/index.html.markdown b/website/docs/providers/index.html.markdown
index d74379e092..f429291cbc 100644
--- a/website/docs/providers/index.html.markdown
+++ b/website/docs/providers/index.html.markdown
@@ -8,138 +8,15 @@ description: |-
# Providers
-Terraform is used to create, manage, and update infrastructure resources such
-as physical machines, VMs, network switches, containers, and more. Almost any
-infrastructure type can be represented as a resource in Terraform.
+Terraform is used to create, manage, and manipulate infrastructure resources.
+Examples of resources include physical machines, VMs, network switches,
+containers, etc. Almost any infrastructure noun can be represented as a resource
+in Terraform.
-A provider is responsible for understanding API interactions and exposing
+Terraform is agnostic to the underlying platforms by supporting providers. A
+provider is responsible for understanding API interactions and exposing
resources. Providers generally are an IaaS (e.g. AWS, GCP, Microsoft Azure,
OpenStack), PaaS (e.g. Heroku), or SaaS services (e.g. Terraform Enterprise,
DNSimple, CloudFlare).
-Use the navigation to the left to find available providers by type or scroll
-down to see all providers.
-
-
-
+Use the navigation to the left to read about the available providers.
diff --git a/website/docs/providers/type/cloud-index.html.markdown b/website/docs/providers/type/cloud-index.html.markdown
deleted file mode 100644
index c8d8674656..0000000000
--- a/website/docs/providers/type/cloud-index.html.markdown
+++ /dev/null
@@ -1,50 +0,0 @@
----
-layout: "docs"
-page_title: "Cloud Providers"
-sidebar_current: "docs-providers-cloud"
-description: |-
- Category for standard cloud vendors.
----
-
-#Cloud Providers
-
-This group include cloud providers offering a range of services including IaaS,
-SaaS, and PaaS offerings. This group of cloud providers include some smaller
-scale clouds or ones with more specialized offerings. The Terraform provider
-and associated resources for these clouds are primarily supported by the cloud
-vendor in close collaboration with HashiCorp, and are tested by HashiCorp.
-
----
-
-
-[Arukas](/docs/providers/arukas/index.html)
-
-[CenteryLinkCloud](/docs/providers/clc/index.html)
-
-[CloudScale.ch](/docs/providers/cloudscale/index.html)
-
-[CloudStack](/docs/providers/cloudstack/index.html)
-
-[DigitalOcean](/docs/providers/do/index.html)
-
-[Fastly](/docs/providers/fastly/index.html)
-
-[Heroku](/docs/providers/heroku/index.html)
-
-[OpenStack](/docs/providers/openstack/index.html)
-
-[OVH](/docs/providers/ovh/index.html)
-
-[Packet](/docs/providers/packet/index.html)
-
-[ProfitBricks](/docs/providers/profitbricks/index.html)
-
-[Scaleway](/docs/providers/scaleway/index.html)
-
-[SoftLayer](/docs/providers/softlayer/index.html)
-
-[Triton](/docs/providers/triton/index.html)
-
-[vCloud Director](/docs/providers/vcd/index.html)
-
-[1&1](/docs/providers/oneandone/index.html)
diff --git a/website/docs/providers/type/community-index.html.markdown b/website/docs/providers/type/community-index.html.markdown
deleted file mode 100644
index 8dc0a1b1c0..0000000000
--- a/website/docs/providers/type/community-index.html.markdown
+++ /dev/null
@@ -1,31 +0,0 @@
----
-layout: "docs"
-page_title: "Community Providers"
-sidebar_current: "docs-providers-community"
-description: |-
- Category for database vendors.
----
-
-# Community Providers
-
-The providers listed below have been built by the community of Terraform users
-and vendors. These providers are not tested nor officially maintained by
-HashiCorp, and are listed here in order to help users find them easily.
-
-If you have built a provider and would like to add it to this community list,
-please fill how this [community providers form](https://docs.google.com/forms/d/e/1FAIpQLSeenG02tGEmz7pntIqMKlp5kY53f8AV5u88wJ_H1pJc2CmvKA/viewform?usp=sf_link#responses).
-
----
-
-
-[Active Directory](https://github.com/GSLabDev/terraform-provider-ad)
-
-[Apigee](https://github.com/zambien/terraform-provider-apigee)
-
-[Google Calendar](https://github.com/sethvargo/terraform-provider-googlecalendar)
-
-[HP OneView](https://github.com/HewlettPackard/terraform-provider-oneview)
-
-[Microsoft SCVMM](https://github.com/GSLabDev/terraform-provider-scvmm)
-
-[Open Day Light](https://github.com/GSLabDev/terraform-provider-odl)
diff --git a/website/docs/providers/type/database-index.html.markdown b/website/docs/providers/type/database-index.html.markdown
deleted file mode 100644
index 2262b7eccb..0000000000
--- a/website/docs/providers/type/database-index.html.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: "docs"
-page_title: "Database Providers"
-sidebar_current: "docs-providers-database"
-description: |-
- Category for database vendors.
----
-
-# Database Providers
-
-This is a group of database providers offer specific capabilities to provision
-and configure your database resources. Terraform integrates with with these
-database services using the specific provider to provision and manages database
-resources. These providers are primarily supported by the vendor in close
-collaboration with HashiCorp, and are tested by HashiCorp.
-
----
-
-
-[InfluxDB](/docs/providers/influxdb/index.html)
-
-[MySQL](/docs/providers/mysql/index.html)
-
-[PostgreSQL](/docs/providers/postgresql/index.html)
diff --git a/website/docs/providers/type/infra-index.html.markdown b/website/docs/providers/type/infra-index.html.markdown
deleted file mode 100644
index 18cb0aef42..0000000000
--- a/website/docs/providers/type/infra-index.html.markdown
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: "docs"
-page_title: "Infrastructure Software Providers"
-sidebar_current: "docs-providers-infra"
-description: |-
- Category for standard cloud vendors.
----
-
-# Infrastructure Software Providers
-
-This is a group of software providers offering specialized infrastructure
-management capabilities such as configuration management. Terraform integrates
-with these tools using the specific providers to enable these specialized tools
-to execute tasks during the provisioning of infrastructure. These providers
-are primarily supported by the vendor in close collaboration with HashiCorp,
-and are tested by HashiCorp.
-
----
-
-
-[Chef](/docs/providers/chef/index.html)
-
-[Consul](/docs/providers/consul/index.html)
-
-[Kubernetes](/docs/providers/kubernetes/index.html)
-
-[Mailgun](/docs/providers/mailgun/index.html)
-
-[Nomad](/docs/providers/nomad/index.html)
-
-[RabbitMQ](/docs/providers/rabbitmq/index.html)
-
-[Rancher](/docs/providers/rancher/index.html)
-
-[Rundeck](/docs/providers/rundeck/index.html)
-
-[Spotinst](/docs/providers/spotinst/index.html)
-
-[Terraform](/docs/providers/terraform/index.html)
-
-[Terraform Enterprise](/docs/providers/terraform-enterprise/index.html)
-
-[Vault](/docs/providers/vault/index.html)
diff --git a/website/docs/providers/type/major-index.html.markdown b/website/docs/providers/type/major-index.html.markdown
deleted file mode 100644
index 2e15b29cdd..0000000000
--- a/website/docs/providers/type/major-index.html.markdown
+++ /dev/null
@@ -1,32 +0,0 @@
----
-layout: "docs"
-page_title: "Major Cloud Providers"
-sidebar_current: "docs-providers-major"
-description: |-
- Category for major cloud vendors.
----
-
-# Major Cloud Providers
-
-This group includes hyper-scale cloud providers that offer a range of services
-including IaaS, SaaS, and PaaS. A large percentage of Terraform users provision
-their infrastructure on these major cloud providers. HashiCorp closely partners
-with these cloud providers to offer best-in-class integration to provision and
-manage the majority of the services offered. These providers are primarily
-supported by the cloud vendor in close collaboration with HashiCorp, and are
-tested by HashiCorp.
-
----
-
-
-[AliCloud](/docs/providers/alicloud/index.html)
-
-[AWS](/docs/providers/aws/index.html)
-
-[Google Cloud](/docs/providers/google/index.html)
-
-[Microsoft Azure](/docs/providers/azurerm/index.html)
-
-[Oracle Public Cloud](/docs/providers/opc/index.html)
-
-[VMware vSphere](/docs/providers/vsphere/index.html)
diff --git a/website/docs/providers/type/misc-index.html.markdown b/website/docs/providers/type/misc-index.html.markdown
deleted file mode 100644
index 288bcdebde..0000000000
--- a/website/docs/providers/type/misc-index.html.markdown
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: "docs"
-page_title: "Misc Providers"
-sidebar_current: "docs-providers-misc"
-description: |-
- Category for database vendors.
----
-
-# Miscellaneous Providers
-
-This is a group of miscellaneous providers offer specific capabilities that can
-be useful when working with Terraform. These providers are primarily supported
-by the vendors and the Terraform community, and are tested by HashiCorp.
-
----
-
-
-[Archive](/docs/providers/archive/index.html)
-
-[Cobbler](/docs/providers/cobbler/index.html)
-
-[External](/docs/providers/external/index.html)
-
-[Ignition](/docs/providers/ignition/index.html)
-
-[Local](/docs/providers/local/index.html)
-
-[Null](/docs/providers/null/index.html)
-
-[Random](/docs/providers/random/index.html)
-
-[Template](/docs/providers/template/index.html)
-
-[TLS](/docs/providers/tls/index.html)
diff --git a/website/docs/providers/type/monitor-index.html.markdown b/website/docs/providers/type/monitor-index.html.markdown
deleted file mode 100644
index c9a7a7dbbd..0000000000
--- a/website/docs/providers/type/monitor-index.html.markdown
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: "docs"
-page_title: "Monitor & Sys Management Providers"
-sidebar_current: "docs-providers-monitor"
-description: |-
- Category for monitoring and system management vendors.
----
-
-# Monitoring & System Management Providers
-
-This is a group of monitoring & system management providers that offer the
-capability to configure and manage services such as loggers, metric tools,
-and monitoring services. Terraform integrates with these services using the
-specific provider to enable these specialized monitoring capabilities. These
-providers are primarily supported by the vendor in close collaboration with
-HashiCorp, and are tested by HashiCorp.
-
-
----
-
-
-[Circonus](/docs/providers/circonus/index.html)
-
-[Datadog](/docs/providers/datadog/index.html)
-
-[Dyn](/docs/providers/dyn/index.html)
-
-[Grafana](/docs/providers/grafana/index.html)
-
-[Icinga2](/docs/providers/icinga2/index.html)
-
-[Librato](/docs/providers/librato/index.html)
-
-[Logentries](/docs/providers/logentries/index.html)
-
-[LogicMonitor](/docs/providers/logicmonitor/index.html)
-
-[New Relic](/docs/providers/newrelic/index.html)
-
-[OpsGenie](/docs/providers/opsgenie/index.html)
-
-[PagerDuty](/docs/providers/pagerduty/index.html)
-
-[StatusCake](/docs/providers/statuscake/index.html)
diff --git a/website/docs/providers/type/network-index.html.markdown b/website/docs/providers/type/network-index.html.markdown
deleted file mode 100644
index 03fdc51339..0000000000
--- a/website/docs/providers/type/network-index.html.markdown
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: "docs"
-page_title: "Network Providers"
-sidebar_current: "docs-providers-network"
-description: |-
- Category for netowrk vendors.
----
-
-# Network Providers
-
-This is a group of network providers that offer specific network capabilities
-such and DNS, routing, and firewall configuration. The providers generally
-offer a cloud-based service and Terraform integrates with these services using
-the specific providers. These providers are primarily supported by the vendor
-in close collaboration with HashiCorp, and are tested by HashiCorp.
-
----
-
-
-[Cloudflare](/docs/providers/cloudflare/index.html)
-
-[DNS](/docs/providers/dns/index.html)
-
-[DNSimple](/docs/providers/dnsimple/index.html)
-
-[DNCMadeEasy](/docs/providers/dme/index.html)
-
-[HTTP](/docs/providers/http/index.html)
-
-[NS1](/docs/providers/ns1/index.html)
-
-[PowerDNS](/docs/providers/powerdns/index.html)
-
-[UltraDNS](/docs/providers/ultradns/index.html)
diff --git a/website/docs/providers/type/vcs-index.html.markdown b/website/docs/providers/type/vcs-index.html.markdown
deleted file mode 100644
index bd954b7fb9..0000000000
--- a/website/docs/providers/type/vcs-index.html.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: "docs"
-page_title: "VCS Providers"
-sidebar_current: "docs-providers-vcs"
-description: |-
- Category for version control vendors.
----
-
-# Version Control Providers
-
-This is a group of Version Control System (VCS) providers that offer
-capabilities of using Terraform to manage your VCS projects, teams and
-repositories. Terraform integrates with these services to create and manage
-resources provided by the VCS. These providers are primarily supported by the
-vendor in close collaboration with HashiCorp, and are tested by HashiCorp.
-
----
-
-
-[Bitbucket](/docs/providers/bitbucket/index.html)
-
-[Github](/docs/providers/github/index.html)
-
-[Gitlab](/docs/providers/gitlab/index.html)
diff --git a/website/layouts/docs.erb b/website/layouts/docs.erb
index f91b710171..c610decb4e 100644
--- a/website/layouts/docs.erb
+++ b/website/layouts/docs.erb
@@ -200,43 +200,289 @@
>
Providers
@@ -367,16 +613,16 @@
- >
- Terraform Enterprise (classic)
+ >
+ Terraform Enterprise
- >
- Terraform Enterprise (beta)
+ >
+ Terraform Enterprise (legacy)
<% end %>
<%= yield %>
-<% end %>
\ No newline at end of file
+<% end %>