diff --git a/content/api/_index.md b/content/api/_index.md
index 1a904f842..9e175dcc7 100644
--- a/content/api/_index.md
+++ b/content/api/_index.md
@@ -6,5 +6,5 @@ description: >
   This section contains information on how to use the Vela API.
 menu:
   main:
-    weight: 405
+    weight: 505
 ---
diff --git a/content/cli/_index.md b/content/cli/_index.md
index f71f3dabd..feb43dae9 100644
--- a/content/cli/_index.md
+++ b/content/cli/_index.md
@@ -6,5 +6,5 @@ description: >
   This section contains information on how to use the Vela CLI.
 menu:
   main:
-    weight: 505
+    weight: 605
 ---
diff --git a/content/concepts/_index.md b/content/concepts/_index.md
new file mode 100644
index 000000000..9ce53eebe
--- /dev/null
+++ b/content/concepts/_index.md
@@ -0,0 +1,10 @@
+---
+title: "Concepts"
+linkTitle: "Concepts"
+layout: concepts
+description: >
+  This section contains information on the components for Vela.
+menu:
+  main:
+    weight: 5
+---
diff --git a/content/usage/concepts/infrastructure/_index.md b/content/concepts/infrastructure/_index.md
similarity index 68%
rename from content/usage/concepts/infrastructure/_index.md
rename to content/concepts/infrastructure/_index.md
index c05abedd3..1c0847e6f 100644
--- a/content/usage/concepts/infrastructure/_index.md
+++ b/content/concepts/infrastructure/_index.md
@@ -2,7 +2,7 @@
 title: "Infrastructure"
 linkTitle: "Infrastructure"
 description: >
-  This section contains information on the Vela infrastructure components.
+  This section contains information on the infrastructure components.
 ---
 
 The `infrastructure` components are a list of applications that run and operate Vela.
diff --git a/content/usage/concepts/infrastructure/compiler.md b/content/concepts/infrastructure/compiler.md
similarity index 100%
rename from content/usage/concepts/infrastructure/compiler.md
rename to content/concepts/infrastructure/compiler.md
diff --git a/content/usage/concepts/infrastructure/database.md b/content/concepts/infrastructure/database.md
similarity index 100%
rename from content/usage/concepts/infrastructure/database.md
rename to content/concepts/infrastructure/database.md
diff --git a/content/usage/concepts/infrastructure/queue.md b/content/concepts/infrastructure/queue.md
similarity index 100%
rename from content/usage/concepts/infrastructure/queue.md
rename to content/concepts/infrastructure/queue.md
diff --git a/content/usage/concepts/infrastructure/server.md b/content/concepts/infrastructure/server.md
similarity index 100%
rename from content/usage/concepts/infrastructure/server.md
rename to content/concepts/infrastructure/server.md
diff --git a/content/usage/concepts/infrastructure/source.md b/content/concepts/infrastructure/source.md
similarity index 100%
rename from content/usage/concepts/infrastructure/source.md
rename to content/concepts/infrastructure/source.md
diff --git a/content/usage/concepts/infrastructure/worker.md b/content/concepts/infrastructure/worker.md
similarity index 100%
rename from content/usage/concepts/infrastructure/worker.md
rename to content/concepts/infrastructure/worker.md
diff --git a/content/usage/concepts/pipeline/_index.md b/content/concepts/pipeline/_index.md
similarity index 97%
rename from content/usage/concepts/pipeline/_index.md
rename to content/concepts/pipeline/_index.md
index 08b8bd567..75eb98884 100644
--- a/content/usage/concepts/pipeline/_index.md
+++ b/content/concepts/pipeline/_index.md
@@ -2,7 +2,7 @@
 title: "Pipeline"
 linkTitle: "Pipeline"
 description: >
-  This section contains information on the Vela pipeline components.
+  This section contains information on the pipeline components.
 ---
 
 The `pipeline` component is a list of repeatable, execution instructions for Vela.
diff --git a/content/usage/concepts/pipeline/metadata.md b/content/concepts/pipeline/metadata.md
similarity index 100%
rename from content/usage/concepts/pipeline/metadata.md
rename to content/concepts/pipeline/metadata.md
diff --git a/content/usage/concepts/pipeline/secrets/_index.md b/content/concepts/pipeline/secrets/_index.md
similarity index 100%
rename from content/usage/concepts/pipeline/secrets/_index.md
rename to content/concepts/pipeline/secrets/_index.md
diff --git a/content/usage/concepts/pipeline/secrets/engine.md b/content/concepts/pipeline/secrets/engine.md
similarity index 100%
rename from content/usage/concepts/pipeline/secrets/engine.md
rename to content/concepts/pipeline/secrets/engine.md
diff --git a/content/usage/concepts/pipeline/secrets/key.md b/content/concepts/pipeline/secrets/key.md
similarity index 100%
rename from content/usage/concepts/pipeline/secrets/key.md
rename to content/concepts/pipeline/secrets/key.md
diff --git a/content/usage/concepts/pipeline/secrets/type.md b/content/concepts/pipeline/secrets/type.md
similarity index 100%
rename from content/usage/concepts/pipeline/secrets/type.md
rename to content/concepts/pipeline/secrets/type.md
diff --git a/content/usage/concepts/pipeline/services/_index.md b/content/concepts/pipeline/services/_index.md
similarity index 100%
rename from content/usage/concepts/pipeline/services/_index.md
rename to content/concepts/pipeline/services/_index.md
diff --git a/content/usage/concepts/pipeline/services/entrypoint.md b/content/concepts/pipeline/services/entrypoint.md
similarity index 100%
rename from content/usage/concepts/pipeline/services/entrypoint.md
rename to content/concepts/pipeline/services/entrypoint.md
diff --git a/content/usage/concepts/pipeline/services/environment.md b/content/concepts/pipeline/services/environment.md
similarity index 100%
rename from content/usage/concepts/pipeline/services/environment.md
rename to content/concepts/pipeline/services/environment.md
diff --git a/content/usage/concepts/pipeline/services/image.md b/content/concepts/pipeline/services/image.md
similarity index 100%
rename from content/usage/concepts/pipeline/services/image.md
rename to content/concepts/pipeline/services/image.md
diff --git a/content/usage/concepts/pipeline/services/ports.md b/content/concepts/pipeline/services/ports.md
similarity index 100%
rename from content/usage/concepts/pipeline/services/ports.md
rename to content/concepts/pipeline/services/ports.md
diff --git a/content/usage/concepts/pipeline/services/pull.md b/content/concepts/pipeline/services/pull.md
similarity index 100%
rename from content/usage/concepts/pipeline/services/pull.md
rename to content/concepts/pipeline/services/pull.md
diff --git a/content/usage/concepts/pipeline/stages/_index.md b/content/concepts/pipeline/stages/_index.md
similarity index 100%
rename from content/usage/concepts/pipeline/stages/_index.md
rename to content/concepts/pipeline/stages/_index.md
diff --git a/content/usage/concepts/pipeline/stages/needs.md b/content/concepts/pipeline/stages/needs.md
similarity index 100%
rename from content/usage/concepts/pipeline/stages/needs.md
rename to content/concepts/pipeline/stages/needs.md
diff --git a/content/usage/concepts/pipeline/stages/steps.md b/content/concepts/pipeline/stages/steps.md
similarity index 100%
rename from content/usage/concepts/pipeline/stages/steps.md
rename to content/concepts/pipeline/stages/steps.md
diff --git a/content/usage/concepts/pipeline/steps/_index.md b/content/concepts/pipeline/steps/_index.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/_index.md
rename to content/concepts/pipeline/steps/_index.md
diff --git a/content/usage/concepts/pipeline/steps/commands.md b/content/concepts/pipeline/steps/commands.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/commands.md
rename to content/concepts/pipeline/steps/commands.md
diff --git a/content/usage/concepts/pipeline/steps/detach.md b/content/concepts/pipeline/steps/detach.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/detach.md
rename to content/concepts/pipeline/steps/detach.md
diff --git a/content/usage/concepts/pipeline/steps/entrypoint.md b/content/concepts/pipeline/steps/entrypoint.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/entrypoint.md
rename to content/concepts/pipeline/steps/entrypoint.md
diff --git a/content/usage/concepts/pipeline/steps/environment.md b/content/concepts/pipeline/steps/environment.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/environment.md
rename to content/concepts/pipeline/steps/environment.md
diff --git a/content/usage/concepts/pipeline/steps/image.md b/content/concepts/pipeline/steps/image.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/image.md
rename to content/concepts/pipeline/steps/image.md
diff --git a/content/usage/concepts/pipeline/steps/parameters.md b/content/concepts/pipeline/steps/parameters.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/parameters.md
rename to content/concepts/pipeline/steps/parameters.md
diff --git a/content/usage/concepts/pipeline/steps/privileged.md b/content/concepts/pipeline/steps/privileged.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/privileged.md
rename to content/concepts/pipeline/steps/privileged.md
diff --git a/content/usage/concepts/pipeline/steps/pull.md b/content/concepts/pipeline/steps/pull.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/pull.md
rename to content/concepts/pipeline/steps/pull.md
diff --git a/content/usage/concepts/pipeline/steps/ruleset.md b/content/concepts/pipeline/steps/ruleset.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/ruleset.md
rename to content/concepts/pipeline/steps/ruleset.md
diff --git a/content/usage/concepts/pipeline/steps/secrets.md b/content/concepts/pipeline/steps/secrets.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/secrets.md
rename to content/concepts/pipeline/steps/secrets.md
diff --git a/content/usage/concepts/pipeline/steps/template.md b/content/concepts/pipeline/steps/template.md
similarity index 100%
rename from content/usage/concepts/pipeline/steps/template.md
rename to content/concepts/pipeline/steps/template.md
diff --git a/content/usage/concepts/pipeline/templates/_index.md b/content/concepts/pipeline/templates/_index.md
similarity index 100%
rename from content/usage/concepts/pipeline/templates/_index.md
rename to content/concepts/pipeline/templates/_index.md
diff --git a/content/usage/concepts/pipeline/templates/source.md b/content/concepts/pipeline/templates/source.md
similarity index 100%
rename from content/usage/concepts/pipeline/templates/source.md
rename to content/concepts/pipeline/templates/source.md
diff --git a/content/usage/concepts/pipeline/templates/type.md b/content/concepts/pipeline/templates/type.md
similarity index 100%
rename from content/usage/concepts/pipeline/templates/type.md
rename to content/concepts/pipeline/templates/type.md
diff --git a/content/usage/concepts/pipeline/version.md b/content/concepts/pipeline/version.md
similarity index 100%
rename from content/usage/concepts/pipeline/version.md
rename to content/concepts/pipeline/version.md
diff --git a/content/usage/concepts/plugin.md b/content/concepts/plugin.md
similarity index 52%
rename from content/usage/concepts/plugin.md
rename to content/concepts/plugin.md
index 93928f575..03e7778ab 100644
--- a/content/usage/concepts/plugin.md
+++ b/content/concepts/plugin.md
@@ -2,7 +2,7 @@
 title: "Plugin"
 linkTitle: "Plugin"
 description: >
-  This section contains information on the Vela plugin component.
+  This section contains information on the plugin component.
 ---
 
 COMING SOON!
diff --git a/content/usage/concepts/system/_index.md b/content/concepts/system/_index.md
similarity index 69%
rename from content/usage/concepts/system/_index.md
rename to content/concepts/system/_index.md
index bf94b1138..08d344675 100644
--- a/content/usage/concepts/system/_index.md
+++ b/content/concepts/system/_index.md
@@ -2,7 +2,7 @@
 title: "System"
 linkTitle: "System"
 description: >
-  This section contains information on the Vela system components.
+  This section contains information on the system components.
 ---
 
 The `system` components are a list of components that Vela uses for operating the system.
diff --git a/content/usage/concepts/system/build.md b/content/concepts/system/build.md
similarity index 100%
rename from content/usage/concepts/system/build.md
rename to content/concepts/system/build.md
diff --git a/content/usage/concepts/system/hook.md b/content/concepts/system/hook.md
similarity index 100%
rename from content/usage/concepts/system/hook.md
rename to content/concepts/system/hook.md
diff --git a/content/usage/concepts/system/repo.md b/content/concepts/system/repo.md
similarity index 100%
rename from content/usage/concepts/system/repo.md
rename to content/concepts/system/repo.md
diff --git a/content/usage/concepts/system/secret.md b/content/concepts/system/secret.md
similarity index 100%
rename from content/usage/concepts/system/secret.md
rename to content/concepts/system/secret.md
diff --git a/content/usage/concepts/system/service.md b/content/concepts/system/service.md
similarity index 100%
rename from content/usage/concepts/system/service.md
rename to content/concepts/system/service.md
diff --git a/content/usage/concepts/system/step.md b/content/concepts/system/step.md
similarity index 100%
rename from content/usage/concepts/system/step.md
rename to content/concepts/system/step.md
diff --git a/content/usage/concepts/system/user.md b/content/concepts/system/user.md
similarity index 100%
rename from content/usage/concepts/system/user.md
rename to content/concepts/system/user.md
diff --git a/content/usage/concepts/template.md b/content/concepts/template.md
similarity index 53%
rename from content/usage/concepts/template.md
rename to content/concepts/template.md
index 8bbfc11c6..62f4fa78f 100644
--- a/content/usage/concepts/template.md
+++ b/content/concepts/template.md
@@ -2,7 +2,7 @@
 title: "Template"
 linkTitle: "Template"
 description: >
-  This section contains information on the Vela template component.
+  This section contains information on the template component.
 ---
 
 COMING SOON!
diff --git a/content/install/_index.md b/content/install/_index.md
index a850f461f..a9ed56396 100644
--- a/content/install/_index.md
+++ b/content/install/_index.md
@@ -6,5 +6,5 @@ description: >
   Here you can find information describing how to run a Vela instance
 menu:
   main:
-    weight: 5
+    weight: 105
 ---
diff --git a/content/plugins/_index.md b/content/plugins/_index.md
index a153b1e9c..5a7d40975 100755
--- a/content/plugins/_index.md
+++ b/content/plugins/_index.md
@@ -6,5 +6,5 @@ description: >
   This section contains information on how to use Vela plugins.
 menu:
   main:
-    weight: 205
+    weight: 305
 ---
diff --git a/content/sdk/_index.md b/content/sdk/_index.md
index 0d5933900..8201f7c0d 100644
--- a/content/sdk/_index.md
+++ b/content/sdk/_index.md
@@ -6,5 +6,5 @@ description: >
   This section contains information on how to use the Vela SDKs.
 menu:
   main:
-    weight: 605
+    weight: 705
 ---
diff --git a/content/templates/_index.md b/content/templates/_index.md
index ea058d72a..31fdd0175 100644
--- a/content/templates/_index.md
+++ b/content/templates/_index.md
@@ -6,7 +6,7 @@ description: >
   This section contains information on how to use Vela templates.
 menu:
   main:
-    weight: 305
+    weight: 405
 ---
 
 COMING SOON!
diff --git a/content/usage/_index.md b/content/usage/_index.md
index e9396473f..a0dd28a00 100755
--- a/content/usage/_index.md
+++ b/content/usage/_index.md
@@ -6,5 +6,5 @@ description: >
   This section contains information on how to use Vela.
 menu:
   main:
-    weight: 105
+    weight: 205
 ---
diff --git a/content/usage/concepts/_index.md b/content/usage/concepts/_index.md
deleted file mode 100644
index 65752ad45..000000000
--- a/content/usage/concepts/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "Concepts"
-linkTitle: "Concepts"
-description: >
-  This section contains information on the core components for Vela.
----
diff --git a/layouts/concepts/baseof.html b/layouts/concepts/baseof.html
new file mode 100644
index 000000000..108ea7a41
--- /dev/null
+++ b/layouts/concepts/baseof.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html lang="{{ .Site.Language.Lang }}" class="no-js">
+  <head>
+    {{ partial "head.html" . }}
+    <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
+  </head>
+  <body class="td-{{ .Kind }}">
+    <header>
+      {{ partial "navbar.html" . }}
+    </header>
+    <div class="container-fluid td-outer">
+      <div class="td-main">
+        <div class="row flex-xl-nowrap">
+          <div class="col-12 col-md-3 col-xl-2 td-sidebar d-print-none">
+            {{ partial "sidebar.html" . }}
+          </div>
+          <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
+            {{ partial "toc.html" . }}
+          </div>
+          <main class="col-12 col-md-9 col-xl-8 pl-md-5" role="main">
+            {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
+            {{ block "main" . }}{{ end }}
+          </main>
+        </div>
+      </div>
+      {{ partial "footer.html" . }}
+    </div>
+    {{ partial "scripts.html" . }}
+  </body>
+</html>
\ No newline at end of file
diff --git a/layouts/concepts/list.html b/layouts/concepts/list.html
new file mode 100644
index 000000000..712247801
--- /dev/null
+++ b/layouts/concepts/list.html
@@ -0,0 +1,17 @@
+{{ define "main" }}
+<div class="td-content">
+	<h1>{{ .Title }}</h1>
+	{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
+	{{ .Content }}
+        {{ partial "section-index.html" . }}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
+		{{ partial "feedback.html" .Site.Params.ui.feedback }}
+		<br />
+	{{ end }}
+	{{ if (.Site.DisqusShortname) }}
+		<br />
+		{{ partial "disqus-comment.html" . }}
+	{{ end }}
+	<div class="text-muted mt-5 pt-3 border-top">{{ partial "page-meta-lastmod.html" . }}</div>
+</div>
+{{ end }}
diff --git a/layouts/concepts/single.html b/layouts/concepts/single.html
new file mode 100644
index 000000000..00cb3ab91
--- /dev/null
+++ b/layouts/concepts/single.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+{{ .Render "content" }}
+{{ end }}
\ No newline at end of file