diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md
index 9787e871e..55050db59 100644
--- a/daprdocs/content/en/_index.md
+++ b/daprdocs/content/en/_index.md
@@ -1,20 +1,18 @@
---
-title: "Dapr Documentation"
-linkTitle: "Home"
-weight: 1
-no_list: true
-description: >
- Docs, references, and best-practices for the Dapr project.
+type: docs
---
+#
-## Further documentation
+Welcome to the Dapr documentation site!
-| Area | Description |
-|------|-------------|
-| **[Command Line Interface (CLI)](https://github.com/dapr/cli)** | The Dapr CLI allows you to setup Dapr on your local dev machine or on a Kubernetes cluster, provides debugging support, launches and manages Dapr instances.
-| **[Dapr Runtime](https://github.com/dapr/dapr)** | Dapr runtime code and overview documentation.
-| **[Components Contribution](https://github.com/dapr/components-contrib)** | Open, community driven reusable components for building distributed applications.
-| **SDKs** | - [Go SDK](https://github.com/dapr/go-sdk)
- [Java SDK](https://github.com/dapr/java-sdk)
- [Javascript SDK](https://github.com/dapr/js-sdk)
- [Python SDK](https://github.com/dapr/python-sdk)
- [.NET SDK](https://github.com/dapr/dotnet-sdk)
- [C++ SDK](https://github.com/dapr/cpp-sdk)
- [RUST SDK](https://github.com/dapr/rust-sdk)
**Note:** Dapr is language agnostic and provides a [RESTful HTTP API](./reference/api/README.md) in addition to the protobuf clients.
-| **Frameworks** | - [Workflows](https://github.com/dapr/workflows)
- [Azure Functions extension](https://github.com/dapr/azure-functions-extension)
-| **[Dapr Presentations](./presentations)** | Previous Dapr presentations and information on how to give your own Dapr presentation.
\ No newline at end of file
+
+
+- [Concepts]({{< ref "concepts" >}})
+- [Getting started]({{< ref "getting-started" >}})
+- [Developing applications]({{< ref "developing-applications" >}})
+- [Operations]({{< ref "operations" >}})
+- [Reference]({{< ref "reference" >}})
+- [Contributing]({{< ref "contributing" >}})
+
+
\ No newline at end of file
diff --git a/daprdocs/content/en/docs/concepts/_index.md b/daprdocs/content/en/concepts/_index.md
similarity index 90%
rename from daprdocs/content/en/docs/concepts/_index.md
rename to daprdocs/content/en/concepts/_index.md
index 89cd61575..bcfdf00f6 100644
--- a/daprdocs/content/en/docs/concepts/_index.md
+++ b/daprdocs/content/en/concepts/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Dapr Concepts"
linkTitle: "Concepts"
weight: 10
diff --git a/daprdocs/content/en/docs/concepts/building-blocks-concept.md b/daprdocs/content/en/concepts/building-blocks-concept.md
similarity index 97%
rename from daprdocs/content/en/docs/concepts/building-blocks-concept.md
rename to daprdocs/content/en/concepts/building-blocks-concept.md
index 6110b9f4d..e3a6cd889 100644
--- a/daprdocs/content/en/docs/concepts/building-blocks-concept.md
+++ b/daprdocs/content/en/concepts/building-blocks-concept.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Building blocks"
linkTitle: "Building Blocks"
weight: 200
diff --git a/daprdocs/content/en/docs/concepts/components-concept.md b/daprdocs/content/en/concepts/components-concept.md
similarity index 98%
rename from daprdocs/content/en/docs/concepts/components-concept.md
rename to daprdocs/content/en/concepts/components-concept.md
index a8120c080..12fdc0d19 100644
--- a/daprdocs/content/en/docs/concepts/components-concept.md
+++ b/daprdocs/content/en/concepts/components-concept.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Components"
linkTitle: "Components"
weight: 300
diff --git a/daprdocs/content/en/docs/concepts/configuration-concept.md b/daprdocs/content/en/concepts/configuration-concept.md
similarity index 98%
rename from daprdocs/content/en/docs/concepts/configuration-concept.md
rename to daprdocs/content/en/concepts/configuration-concept.md
index ab8fe61d3..c2321c51d 100644
--- a/daprdocs/content/en/docs/concepts/configuration-concept.md
+++ b/daprdocs/content/en/concepts/configuration-concept.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Configuration"
linkTitle: "Configuration"
weight: 400
diff --git a/daprdocs/content/en/docs/concepts/faq.md b/daprdocs/content/en/concepts/faq.md
similarity index 99%
rename from daprdocs/content/en/docs/concepts/faq.md
rename to daprdocs/content/en/concepts/faq.md
index 0bc9f168b..4f24d9164 100644
--- a/daprdocs/content/en/docs/concepts/faq.md
+++ b/daprdocs/content/en/concepts/faq.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Frequently asked Questions and Answers"
linkTitle: "FAQs"
weight: 1000
diff --git a/daprdocs/content/en/docs/concepts/middleware-concept.md b/daprdocs/content/en/concepts/middleware-concept.md
similarity index 99%
rename from daprdocs/content/en/docs/concepts/middleware-concept.md
rename to daprdocs/content/en/concepts/middleware-concept.md
index 8e5725d50..d72c1da96 100644
--- a/daprdocs/content/en/docs/concepts/middleware-concept.md
+++ b/daprdocs/content/en/concepts/middleware-concept.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Middleware pipelines"
linkTitle: "Middleware"
weight: 400
diff --git a/daprdocs/content/en/docs/concepts/observability-concept.md b/daprdocs/content/en/concepts/observability-concept.md
similarity index 99%
rename from daprdocs/content/en/docs/concepts/observability-concept.md
rename to daprdocs/content/en/concepts/observability-concept.md
index 01de99174..b1baa9532 100644
--- a/daprdocs/content/en/docs/concepts/observability-concept.md
+++ b/daprdocs/content/en/concepts/observability-concept.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Observability"
linkTitle: "Observability"
weight: 500
diff --git a/daprdocs/content/en/docs/concepts/overview.md b/daprdocs/content/en/concepts/overview.md
similarity index 99%
rename from daprdocs/content/en/docs/concepts/overview.md
rename to daprdocs/content/en/concepts/overview.md
index 14ee5e21f..a1285a457 100644
--- a/daprdocs/content/en/docs/concepts/overview.md
+++ b/daprdocs/content/en/concepts/overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Overview"
linkTitle: "Overview"
weight: 100
diff --git a/daprdocs/content/en/docs/concepts/security-concept.md b/daprdocs/content/en/concepts/security-concept.md
similarity index 99%
rename from daprdocs/content/en/docs/concepts/security-concept.md
rename to daprdocs/content/en/concepts/security-concept.md
index 5f6aa48e6..1fa9c90ba 100644
--- a/daprdocs/content/en/docs/concepts/security-concept.md
+++ b/daprdocs/content/en/concepts/security-concept.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Security"
linkTitle: "Security"
weight: 600
diff --git a/daprdocs/content/en/docs/contributing/_index.md b/daprdocs/content/en/contributing/_index.md
similarity index 99%
rename from daprdocs/content/en/docs/contributing/_index.md
rename to daprdocs/content/en/contributing/_index.md
index 252c3cfed..ac8f5cbae 100644
--- a/daprdocs/content/en/docs/contributing/_index.md
+++ b/daprdocs/content/en/contributing/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Contributing to Dapr"
linkTitle: "Contributing"
weight: 100
diff --git a/daprdocs/content/en/docs/contributing/runtime/_index.md b/daprdocs/content/en/contributing/runtime/_index.md
similarity index 100%
rename from daprdocs/content/en/docs/contributing/runtime/_index.md
rename to daprdocs/content/en/contributing/runtime/_index.md
diff --git a/daprdocs/content/en/docs/developing-applications/_index.md b/daprdocs/content/en/developing-applications/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/_index.md
rename to daprdocs/content/en/developing-applications/_index.md
index 177ef53b8..b2ab62b28 100644
--- a/daprdocs/content/en/docs/developing-applications/_index.md
+++ b/daprdocs/content/en/developing-applications/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Developing applications with Dapr"
linkTitle: "Developing applications"
description: "Tools, tips, and information on how to build your application with Dapr"
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/_index.md b/daprdocs/content/en/developing-applications/building-blocks/_index.md
similarity index 80%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/_index.md
index 32a0438fe..1da93e595 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Building blocks"
linkTitle: "Building blocks"
weight: 10
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/actors/_index.md b/daprdocs/content/en/developing-applications/building-blocks/actors/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/actors/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/actors/_index.md
index 078a2978e..57facfbdf 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/actors/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/actors/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Actors"
linkTitle: "Actors"
weight: 50
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/actors/actors-overview.md b/daprdocs/content/en/developing-applications/building-blocks/actors/actors-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/actors/actors-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/actors/actors-overview.md
index 3cf7aac8f..51461487e 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/actors/actors-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/actors/actors-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Dapr actors overview"
linkTitle: "Dapr actors"
weight: 200
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/actors/actors_background.md b/daprdocs/content/en/developing-applications/building-blocks/actors/actors_background.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/actors/actors_background.md
rename to daprdocs/content/en/developing-applications/building-blocks/actors/actors_background.md
index 20757efab..0520083fa 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/actors/actors_background.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/actors/actors_background.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Introduction to actors"
linkTitle: "Introduction to actors"
weight: 100
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/_index.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/bindings/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/bindings/_index.md
index 64b567f1e..74c073f42 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Bindings"
linkTitle: "Bindings"
weight: 40
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/bindings-overview.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/bindings-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/bindings/bindings-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/bindings/bindings-overview.md
index 949c5ec3a..f0ac51fe1 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/bindings-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/bindings-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Bindings overview"
linkTitle: "Overview"
weight: 100
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/howto-bindings.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/bindings/howto-bindings.md
rename to daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
index 84c20d98e..25c825578 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/howto-bindings.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Use bindings to interface with external resources"
linkTitle: "How-To: Bindings"
description: "Invoke external systems with Dapr output bindings"
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/howto-triggers.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/bindings/howto-triggers.md
rename to daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md
index aae20332b..3e55e77c3 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/bindings/howto-triggers.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-triggers.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Trigger your application with input bindings"
linkTitle: "How-To: Triggers"
description: "Use Dapr input bindings to trigger event driven applications"
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/_index.md b/daprdocs/content/en/developing-applications/building-blocks/observability/_index.md
similarity index 97%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/_index.md
index 58222a26a..b8da6c49f 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Observability"
linkTitle: "Observability"
weight: 60
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/logs.md b/daprdocs/content/en/developing-applications/building-blocks/observability/logs.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/logs.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/logs.md
index 74ee9392d..2b189c3b5 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/logs.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/logs.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Logs"
linkTitle: "Logs"
weight: 3000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/metrics.md b/daprdocs/content/en/developing-applications/building-blocks/observability/metrics.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/metrics.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/metrics.md
index eebbffdd9..ee93c9a5b 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/metrics.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/metrics.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Metrics"
linkTitle: "Metrics"
weight: 4000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/sidecar-health.md b/daprdocs/content/en/developing-applications/building-blocks/observability/sidecar-health.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/sidecar-health.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/sidecar-health.md
index 7119d5d7c..f4159fca3 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/sidecar-health.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/sidecar-health.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Sidecar health"
linkTitle: "Sidecar health"
weight: 5000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/tracing.md b/daprdocs/content/en/developing-applications/building-blocks/observability/tracing.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/tracing.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/tracing.md
index 75e8635d4..8a367ff3c 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/tracing.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/tracing.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Distributed tracing"
linkTitle: "Distributed tracing"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/_index.md b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/_index.md
index e99588cd5..0c18e1f2a 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "W3C trace context"
linkTitle: "W3C trace context"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md
index e9397ff32..8c4bb0ef2 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Use W3C trace context with Dapr"
linkTitle: "Overview"
weight: 20000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
index c69fa5bc0..880180566 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "W3C trace context overview"
linkTitle: "Overview"
weight: 10000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/_index.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/pubsub/_index.md
index 138594b97..05b5c6f7e 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Pub/Sub"
linkTitle: "Pub/Sub"
weight: 30
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/howto-publish-message.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-message.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/howto-publish-message.md
rename to daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-message.md
index d1b0cfffa..77d1b9a40 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/howto-publish-message.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-message.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Publish message to a topic"
linkTitle: "How-To: Publish"
weight: 2000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/howto-subscribe-topic.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-subscribe-topic.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/howto-subscribe-topic.md
rename to daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-subscribe-topic.md
index 9b90ddff6..9b30fac13 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/howto-subscribe-topic.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-subscribe-topic.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Subscribe to a topic"
linkTitle: "How-To: Subscribe"
weight: 3000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-namespaces.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-namespaces.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-namespaces.md
rename to daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-namespaces.md
index ec9c0b152..4a21011cc 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-namespaces.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-namespaces.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Pub/Sub and namespaces"
linkTitle: "Pub/Sub and namespaces"
weight: 4000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-overview.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-overview.md
index a68681394..d51b433ed 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Pub/Sub overview"
linkTitle: "Pub/Sub overview"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-scopes.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-scopes.md
rename to daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md
index 0d4c28e50..1dfac891b 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/pubsub/pubsub-scopes.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How To: Scope Pub/Sub topics"
linkTitle: "How To: Scope topics"
weight: 5000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/_index.md b/daprdocs/content/en/developing-applications/building-blocks/secrets/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/secrets/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/secrets/_index.md
index 824a05d54..9b987f6da 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/secrets/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Secrets stores"
linkTitle: "Secrets stores"
weight: 70
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/howto-secrets.md b/daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/secrets/howto-secrets.md
rename to daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
index 6385ee1cf..47ead2328 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/howto-secrets.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How To: Retrieve a secret"
linkTitle: "How To: Retrieve a secret"
weight: 2000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/secrets-overview.md b/daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/secrets/secrets-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-overview.md
index 9af279d41..489dfac01 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/secrets-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Secrets stores overview"
linkTitle: "Secrets stores overview"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/secrets-scopes.md b/daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-scopes.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/secrets/secrets-scopes.md
rename to daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-scopes.md
index 11f19983f..931751a35 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/secrets/secrets-scopes.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-scopes.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How To: Use secret scoping"
linkTitle: "How To: Use secret scoping"
weight: 3000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/_index.md b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/_index.md
similarity index 93%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/service-invocation/_index.md
index f3a055fec..ddba70a7c 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Service invocation"
linkTitle: "Service invocation"
weight: 10
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
rename to daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
index 607faf23a..630231e4a 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Invoke and discover services"
linkTitle: "How-To: Invoke and discover services"
description: "Use service invocation in a distributed application"
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/service-invocation-overview.md b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/service-invocation-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/service-invocation-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/service-invocation/service-invocation-overview.md
index 581cc0e6b..f4dec1577 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/service-invocation/service-invocation-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/service-invocation-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Service invocation overview"
linkTitle: "Service invocation overview"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/_index.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/_index.md
index 19e1a0436..321e58ce7 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "State management"
linkTitle: "State management"
weight: 20
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/howto-get-save-state.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-get-save-state.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/howto-get-save-state.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/howto-get-save-state.md
index e45b27df1..ab1a57952 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/howto-get-save-state.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-get-save-state.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Save and get state"
linkTitle: "How-To: Save and get state"
weight: 200
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/howto-stateful-service.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-stateful-service.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/howto-stateful-service.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/howto-stateful-service.md
index e8ea40c2d..7a7560d81 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/howto-stateful-service.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/howto-stateful-service.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Build a stateful service"
linkTitle: "How-To: Build a stateful service"
weight: 300
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/_index.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/_index.md
similarity index 94%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/_index.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/_index.md
index 2b2ffed74..71adec7cc 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/_index.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Work with backend state stores"
linkTitle: "Work with backend state stores"
weight: 400
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-cosmosdb-store.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-cosmosdb-store.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-cosmosdb-store.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-cosmosdb-store.md
index 4429f0dff..5c7391ffa 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-cosmosdb-store.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-cosmosdb-store.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Cosmos DB"
linkTitle: "Azure Cosmos DB"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-redis-store.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-redis-store.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-redis-store.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-redis-store.md
index ad3c7347a..239ca7a64 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-redis-store.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-redis-store.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Redis"
linkTitle: "Redis"
weight: 2000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-sqlserver-store.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-sqlserver-store.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-sqlserver-store.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-sqlserver-store.md
index 01512a7af..82249cdb6 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/query-state-store/query-sqlserver-store.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/query-state-store/query-sqlserver-store.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "SQL server"
linkTitle: "SQL server"
weight: 3000
diff --git a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/state-management-overview.md b/daprdocs/content/en/developing-applications/building-blocks/state-management/state-management-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/building-blocks/state-management/state-management-overview.md
rename to daprdocs/content/en/developing-applications/building-blocks/state-management/state-management-overview.md
index 531dad207..e6a809be7 100644
--- a/daprdocs/content/en/docs/developing-applications/building-blocks/state-management/state-management-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/state-management/state-management-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "State management overview"
linkTitle: "State Management overview"
weight: 100
diff --git a/daprdocs/content/en/docs/developing-applications/ides/_index.md b/daprdocs/content/en/developing-applications/ides/_index.md
similarity index 90%
rename from daprdocs/content/en/docs/developing-applications/ides/_index.md
rename to daprdocs/content/en/developing-applications/ides/_index.md
index 83b5c0da4..f74c56e54 100644
--- a/daprdocs/content/en/docs/developing-applications/ides/_index.md
+++ b/daprdocs/content/en/developing-applications/ides/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "IDE support"
linkTitle: "IDE support"
weight: 30
diff --git a/daprdocs/content/en/docs/developing-applications/ides/intellij.md b/daprdocs/content/en/developing-applications/ides/intellij.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/ides/intellij.md
rename to daprdocs/content/en/developing-applications/ides/intellij.md
index d4be07b3a..e7d5fef8d 100644
--- a/daprdocs/content/en/docs/developing-applications/ides/intellij.md
+++ b/daprdocs/content/en/developing-applications/ides/intellij.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "IntelliJ"
linkTitle: "IntelliJ"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/ides/vscode-debugging.md b/daprdocs/content/en/developing-applications/ides/vscode-debugging.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/ides/vscode-debugging.md
rename to daprdocs/content/en/developing-applications/ides/vscode-debugging.md
index 3cef23411..e7f70229a 100644
--- a/daprdocs/content/en/docs/developing-applications/ides/vscode-debugging.md
+++ b/daprdocs/content/en/developing-applications/ides/vscode-debugging.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "VS Code"
linkTitle: "VS Code"
weight: 2000
diff --git a/daprdocs/content/en/docs/developing-applications/ides/vscode-remotecontainers.md b/daprdocs/content/en/developing-applications/ides/vscode-remotecontainers.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/ides/vscode-remotecontainers.md
rename to daprdocs/content/en/developing-applications/ides/vscode-remotecontainers.md
index 300327695..00454d4a4 100644
--- a/daprdocs/content/en/docs/developing-applications/ides/vscode-remotecontainers.md
+++ b/daprdocs/content/en/developing-applications/ides/vscode-remotecontainers.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "VS Code remote containers"
linkTitle: "VS Code remote containers"
weight: 3000
diff --git a/daprdocs/content/en/docs/developing-applications/integrations/_index.md b/daprdocs/content/en/developing-applications/integrations/_index.md
similarity index 89%
rename from daprdocs/content/en/docs/developing-applications/integrations/_index.md
rename to daprdocs/content/en/developing-applications/integrations/_index.md
index 60684bbb6..430b4594d 100644
--- a/daprdocs/content/en/docs/developing-applications/integrations/_index.md
+++ b/daprdocs/content/en/developing-applications/integrations/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Integrations"
linkTitle: "Integrations"
weight: 50
diff --git a/daprdocs/content/en/docs/developing-applications/integrations/autoscale-keda.md b/daprdocs/content/en/developing-applications/integrations/autoscale-keda.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/integrations/autoscale-keda.md
rename to daprdocs/content/en/developing-applications/integrations/autoscale-keda.md
index 9115ce726..a9db2104a 100644
--- a/daprdocs/content/en/docs/developing-applications/integrations/autoscale-keda.md
+++ b/daprdocs/content/en/developing-applications/integrations/autoscale-keda.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Autoscaling a Dapr app with KEDA"
linkTitle: "Autoscale"
weight: 2000
diff --git a/daprdocs/content/en/docs/developing-applications/integrations/gRPC-integration.md b/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/integrations/gRPC-integration.md
rename to daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
index 81f97cebb..60dd41c3b 100644
--- a/daprdocs/content/en/docs/developing-applications/integrations/gRPC-integration.md
+++ b/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Dapr's gRPC Interface"
linkTitle: "gRPC"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/middleware/_index.md b/daprdocs/content/en/developing-applications/middleware/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/developing-applications/middleware/_index.md
rename to daprdocs/content/en/developing-applications/middleware/_index.md
index 1ee4dfe3f..3ea4f84d5 100644
--- a/daprdocs/content/en/docs/developing-applications/middleware/_index.md
+++ b/daprdocs/content/en/developing-applications/middleware/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Middleware"
linkTitle: "Middleware"
weight: 50
diff --git a/daprdocs/content/en/docs/developing-applications/middleware/middleware-opa-policies.md b/daprdocs/content/en/developing-applications/middleware/middleware-opa-policies.md
similarity index 99%
rename from daprdocs/content/en/docs/developing-applications/middleware/middleware-opa-policies.md
rename to daprdocs/content/en/developing-applications/middleware/middleware-opa-policies.md
index 114ac6b85..623a97a3f 100644
--- a/daprdocs/content/en/docs/developing-applications/middleware/middleware-opa-policies.md
+++ b/daprdocs/content/en/developing-applications/middleware/middleware-opa-policies.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Apply OPA policies"
linkTitle: "How-To: Apply OPA policies"
weight: 1000
diff --git a/daprdocs/content/en/docs/developing-applications/sdks/_index.md b/daprdocs/content/en/developing-applications/sdks/_index.md
similarity index 97%
rename from daprdocs/content/en/docs/developing-applications/sdks/_index.md
rename to daprdocs/content/en/developing-applications/sdks/_index.md
index 98fd51b01..a905eaabf 100644
--- a/daprdocs/content/en/docs/developing-applications/sdks/_index.md
+++ b/daprdocs/content/en/developing-applications/sdks/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "SDKs"
linkTitle: "SDKs"
weight: 20
diff --git a/daprdocs/content/en/docs/developing-applications/sdks/serialization.md b/daprdocs/content/en/developing-applications/sdks/serialization.md
similarity index 98%
rename from daprdocs/content/en/docs/developing-applications/sdks/serialization.md
rename to daprdocs/content/en/developing-applications/sdks/serialization.md
index 7b1b0f057..ae7b30e60 100644
--- a/daprdocs/content/en/docs/developing-applications/sdks/serialization.md
+++ b/daprdocs/content/en/developing-applications/sdks/serialization.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Serialization in Dapr's SDKs"
linkTitle: "Serialization"
weight: 1000
diff --git a/daprdocs/content/en/docs/_index.md b/daprdocs/content/en/docs/_index.md
deleted file mode 100644
index 96a9f0b71..000000000
--- a/daprdocs/content/en/docs/_index.md
+++ /dev/null
@@ -1 +0,0 @@
-#
\ No newline at end of file
diff --git a/daprdocs/content/en/docs/getting-started/_index.md b/daprdocs/content/en/getting-started/_index.md
similarity index 90%
rename from daprdocs/content/en/docs/getting-started/_index.md
rename to daprdocs/content/en/getting-started/_index.md
index 9d603ffb0..4dc9b12eb 100644
--- a/daprdocs/content/en/docs/getting-started/_index.md
+++ b/daprdocs/content/en/getting-started/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Getting started with Dapr"
linkTitle: "Getting started"
weight: 20
diff --git a/daprdocs/content/en/docs/getting-started/configure-redis.md b/daprdocs/content/en/getting-started/configure-redis.md
similarity index 99%
rename from daprdocs/content/en/docs/getting-started/configure-redis.md
rename to daprdocs/content/en/getting-started/configure-redis.md
index 712bc4b02..9722cffa4 100644
--- a/daprdocs/content/en/docs/getting-started/configure-redis.md
+++ b/daprdocs/content/en/getting-started/configure-redis.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Setup Redis"
linkTitle: "How-To: Setup Redis"
weight: 30
diff --git a/daprdocs/content/en/docs/getting-started/examples.md b/daprdocs/content/en/getting-started/examples.md
similarity index 100%
rename from daprdocs/content/en/docs/getting-started/examples.md
rename to daprdocs/content/en/getting-started/examples.md
diff --git a/daprdocs/content/en/docs/getting-started/getting-started-overview.md b/daprdocs/content/en/getting-started/getting-started-overview.md
similarity index 97%
rename from daprdocs/content/en/docs/getting-started/getting-started-overview.md
rename to daprdocs/content/en/getting-started/getting-started-overview.md
index 15399a392..842180b5d 100644
--- a/daprdocs/content/en/docs/getting-started/getting-started-overview.md
+++ b/daprdocs/content/en/getting-started/getting-started-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Getting started guide"
linkTitle: "Guide"
weight: 10
diff --git a/daprdocs/content/en/docs/getting-started/install-dapr.md b/daprdocs/content/en/getting-started/install-dapr.md
similarity index 99%
rename from daprdocs/content/en/docs/getting-started/install-dapr.md
rename to daprdocs/content/en/getting-started/install-dapr.md
index 1aa78a8eb..f53d0dec2 100644
--- a/daprdocs/content/en/docs/getting-started/install-dapr.md
+++ b/daprdocs/content/en/getting-started/install-dapr.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Setup Dapr environment"
linkTitle: "How-To: Setup environment"
weight: 20
diff --git a/daprdocs/content/en/docs/operations/_index.md b/daprdocs/content/en/operations/_index.md
similarity index 94%
rename from daprdocs/content/en/docs/operations/_index.md
rename to daprdocs/content/en/operations/_index.md
index 7f2059d2e..f639a8f55 100644
--- a/daprdocs/content/en/docs/operations/_index.md
+++ b/daprdocs/content/en/operations/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Deploying and configuring Dapr in your environment"
linkTitle: "Operations"
weight: 40
diff --git a/daprdocs/content/en/docs/operations/components/_index.md b/daprdocs/content/en/operations/components/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/components/_index.md
rename to daprdocs/content/en/operations/components/_index.md
index 355ee713c..d9df52530 100644
--- a/daprdocs/content/en/docs/operations/components/_index.md
+++ b/daprdocs/content/en/operations/components/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Managing components in Dapr"
linkTitle: "Components"
weight: 300
diff --git a/daprdocs/content/en/docs/operations/components/component-scopes.md b/daprdocs/content/en/operations/components/component-scopes.md
similarity index 98%
rename from daprdocs/content/en/docs/operations/components/component-scopes.md
rename to daprdocs/content/en/operations/components/component-scopes.md
index 788e00c42..4d76c6bac 100644
--- a/daprdocs/content/en/docs/operations/components/component-scopes.md
+++ b/daprdocs/content/en/operations/components/component-scopes.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Scope components to one or more applications"
linkTitle: "How-To: Set component scopes"
weight: 6000
diff --git a/daprdocs/content/en/docs/operations/components/component-secrets.md b/daprdocs/content/en/operations/components/component-secrets.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/component-secrets.md
rename to daprdocs/content/en/operations/components/component-secrets.md
index f27a0b17e..bf5ecabe0 100644
--- a/daprdocs/content/en/docs/operations/components/component-secrets.md
+++ b/daprdocs/content/en/operations/components/component-secrets.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "How-To: Reference secret stores in components"
linkTitle: "How-To: Reference secrets"
weight: 7000
diff --git a/daprdocs/content/en/docs/operations/components/setup-bindings/_index.md b/daprdocs/content/en/operations/components/setup-bindings/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/components/setup-bindings/_index.md
rename to daprdocs/content/en/operations/components/setup-bindings/_index.md
index 6e52e09d2..7cc3c5c5b 100644
--- a/daprdocs/content/en/docs/operations/components/setup-bindings/_index.md
+++ b/daprdocs/content/en/operations/components/setup-bindings/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Bindings components"
linkTitle: "Bindings"
description: "Guidance on setting up Dapr bindings components"
diff --git a/daprdocs/content/en/docs/operations/components/setup-bindings/setup-rethinkdb-bindings.md b/daprdocs/content/en/operations/components/setup-bindings/setup-rethinkdb-bindings.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-bindings/setup-rethinkdb-bindings.md
rename to daprdocs/content/en/operations/components/setup-bindings/setup-rethinkdb-bindings.md
index 457769993..72ec282b6 100644
--- a/daprdocs/content/en/docs/operations/components/setup-bindings/setup-rethinkdb-bindings.md
+++ b/daprdocs/content/en/operations/components/setup-bindings/setup-rethinkdb-bindings.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "RethinkDB binding"
linkTitle: "RethinkDB"
description: "Use bindings to RethinkDB for tracking state store changes"
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/_index.md b/daprdocs/content/en/operations/components/setup-pubsub/_index.md
similarity index 93%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/_index.md
rename to daprdocs/content/en/operations/components/setup-pubsub/_index.md
index 4b4372c8d..c3b9894c8 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/_index.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Pub/Sub components"
linkTitle: "Pub/Sub"
description: "Guidance on setting up different message brokers for Dapr Pub/Sub"
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-apache-kafka.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-apache-kafka.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-apache-kafka.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-apache-kafka.md
index 79559078f..29f4d0c2d 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-apache-kafka.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-apache-kafka.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Apache Kafka"
linkTitle: "Apache Kafka"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-aws-snssqs.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-aws-snssqs.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-aws-snssqs.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-aws-snssqs.md
index 38a70ff4d..c94ca6173 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-aws-snssqs.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-aws-snssqs.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "AWS SNS/SQS"
linkTitle: "AWS SNS/SQS"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-azure-eventhubs.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-azure-eventhubs.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-azure-eventhubs.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-azure-eventhubs.md
index 6994e28ce..7a232e8e3 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-azure-eventhubs.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-azure-eventhubs.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Events Hub"
linkTitle: "Azure Events Hub"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-azure-servicebus.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-azure-servicebus.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-azure-servicebus.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-azure-servicebus.md
index d953d9676..026664876 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-azure-servicebus.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-azure-servicebus.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Service Bus"
linkTitle: "Azure Events Hub"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-gcp.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-gcp.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-gcp.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-gcp.md
index 191f2197d..decf603b8 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-gcp.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-gcp.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "GCP Pub/Sub"
linkTitle: "GCP Pub/Sub"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-hazelcast.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-hazelcast.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-hazelcast.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-hazelcast.md
index 412942b63..b90f4dc16 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-hazelcast.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-hazelcast.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Hazelcast"
linkTitle: "Hazelcast"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-mqtt.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-mqtt.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-mqtt.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-mqtt.md
index 72ab23b3c..b261514a1 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-mqtt.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-mqtt.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "MQTT"
linkTitle: "MQTT"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-nats-streaming.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-nats-streaming.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-nats-streaming.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-nats-streaming.md
index a32642d12..4be7ba43e 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-nats-streaming.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-nats-streaming.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "NATS streaming"
linkTitle: "NATS streaming"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-pubsub-overview.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-pubsub-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-pubsub-overview.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-pubsub-overview.md
index f7a3fa1e3..9119b7148 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-pubsub-overview.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-pubsub-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Overview"
linkTitle: "Overview"
description: "General overview on set up of message brokers for Dapr Pub/Sub"
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-pulsar.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-pulsar.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-pulsar.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-pulsar.md
index 9edff9b7a..38fa09d03 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-pulsar.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-pulsar.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Pulsar"
linkTitle: "Pulsar"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-rabbitmq.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-rabbitmq.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-rabbitmq.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-rabbitmq.md
index 05ea2d542..a0a2a2970 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-rabbitmq.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-rabbitmq.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "RabbitMQ"
linkTitle: "RabbitMQ"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-redis.md b/daprdocs/content/en/operations/components/setup-pubsub/setup-redis.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-pubsub/setup-redis.md
rename to daprdocs/content/en/operations/components/setup-pubsub/setup-redis.md
index 568649d04..f28be4ebb 100644
--- a/daprdocs/content/en/docs/operations/components/setup-pubsub/setup-redis.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/setup-redis.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Redis streams"
linkTitle: "Redis streams"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/_index.md b/daprdocs/content/en/operations/components/setup-secret-store/_index.md
similarity index 93%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/_index.md
rename to daprdocs/content/en/operations/components/setup-secret-store/_index.md
index 343a579cf..e603b0126 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/_index.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Secret store components"
linkTitle: "Secret stores"
description: "Guidance on setting up different secret store components"
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/aws-secret-manager.md b/daprdocs/content/en/operations/components/setup-secret-store/aws-secret-manager.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/aws-secret-manager.md
rename to daprdocs/content/en/operations/components/setup-secret-store/aws-secret-manager.md
index cf35df1e5..4f918ad2f 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/aws-secret-manager.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/aws-secret-manager.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "AWS Secrets Manager"
linkTitle: "AWS Secrets Manager"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/azure-keyvault-managed-identity.md b/daprdocs/content/en/operations/components/setup-secret-store/azure-keyvault-managed-identity.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/azure-keyvault-managed-identity.md
rename to daprdocs/content/en/operations/components/setup-secret-store/azure-keyvault-managed-identity.md
index b016cf55e..9a03fad61 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/azure-keyvault-managed-identity.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/azure-keyvault-managed-identity.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Key Vault (Managed identities)"
linkTitle: "Azure Key Vault (Managed identities)"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/azure-keyvault.md b/daprdocs/content/en/operations/components/setup-secret-store/azure-keyvault.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/azure-keyvault.md
rename to daprdocs/content/en/operations/components/setup-secret-store/azure-keyvault.md
index eae0f7cbe..4169fd2e3 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/azure-keyvault.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/azure-keyvault.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Key Vault"
linkTitle: "Azure Key Vault"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/envvar-secret-store.md b/daprdocs/content/en/operations/components/setup-secret-store/envvar-secret-store.md
similarity index 98%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/envvar-secret-store.md
rename to daprdocs/content/en/operations/components/setup-secret-store/envvar-secret-store.md
index b75df7bbd..58a77738d 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/envvar-secret-store.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/envvar-secret-store.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Local environment variables (for Development)"
linkTitle: "Local environment variables"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/file-secret-store.md b/daprdocs/content/en/operations/components/setup-secret-store/file-secret-store.md
similarity index 98%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/file-secret-store.md
rename to daprdocs/content/en/operations/components/setup-secret-store/file-secret-store.md
index cc89d39c2..d2cf91d5c 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/file-secret-store.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/file-secret-store.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Local file (for Development)"
linkTitle: "Local file"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/gcp-secret-manager.md b/daprdocs/content/en/operations/components/setup-secret-store/gcp-secret-manager.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/gcp-secret-manager.md
rename to daprdocs/content/en/operations/components/setup-secret-store/gcp-secret-manager.md
index fab46221c..fa9eb3f37 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/gcp-secret-manager.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/gcp-secret-manager.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "GCP Secret Manager"
linkTitle: "GCP Secret Manager"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/hashicorp-vault.md b/daprdocs/content/en/operations/components/setup-secret-store/hashicorp-vault.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/hashicorp-vault.md
rename to daprdocs/content/en/operations/components/setup-secret-store/hashicorp-vault.md
index b22d75280..387cde142 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/hashicorp-vault.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/hashicorp-vault.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "HashiCorp Vault"
linkTitle: "HashiCorp Vault"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-secret-store/kubernetes.md b/daprdocs/content/en/operations/components/setup-secret-store/kubernetes.md
similarity index 97%
rename from daprdocs/content/en/docs/operations/components/setup-secret-store/kubernetes.md
rename to daprdocs/content/en/operations/components/setup-secret-store/kubernetes.md
index ec02380d6..1537dda44 100644
--- a/daprdocs/content/en/docs/operations/components/setup-secret-store/kubernetes.md
+++ b/daprdocs/content/en/operations/components/setup-secret-store/kubernetes.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Kubernetes Secrets"
linkTitle: "Kubernetes Secrets"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/_index.md b/daprdocs/content/en/operations/components/setup-state-store/_index.md
similarity index 92%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/_index.md
rename to daprdocs/content/en/operations/components/setup-state-store/_index.md
index de5106df3..5393c77ba 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/_index.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "State management components"
linkTitle: "State management"
description: "Guidance on setting up different state stores for Dapr state management"
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-aerospike.md b/daprdocs/content/en/operations/components/setup-state-store/setup-aerospike.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-aerospike.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-aerospike.md
index d3f6e1f89..c50aeb3d0 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-aerospike.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-aerospike.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Aerospike"
linkTitle: "Aerospike"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-blobstorage.md b/daprdocs/content/en/operations/components/setup-state-store/setup-azure-blobstorage.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-blobstorage.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-azure-blobstorage.md
index ddaf03381..d846dc78e 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-blobstorage.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-azure-blobstorage.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Blob Storage"
linkTitle: "Azure Blob Storage"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-cosmosdb.md b/daprdocs/content/en/operations/components/setup-state-store/setup-azure-cosmosdb.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-cosmosdb.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-azure-cosmosdb.md
index f118b4be6..bae02a90f 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-cosmosdb.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-azure-cosmosdb.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Cosmos DB"
linkTitle: "Azure Cosmos DB"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-tablestorage.md b/daprdocs/content/en/operations/components/setup-state-store/setup-azure-tablestorage.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-tablestorage.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-azure-tablestorage.md
index c6ec8a8b5..60cc621bb 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-azure-tablestorage.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-azure-tablestorage.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Azure Table Storage "
linkTitle: "Azure Table Storage "
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-cassandra.md b/daprdocs/content/en/operations/components/setup-state-store/setup-cassandra.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-cassandra.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-cassandra.md
index a4b035dee..6ca3b3159 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-cassandra.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-cassandra.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Cassandra"
linkTitle: "Cassandra"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-cloudstate.md b/daprdocs/content/en/operations/components/setup-state-store/setup-cloudstate.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-cloudstate.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-cloudstate.md
index 897591789..128373800 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-cloudstate.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-cloudstate.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Cloudstate"
linkTitle: "Cloudstate"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-consul.md b/daprdocs/content/en/operations/components/setup-state-store/setup-consul.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-consul.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-consul.md
index 573f38827..0451c4cf8 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-consul.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-consul.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "HashiCorp Consul"
linkTitle: "HashiCorp Consul"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-couchbase.md b/daprdocs/content/en/operations/components/setup-state-store/setup-couchbase.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-couchbase.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-couchbase.md
index be913cd45..90349591b 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-couchbase.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-couchbase.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Couchbase"
linkTitle: "Couchbase"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-etcd.md b/daprdocs/content/en/operations/components/setup-state-store/setup-etcd.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-etcd.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-etcd.md
index 8467891ba..4846f076c 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-etcd.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-etcd.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "etcd"
linkTitle: "etcd"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-firestore.md b/daprdocs/content/en/operations/components/setup-state-store/setup-firestore.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-firestore.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-firestore.md
index 9309c4547..8d76fa922 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-firestore.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-firestore.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "GCP Firestore (Datastore mode)"
linkTitle: "GCP Firestore"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-hazelcast.md b/daprdocs/content/en/operations/components/setup-state-store/setup-hazelcast.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-hazelcast.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-hazelcast.md
index 4f316797b..9e5e71fe6 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-hazelcast.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-hazelcast.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Hazelcast"
linkTitle: "Hazelcast"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-memcached.md b/daprdocs/content/en/operations/components/setup-state-store/setup-memcached.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-memcached.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-memcached.md
index d75797095..d154a81bb 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-memcached.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-memcached.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Memcached"
linkTitle: "Memcached"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-mongodb.md b/daprdocs/content/en/operations/components/setup-state-store/setup-mongodb.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-mongodb.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-mongodb.md
index baf916e20..63af9d250 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-mongodb.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-mongodb.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "MongoDB"
linkTitle: "MongoDB"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-postgresql.md b/daprdocs/content/en/operations/components/setup-state-store/setup-postgresql.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-postgresql.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-postgresql.md
index 2b3cf5622..df9066236 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-postgresql.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-postgresql.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "PostgreSQL"
linkTitle: "PostgreSQL"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-redis.md b/daprdocs/content/en/operations/components/setup-state-store/setup-redis.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-redis.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-redis.md
index 81f197fae..a4bdb7ce9 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-redis.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-redis.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Redis"
linkTitle: "Redis"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-rethinkdb.md b/daprdocs/content/en/operations/components/setup-state-store/setup-rethinkdb.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-rethinkdb.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-rethinkdb.md
index c237785a7..c3b55ac2f 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-rethinkdb.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-rethinkdb.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "RethinkDB"
linkTitle: "RethinkDB"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-sqlserver.md b/daprdocs/content/en/operations/components/setup-state-store/setup-sqlserver.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-sqlserver.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-sqlserver.md
index dbdeb1038..3a358ca19 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-sqlserver.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-sqlserver.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "SQL Server"
linkTitle: "SQL Server"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-state-store-overview.md b/daprdocs/content/en/operations/components/setup-state-store/setup-state-store-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-state-store-overview.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-state-store-overview.md
index 9ae67997c..f0a6052d9 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-state-store-overview.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-state-store-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Overview"
linkTitle: "Overview"
description: "Guidance on set up for state management components"
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-zookeeper.md b/daprdocs/content/en/operations/components/setup-state-store/setup-zookeeper.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/setup-zookeeper.md
rename to daprdocs/content/en/operations/components/setup-state-store/setup-zookeeper.md
index 9eb307875..1fa36c4b1 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/setup-zookeeper.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/setup-zookeeper.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Zookeeper"
linkTitle: "Zookeeper"
type: docs
diff --git a/daprdocs/content/en/docs/operations/components/setup-state-store/supported-state-stores.md b/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores.md
similarity index 98%
rename from daprdocs/content/en/docs/operations/components/setup-state-store/supported-state-stores.md
rename to daprdocs/content/en/operations/components/setup-state-store/supported-state-stores.md
index b8aed45bd..1f6e03d9f 100644
--- a/daprdocs/content/en/docs/operations/components/setup-state-store/supported-state-stores.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Supported stores"
linkTitle: "Supported stores"
description: "CRUD and/or transactional support for supported stores"
diff --git a/daprdocs/content/en/docs/operations/configuration/_index.md b/daprdocs/content/en/operations/configuration/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/configuration/_index.md
rename to daprdocs/content/en/operations/configuration/_index.md
index a3f4c2b5b..978858a53 100644
--- a/daprdocs/content/en/docs/operations/configuration/_index.md
+++ b/daprdocs/content/en/operations/configuration/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Manage Dapr configuration"
linkTitle: "Configuration"
weight: 200
diff --git a/daprdocs/content/en/docs/operations/configuration/configuration-overview.md b/daprdocs/content/en/operations/configuration/configuration-overview.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/configuration/configuration-overview.md
rename to daprdocs/content/en/operations/configuration/configuration-overview.md
index 733f4158a..2f9f4e619 100644
--- a/daprdocs/content/en/docs/operations/configuration/configuration-overview.md
+++ b/daprdocs/content/en/operations/configuration/configuration-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Overview of Dapr configuration options"
linkTitle: "Overview"
weight: 100
diff --git a/daprdocs/content/en/docs/operations/configuration/control-concurrency.md b/daprdocs/content/en/operations/configuration/control-concurrency.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/configuration/control-concurrency.md
rename to daprdocs/content/en/operations/configuration/control-concurrency.md
index be231ea7b..e1c0896e5 100644
--- a/daprdocs/content/en/docs/operations/configuration/control-concurrency.md
+++ b/daprdocs/content/en/operations/configuration/control-concurrency.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Control concurrency and rate limit applications"
linkTitle: "Concurrency & rate limits"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/configuration/grpc.md b/daprdocs/content/en/operations/configuration/grpc.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/configuration/grpc.md
rename to daprdocs/content/en/operations/configuration/grpc.md
index 289505281..df49b5a37 100644
--- a/daprdocs/content/en/docs/operations/configuration/grpc.md
+++ b/daprdocs/content/en/operations/configuration/grpc.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Configure Dapr to use gRPC"
linkTitle: "Use gRPC interface"
weight: 5000
diff --git a/daprdocs/content/en/docs/operations/configuration/invoke-allowlist.md b/daprdocs/content/en/operations/configuration/invoke-allowlist.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/configuration/invoke-allowlist.md
rename to daprdocs/content/en/operations/configuration/invoke-allowlist.md
index ac7c02f45..0ff07083d 100644
--- a/daprdocs/content/en/docs/operations/configuration/invoke-allowlist.md
+++ b/daprdocs/content/en/operations/configuration/invoke-allowlist.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Apply access control list configuration for service invocation"
linkTitle: "Service Invocation access control"
weight: 4000
diff --git a/daprdocs/content/en/docs/operations/configuration/secret-scope.md b/daprdocs/content/en/operations/configuration/secret-scope.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/configuration/secret-scope.md
rename to daprdocs/content/en/operations/configuration/secret-scope.md
index 8d7b68812..4ab29e150 100644
--- a/daprdocs/content/en/docs/operations/configuration/secret-scope.md
+++ b/daprdocs/content/en/operations/configuration/secret-scope.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Limit the secrets that can be read from secret stores"
linkTitle: "Limit secret store access"
weight: 3000
diff --git a/daprdocs/content/en/docs/operations/hosting/_index.md b/daprdocs/content/en/operations/hosting/_index.md
similarity index 90%
rename from daprdocs/content/en/docs/operations/hosting/_index.md
rename to daprdocs/content/en/operations/hosting/_index.md
index 01ba8061d..2dd2b7d81 100644
--- a/daprdocs/content/en/docs/operations/hosting/_index.md
+++ b/daprdocs/content/en/operations/hosting/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Hosting options for Dapr"
linkTitle: "Hosting options"
weight: 100
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/_index.md b/daprdocs/content/en/operations/hosting/kubernetes/_index.md
similarity index 93%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/_index.md
rename to daprdocs/content/en/operations/hosting/kubernetes/_index.md
index acc042fea..124319d83 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/_index.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Deploy and run Dapr in Kubernetes mode"
linkTitle: "Kubernetes"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/_index.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/_index.md
rename to daprdocs/content/en/operations/hosting/kubernetes/cluster/_index.md
index 9c44e84f3..fbc733d04 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/_index.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Kubernetes cluster setup"
linkTitle: "How-to: Setup clusters"
weight: 50000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/setup-aks.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/setup-aks.md
rename to daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md
index 006650cca..905ef73b7 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/setup-aks.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Setup an Azure Kubernetes Service cluster"
linkTitle: "Azure Kubernetes Service"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/setup-minikube.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/setup-minikube.md
rename to daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md
index 8435b1418..4c9f5deff 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/cluster/setup-minikube.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Setup an Minikube cluster"
linkTitle: "Minikube"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-annotations.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-annotations.md
rename to daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md
index 45a323bd4..d0c6e2ac3 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-annotations.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Dapr Kubernetes pod annotations spec"
linkTitle: "Kubernetes annotations"
weight: 40000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-hybrid-clusters.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-hybrid-clusters.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-hybrid-clusters.md
rename to daprdocs/content/en/operations/hosting/kubernetes/kubernetes-hybrid-clusters.md
index c4f089518..8dc693041 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-hybrid-clusters.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-hybrid-clusters.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Deploy to hybrid Linux/Windows Kubernetes clusters"
linkTitle: "Hybrid clusters"
weight: 20000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-overview.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
similarity index 97%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-overview.md
rename to daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
index 9ce48f257..3af957488 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-overview.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Overview of Dapr on Kubernetes"
linkTitle: "Overview"
weight: 10000
diff --git a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-production.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-production.md
rename to daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md
index c5a6fbc7c..7cfde34c6 100644
--- a/daprdocs/content/en/docs/operations/hosting/kubernetes/kubernetes-production.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Guidelines for production ready deployments on Kubernetes"
linkTitle: "Production guidelines"
weight: 10000
diff --git a/daprdocs/content/en/docs/operations/hosting/self-hosted/_index.md b/daprdocs/content/en/operations/hosting/self-hosted/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/hosting/self-hosted/_index.md
rename to daprdocs/content/en/operations/hosting/self-hosted/_index.md
index 1697ec984..9c70df3ad 100644
--- a/daprdocs/content/en/docs/operations/hosting/self-hosted/_index.md
+++ b/daprdocs/content/en/operations/hosting/self-hosted/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Run Dapr in Self Hosted Mode"
linkTitle: "Self-Hosted"
weight: 1000
diff --git a/daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-no-docker.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-no-docker.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-no-docker.md
rename to daprdocs/content/en/operations/hosting/self-hosted/self-hosted-no-docker.md
index 6f2a8928b..4b69770d3 100644
--- a/daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-no-docker.md
+++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-no-docker.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Run Dapr in self-hosted mode without Docker"
linkTitle: "Run without Docker"
weight: 30000
diff --git a/daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-overview.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md
similarity index 98%
rename from daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-overview.md
rename to daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md
index 774fa886f..d149f91ea 100644
--- a/daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-overview.md
+++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Overview of Dapr in self-hosted mode"
linkTitle: "Overview"
weight: 10000
diff --git a/daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-with-docker.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-with-docker.md
rename to daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
index 23ca883db..1337211a4 100644
--- a/daprdocs/content/en/docs/operations/hosting/self-hosted/self-hosted-with-docker.md
+++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Run Dapr in self-hosted mode with Docker"
linkTitle: "Run with Docker"
weight: 20000
diff --git a/daprdocs/content/en/docs/operations/monitoring/_index.md b/daprdocs/content/en/operations/monitoring/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/monitoring/_index.md
rename to daprdocs/content/en/operations/monitoring/_index.md
index 9e20b45cf..9f5489d92 100644
--- a/daprdocs/content/en/docs/operations/monitoring/_index.md
+++ b/daprdocs/content/en/operations/monitoring/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Monitor your application with Dapr"
linkTitle: "Monitoring"
weight: 400
diff --git a/daprdocs/content/en/docs/operations/monitoring/application-insights.md b/daprdocs/content/en/operations/monitoring/application-insights.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/monitoring/application-insights.md
rename to daprdocs/content/en/operations/monitoring/application-insights.md
index e0255dc29..86a33e579 100644
--- a/daprdocs/content/en/docs/operations/monitoring/application-insights.md
+++ b/daprdocs/content/en/operations/monitoring/application-insights.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Set up Application Insights for distributed tracing"
linkTitle: "Application Insights"
weight: 3000
diff --git a/daprdocs/content/en/docs/operations/monitoring/azure-monitor.md b/daprdocs/content/en/operations/monitoring/azure-monitor.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/monitoring/azure-monitor.md
rename to daprdocs/content/en/operations/monitoring/azure-monitor.md
index f26699cba..3bd09651c 100644
--- a/daprdocs/content/en/docs/operations/monitoring/azure-monitor.md
+++ b/daprdocs/content/en/operations/monitoring/azure-monitor.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Set up Azure Monitor to search logs and collect metrics"
linkTitle: "Azure Monitor"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/monitoring/fluentd.md b/daprdocs/content/en/operations/monitoring/fluentd.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/monitoring/fluentd.md
rename to daprdocs/content/en/operations/monitoring/fluentd.md
index 5d4746e37..b6dc1c98b 100644
--- a/daprdocs/content/en/docs/operations/monitoring/fluentd.md
+++ b/daprdocs/content/en/operations/monitoring/fluentd.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Set up Fluentd, Elastic search and Kibana in Kubernetes"
linkTitle: "FluentD"
weight: 1000
diff --git a/daprdocs/content/en/docs/operations/monitoring/grafana.md b/daprdocs/content/en/operations/monitoring/grafana.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/monitoring/grafana.md
rename to daprdocs/content/en/operations/monitoring/grafana.md
index 6d3af2080..6c5320ca1 100644
--- a/daprdocs/content/en/docs/operations/monitoring/grafana.md
+++ b/daprdocs/content/en/operations/monitoring/grafana.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Observe metrics with Grafana"
linkTitle: "Grafana"
weight: 5000
diff --git a/daprdocs/content/en/docs/operations/monitoring/prometheus.md b/daprdocs/content/en/operations/monitoring/prometheus.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/monitoring/prometheus.md
rename to daprdocs/content/en/operations/monitoring/prometheus.md
index aae47647b..bd8fce882 100644
--- a/daprdocs/content/en/docs/operations/monitoring/prometheus.md
+++ b/daprdocs/content/en/operations/monitoring/prometheus.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Observe metrics with Prometheus"
linkTitle: "Prometheus"
weight: 4000
diff --git a/daprdocs/content/en/docs/operations/monitoring/zipkin.md b/daprdocs/content/en/operations/monitoring/zipkin.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/monitoring/zipkin.md
rename to daprdocs/content/en/operations/monitoring/zipkin.md
index b09879632..be79ee65e 100644
--- a/daprdocs/content/en/docs/operations/monitoring/zipkin.md
+++ b/daprdocs/content/en/operations/monitoring/zipkin.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Set up Zipkin for distributed tracing"
linkTitle: "Zipkin"
weight: 3000
diff --git a/daprdocs/content/en/docs/operations/security/_index.md b/daprdocs/content/en/operations/security/_index.md
similarity index 91%
rename from daprdocs/content/en/docs/operations/security/_index.md
rename to daprdocs/content/en/operations/security/_index.md
index b5c495c31..08801c900 100644
--- a/daprdocs/content/en/docs/operations/security/_index.md
+++ b/daprdocs/content/en/operations/security/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Securing Dapr deployments"
linkTitle: "Security"
weight: 500
diff --git a/daprdocs/content/en/docs/operations/security/api-token.md b/daprdocs/content/en/operations/security/api-token.md
similarity index 98%
rename from daprdocs/content/en/docs/operations/security/api-token.md
rename to daprdocs/content/en/operations/security/api-token.md
index e74f3dcef..e6d03c2d7 100644
--- a/daprdocs/content/en/docs/operations/security/api-token.md
+++ b/daprdocs/content/en/operations/security/api-token.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Enable API token based authentication"
linkTitle: "API token auth"
weight: 3000
diff --git a/daprdocs/content/en/docs/operations/security/mtls.md b/daprdocs/content/en/operations/security/mtls.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/security/mtls.md
rename to daprdocs/content/en/operations/security/mtls.md
index 862a86cd3..4b14e56fb 100644
--- a/daprdocs/content/en/docs/operations/security/mtls.md
+++ b/daprdocs/content/en/operations/security/mtls.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Setup & configure mutual TLS"
linkTitle: "mTLS"
weight: 1000
diff --git a/daprdocs/content/en/docs/operations/security/oauth.md b/daprdocs/content/en/operations/security/oauth.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/security/oauth.md
rename to daprdocs/content/en/operations/security/oauth.md
index a56d7453f..8b0410e8e 100644
--- a/daprdocs/content/en/docs/operations/security/oauth.md
+++ b/daprdocs/content/en/operations/security/oauth.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Configure API authention with OAUTH"
linkTitle: "OAuth"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/troubleshooting/_index.md b/daprdocs/content/en/operations/troubleshooting/_index.md
similarity index 94%
rename from daprdocs/content/en/docs/operations/troubleshooting/_index.md
rename to daprdocs/content/en/operations/troubleshooting/_index.md
index c52175840..218e9cd0e 100644
--- a/daprdocs/content/en/docs/operations/troubleshooting/_index.md
+++ b/daprdocs/content/en/operations/troubleshooting/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Debugging and Troubleshooting"
linkTitle: "Troubleshooting"
weight: 700
diff --git a/daprdocs/content/en/docs/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/troubleshooting/common_issues.md
rename to daprdocs/content/en/operations/troubleshooting/common_issues.md
index 1e7d74bd5..cae4268d1 100644
--- a/daprdocs/content/en/docs/operations/troubleshooting/common_issues.md
+++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Common issues when running Dapr"
linkTitle: "Common Issues"
weight: 1000
diff --git a/daprdocs/content/en/docs/operations/troubleshooting/logs.md b/daprdocs/content/en/operations/troubleshooting/logs.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/troubleshooting/logs.md
rename to daprdocs/content/en/operations/troubleshooting/logs.md
index 61fe4cb23..441beebe8 100644
--- a/daprdocs/content/en/docs/operations/troubleshooting/logs.md
+++ b/daprdocs/content/en/operations/troubleshooting/logs.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Configure and view Dapr Logs"
linkTitle: "Logs"
weight: 2000
diff --git a/daprdocs/content/en/docs/operations/troubleshooting/profiling-debugging.md b/daprdocs/content/en/operations/troubleshooting/profiling-debugging.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/troubleshooting/profiling-debugging.md
rename to daprdocs/content/en/operations/troubleshooting/profiling-debugging.md
index 13512b430..a803bd9fa 100644
--- a/daprdocs/content/en/docs/operations/troubleshooting/profiling-debugging.md
+++ b/daprdocs/content/en/operations/troubleshooting/profiling-debugging.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Profiling & Debugging"
linkTitle: "Debugging"
weight: 4000
diff --git a/daprdocs/content/en/docs/operations/troubleshooting/setup-tracing.md b/daprdocs/content/en/operations/troubleshooting/setup-tracing.md
similarity index 99%
rename from daprdocs/content/en/docs/operations/troubleshooting/setup-tracing.md
rename to daprdocs/content/en/operations/troubleshooting/setup-tracing.md
index 6b704e0e2..afdbc8eb7 100644
--- a/daprdocs/content/en/docs/operations/troubleshooting/setup-tracing.md
+++ b/daprdocs/content/en/operations/troubleshooting/setup-tracing.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Tracing"
linkTitle: "Tracing"
weight: 3000
diff --git a/daprdocs/content/en/docs/reference/_index.md b/daprdocs/content/en/reference/_index.md
similarity index 99%
rename from daprdocs/content/en/docs/reference/_index.md
rename to daprdocs/content/en/reference/_index.md
index b4254e1e8..802d22700 100644
--- a/daprdocs/content/en/docs/reference/_index.md
+++ b/daprdocs/content/en/reference/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: "Dapr Reference Docs"
linkTitle: "Reference"
weight: 60
diff --git a/daprdocs/content/en/docs/reference/api/_index.md b/daprdocs/content/en/reference/api/_index.md
similarity index 97%
rename from daprdocs/content/en/docs/reference/api/_index.md
rename to daprdocs/content/en/reference/api/_index.md
index 03d5ff66d..48e825b37 100644
--- a/daprdocs/content/en/docs/reference/api/_index.md
+++ b/daprdocs/content/en/reference/api/_index.md
@@ -1,4 +1,5 @@
---
+type: docs
title: Dapr API reference
linkTitle: "Dapr API"
---
diff --git a/daprdocs/content/en/docs/reference/api/actors_api.md b/daprdocs/content/en/reference/api/actors_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/actors_api.md
rename to daprdocs/content/en/reference/api/actors_api.md
diff --git a/daprdocs/content/en/docs/reference/api/bindings_api.md b/daprdocs/content/en/reference/api/bindings_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/bindings_api.md
rename to daprdocs/content/en/reference/api/bindings_api.md
diff --git a/daprdocs/content/en/docs/reference/api/error_codes.md b/daprdocs/content/en/reference/api/error_codes.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/error_codes.md
rename to daprdocs/content/en/reference/api/error_codes.md
diff --git a/daprdocs/content/en/docs/reference/api/health_api.md b/daprdocs/content/en/reference/api/health_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/health_api.md
rename to daprdocs/content/en/reference/api/health_api.md
diff --git a/daprdocs/content/en/docs/reference/api/pubsub_api.md b/daprdocs/content/en/reference/api/pubsub_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/pubsub_api.md
rename to daprdocs/content/en/reference/api/pubsub_api.md
diff --git a/daprdocs/content/en/docs/reference/api/secrets_api.md b/daprdocs/content/en/reference/api/secrets_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/secrets_api.md
rename to daprdocs/content/en/reference/api/secrets_api.md
diff --git a/daprdocs/content/en/docs/reference/api/service_invocation_api.md b/daprdocs/content/en/reference/api/service_invocation_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/service_invocation_api.md
rename to daprdocs/content/en/reference/api/service_invocation_api.md
diff --git a/daprdocs/content/en/docs/reference/api/state_api.md b/daprdocs/content/en/reference/api/state_api.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/api/state_api.md
rename to daprdocs/content/en/reference/api/state_api.md
diff --git a/daprdocs/content/en/docs/reference/cli/_index.md b/daprdocs/content/en/reference/cli/_index.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/cli/_index.md
rename to daprdocs/content/en/reference/cli/_index.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/README.md b/daprdocs/content/en/reference/specs/bindings/README.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/README.md
rename to daprdocs/content/en/reference/specs/bindings/README.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/blobstorage.md b/daprdocs/content/en/reference/specs/bindings/blobstorage.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/blobstorage.md
rename to daprdocs/content/en/reference/specs/bindings/blobstorage.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/cosmosdb.md b/daprdocs/content/en/reference/specs/bindings/cosmosdb.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/cosmosdb.md
rename to daprdocs/content/en/reference/specs/bindings/cosmosdb.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/cron.md b/daprdocs/content/en/reference/specs/bindings/cron.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/cron.md
rename to daprdocs/content/en/reference/specs/bindings/cron.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/dynamodb.md b/daprdocs/content/en/reference/specs/bindings/dynamodb.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/dynamodb.md
rename to daprdocs/content/en/reference/specs/bindings/dynamodb.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/eventgrid.md b/daprdocs/content/en/reference/specs/bindings/eventgrid.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/eventgrid.md
rename to daprdocs/content/en/reference/specs/bindings/eventgrid.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/eventhubs.md b/daprdocs/content/en/reference/specs/bindings/eventhubs.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/eventhubs.md
rename to daprdocs/content/en/reference/specs/bindings/eventhubs.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/gcpbucket.md b/daprdocs/content/en/reference/specs/bindings/gcpbucket.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/gcpbucket.md
rename to daprdocs/content/en/reference/specs/bindings/gcpbucket.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/gcppubsub.md b/daprdocs/content/en/reference/specs/bindings/gcppubsub.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/gcppubsub.md
rename to daprdocs/content/en/reference/specs/bindings/gcppubsub.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/http.md b/daprdocs/content/en/reference/specs/bindings/http.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/http.md
rename to daprdocs/content/en/reference/specs/bindings/http.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/influxdb.md b/daprdocs/content/en/reference/specs/bindings/influxdb.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/influxdb.md
rename to daprdocs/content/en/reference/specs/bindings/influxdb.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/kafka.md b/daprdocs/content/en/reference/specs/bindings/kafka.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/kafka.md
rename to daprdocs/content/en/reference/specs/bindings/kafka.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/kinesis.md b/daprdocs/content/en/reference/specs/bindings/kinesis.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/kinesis.md
rename to daprdocs/content/en/reference/specs/bindings/kinesis.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/kubernetes.md b/daprdocs/content/en/reference/specs/bindings/kubernetes.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/kubernetes.md
rename to daprdocs/content/en/reference/specs/bindings/kubernetes.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/mqtt.md b/daprdocs/content/en/reference/specs/bindings/mqtt.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/mqtt.md
rename to daprdocs/content/en/reference/specs/bindings/mqtt.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/postgres.md b/daprdocs/content/en/reference/specs/bindings/postgres.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/postgres.md
rename to daprdocs/content/en/reference/specs/bindings/postgres.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/rabbitmq.md b/daprdocs/content/en/reference/specs/bindings/rabbitmq.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/rabbitmq.md
rename to daprdocs/content/en/reference/specs/bindings/rabbitmq.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/redis.md b/daprdocs/content/en/reference/specs/bindings/redis.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/redis.md
rename to daprdocs/content/en/reference/specs/bindings/redis.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/s3.md b/daprdocs/content/en/reference/specs/bindings/s3.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/s3.md
rename to daprdocs/content/en/reference/specs/bindings/s3.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/sendgrid.md b/daprdocs/content/en/reference/specs/bindings/sendgrid.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/sendgrid.md
rename to daprdocs/content/en/reference/specs/bindings/sendgrid.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/servicebusqueues.md b/daprdocs/content/en/reference/specs/bindings/servicebusqueues.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/servicebusqueues.md
rename to daprdocs/content/en/reference/specs/bindings/servicebusqueues.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/signalr.md b/daprdocs/content/en/reference/specs/bindings/signalr.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/signalr.md
rename to daprdocs/content/en/reference/specs/bindings/signalr.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/sns.md b/daprdocs/content/en/reference/specs/bindings/sns.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/sns.md
rename to daprdocs/content/en/reference/specs/bindings/sns.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/sqs.md b/daprdocs/content/en/reference/specs/bindings/sqs.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/sqs.md
rename to daprdocs/content/en/reference/specs/bindings/sqs.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/storagequeues.md b/daprdocs/content/en/reference/specs/bindings/storagequeues.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/storagequeues.md
rename to daprdocs/content/en/reference/specs/bindings/storagequeues.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/twilio.md b/daprdocs/content/en/reference/specs/bindings/twilio.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/twilio.md
rename to daprdocs/content/en/reference/specs/bindings/twilio.md
diff --git a/daprdocs/content/en/docs/reference/specs/bindings/twitter.md b/daprdocs/content/en/reference/specs/bindings/twitter.md
similarity index 100%
rename from daprdocs/content/en/docs/reference/specs/bindings/twitter.md
rename to daprdocs/content/en/reference/specs/bindings/twitter.md
diff --git a/daprdocs/content/en/docs/roadmap/_index.md b/daprdocs/content/en/roadmap/_index.md
similarity index 100%
rename from daprdocs/content/en/docs/roadmap/_index.md
rename to daprdocs/content/en/roadmap/_index.md
diff --git a/daprdocs/layouts/partials/section-index.html b/daprdocs/layouts/partials/section-index.html
index 51e6865a2..a6cd834bc 100644
--- a/daprdocs/layouts/partials/section-index.html
+++ b/daprdocs/layouts/partials/section-index.html
@@ -1,11 +1,14 @@