diff --git a/content/en/includes/plugins/pac/config-github-common.md b/content/en/includes/plugins/pac/config-github-common.md
index 9277e0354a..a7cd8e2c57 100644
--- a/content/en/includes/plugins/pac/config-github-common.md
+++ b/content/en/includes/plugins/pac/config-github-common.md
@@ -23,7 +23,7 @@ You can configure webhooks on multiple GitHub organizations or repositories to s
 
 When you make a GitHub pull request (PR) and there is a change in a `dinghyfile`, Pipelines-as-Code automatically performs a validation for that `dinghyfile`. It also updates the GitHub status accordingly. If the validation fails, you see an unsuccessful `dinghy` check.
 
-{{< figure src="/images/dinghy/pr_validation/pr_validation.png" alt="PR that fails validation." >}}
+{{< figure src="/media/plugins/pac/pr_validation.png" alt="PR that fails validation." >}}
 
 Make PR validations mandatory to ensure users only merge working `dinghyfiles`.
 
@@ -37,4 +37,4 @@ Perform the following steps to configure mandatory PR validation:
 
 The following screenshot shows what your GitHub settings should resemble:
 
-{{< figure src="/images/dinghy/pr_validation/branch_mandatory.png" alt="Configured dinghy PR validation." >}}
+{{< figure src="/media/plugins/pac/branch_mandatory.png" alt="Configured dinghy PR validation." >}}
diff --git a/static/images/dinghy/pr_validation/branch_mandatory.png b/content/en/media/plugins/pac/branch_mandatory.png
similarity index 100%
rename from static/images/dinghy/pr_validation/branch_mandatory.png
rename to content/en/media/plugins/pac/branch_mandatory.png
diff --git a/static/images/dinghy/pr_validation/pr_validation.png b/content/en/media/plugins/pac/pr_validation.png
similarity index 100%
rename from static/images/dinghy/pr_validation/pr_validation.png
rename to content/en/media/plugins/pac/pr_validation.png
diff --git a/static/images/plugins/pac/dinghy-github-notifications.jpg b/content/en/plugins/pipelines-as-code/install/configure/dinghy-github-notifications.jpg
similarity index 100%
rename from static/images/plugins/pac/dinghy-github-notifications.jpg
rename to content/en/plugins/pipelines-as-code/install/configure/dinghy-github-notifications.jpg
diff --git a/content/en/plugins/pipelines-as-code/install/configure/dinghy-slack-notifications.png b/content/en/plugins/pipelines-as-code/install/configure/dinghy-slack-notifications.png
new file mode 100644
index 0000000000..ce7f341a71
Binary files /dev/null and b/content/en/plugins/pipelines-as-code/install/configure/dinghy-slack-notifications.png differ
diff --git a/content/en/plugins/pipelines-as-code/install/configure.md b/content/en/plugins/pipelines-as-code/install/configure/index.md
similarity index 99%
rename from content/en/plugins/pipelines-as-code/install/configure.md
rename to content/en/plugins/pipelines-as-code/install/configure/index.md
index 8cbadf30a0..533ebe59b1 100644
--- a/content/en/plugins/pipelines-as-code/install/configure.md
+++ b/content/en/plugins/pipelines-as-code/install/configure/index.md
@@ -364,7 +364,7 @@ spec:
 {{% /tab %}}
 {{< /tabpane >}}
 
-{{< figure src="/images/dinghy-slack-notifications.png" >}}
+{{< figure src="dinghy-slack-notifications.png" >}}
 
 ### GitHub notifications
 
@@ -401,7 +401,7 @@ spec:
 {{% /tab %}}
 {{< /tabpane >}}
 
-{{< figure src="/images/plugins/pac/dinghy-github-notifications.jpg" >}}
+{{< figure src="dinghy-github-notifications.jpg" >}}
 
 ## Permissions check for a commit
 
diff --git a/content/en/plugins/pipelines-as-code/use/dinghy-template-repo.png b/content/en/plugins/pipelines-as-code/use/dinghy-template-repo.png
new file mode 100644
index 0000000000..b45f199ea1
Binary files /dev/null and b/content/en/plugins/pipelines-as-code/use/dinghy-template-repo.png differ
diff --git a/content/en/plugins/pipelines-as-code/use/dinghyfile.png b/content/en/plugins/pipelines-as-code/use/dinghyfile.png
new file mode 100644
index 0000000000..1d3b9d5e30
Binary files /dev/null and b/content/en/plugins/pipelines-as-code/use/dinghyfile.png differ
diff --git a/content/en/plugins/pipelines-as-code/use.md b/content/en/plugins/pipelines-as-code/use/index.md
similarity index 99%
rename from content/en/plugins/pipelines-as-code/use.md
rename to content/en/plugins/pipelines-as-code/use/index.md
index 4777dff36a..2b6c925ac1 100644
--- a/content/en/plugins/pipelines-as-code/use.md
+++ b/content/en/plugins/pipelines-as-code/use/index.md
@@ -224,7 +224,7 @@ Note that only the `application` and `pipelines` keys are required; everything e
 
 - **Modules**: These are templates that define a Stage/Task in the pipeline. They are kept in a single GitHub repo that is configurable when the dinghy service starts. eg:
 
-{{< figure src="/images/dinghy-template-repo.png" >}}
+{{< figure src="dinghy-template-repo.png" >}}
 
  They are JSON files with replacable values in them. e.g., a module that defines a wait stage in a pipeline might look like:
 
@@ -240,7 +240,7 @@ Note that only the `application` and `pipelines` keys are required; everything e
 
 - **Pipeline definitions**: These define a pipeline for an application in a file called `dinghyfile`. The `dinghyfile` usually resides at the root level of the application repo. eg:
 
-{{< figure src="/images/dinghyfile.png" >}}
+{{< figure src="dinghyfile.png" >}}
 
 You can compose stage/task templates to make a full definition. e.g., a Pipeline definition that has a single wait stage might look like:
 
@@ -341,7 +341,7 @@ Optionally, you can include a default parameter: `{{ var "waitName" ?: "defaultV
 
 Let us create a more realistic pipeline using templates. One that would look like this:
 
-{{< figure src="/images/Screen-Shot-2018-03-12-at-11.18.38-AM.png" >}}
+{{< figure src="pipeline.png" >}}
 
 You would use the following JSON to create such. Note that any of the stages could have come from an imported module, but we show the full JSON here for readability:
 
@@ -472,9 +472,9 @@ This module inherits two stages and overrides variables within them. The `wait.s
 }
 ```
 
-Note how the `requisiteStageRefIds` is overwritten while calling the module so that the deploy stage _depends on_ the wait stage. This pipeline would look like this in the spinnaker UI:
+Note how the `requisiteStageRefIds` is overwritten while calling the module so that the deploy stage _depends on_ the wait stage. This pipeline would look like this in the Spinnaker UI:
 
-{{< figure src="/images/Screen_Shot_2018-03-26_at_5_06_25_PM.png" >}}
+{{< figure src="multi-inheritance.png" >}}
 
 ## Local module functionality
 
diff --git a/static/images/Screen_Shot_2018-03-26_at_5_06_25_PM.png b/content/en/plugins/pipelines-as-code/use/multi-inheritance.png
similarity index 100%
rename from static/images/Screen_Shot_2018-03-26_at_5_06_25_PM.png
rename to content/en/plugins/pipelines-as-code/use/multi-inheritance.png
diff --git a/static/images/Screen-Shot-2018-03-12-at-11.18.38-AM.png b/content/en/plugins/pipelines-as-code/use/pipeline.png
similarity index 100%
rename from static/images/Screen-Shot-2018-03-12-at-11.18.38-AM.png
rename to content/en/plugins/pipelines-as-code/use/pipeline.png
diff --git a/content/en/plugins/scale-agent/concepts/communication.md b/content/en/plugins/scale-agent/concepts/communication/index.md
similarity index 96%
rename from content/en/plugins/scale-agent/concepts/communication.md
rename to content/en/plugins/scale-agent/concepts/communication/index.md
index bb64c54e12..ed66a75719 100644
--- a/content/en/plugins/scale-agent/concepts/communication.md
+++ b/content/en/plugins/scale-agent/concepts/communication/index.md
@@ -9,7 +9,7 @@ aliases:
 
 ## How the Armory Scale Agent plugin communicates with Clouddriver instances
 
-{{< figure src="/images/scale-agent/k8s-clustering.png"  alt="Kubernetes clustering"  height="75%" width="75%" >}}
+{{< figure src="k8s-clustering.png"  alt="Kubernetes clustering"  height="75%" width="75%" >}}
 
 At startup, Clouddriver registers a watch for the kind `Endpoints` in the Kubernetes cluster where it is running for the namespace where Clouddriver is running. Objects of kind `Endpoints` are automatically generated based on a Kubernetes Service. The plugin knows that there's a Clouddriver Service for routing HTTP traffic to Clouddriver pods (usually named `spin-clouddriver`). This means that the Clouddriver pod needs to mount a Kubernetes Service Account that has permissions to list and watch the kind `Endpoints` in the current namespace. The Agent plugin does the equivalent of these calls at startup:
 
diff --git a/static/images/scale-agent/k8s-clustering.png b/content/en/plugins/scale-agent/concepts/communication/k8s-clustering.png
similarity index 100%
rename from static/images/scale-agent/k8s-clustering.png
rename to content/en/plugins/scale-agent/concepts/communication/k8s-clustering.png
diff --git a/static/images/scale-agent/agent-infra-mode.png b/content/en/plugins/scale-agent/install/advanced/modes/agent-infra-mode.png
similarity index 100%
rename from static/images/scale-agent/agent-infra-mode.png
rename to content/en/plugins/scale-agent/install/advanced/modes/agent-infra-mode.png
diff --git a/static/images/scale-agent/agent-mode.png b/content/en/plugins/scale-agent/install/advanced/modes/agent-mode.png
similarity index 100%
rename from static/images/scale-agent/agent-mode.png
rename to content/en/plugins/scale-agent/install/advanced/modes/agent-mode.png
diff --git a/static/images/scale-agent/in-cluster-mode.png b/content/en/plugins/scale-agent/install/advanced/modes/in-cluster-mode.png
similarity index 100%
rename from static/images/scale-agent/in-cluster-mode.png
rename to content/en/plugins/scale-agent/install/advanced/modes/in-cluster-mode.png
diff --git a/content/en/plugins/scale-agent/install/advanced/modes.md b/content/en/plugins/scale-agent/install/advanced/modes/index.md
similarity index 96%
rename from content/en/plugins/scale-agent/install/advanced/modes.md
rename to content/en/plugins/scale-agent/install/advanced/modes/index.md
index b7c9425e4f..d4f4c1fa3c 100644
--- a/content/en/plugins/scale-agent/install/advanced/modes.md
+++ b/content/en/plugins/scale-agent/install/advanced/modes/index.md
@@ -12,7 +12,7 @@ description: >
 
 In this mode, you install the Armory Scale Agent service as a new Spinnaker service (`spin-armory-agent`), so you can configure it like other services.
 
-{{< figure src="/images/scale-agent/in-cluster-mode.png" >}}
+{{< figure src="in-cluster-mode.png" height="80%" width="80%" >}}
 
 If you provision clusters automatically, the Armory Scale Agent service can dynamically reload accounts when `armory-agent.yaml` changes. You could, for example, configure accounts in a `ConfigMap` mounting to `/opt/armory/config/armory-agent-local.yaml`.  The Agent service reflects `ConfigMap` changes within seconds after [etcd](https://etcd.io/) sync.
 
@@ -42,7 +42,7 @@ Keep the following pros and cons in mind when deciding if Infrastructure mode fi
 - The API servers of the target clusters need to be accessible from the Armory Scale Agent cluster.
 - You need to expose gRPC port for Clouddriver through an external load balancer capable of handling HTTP/2 for gRPC communication.
 
-{{< figure src="/images/scale-agent/agent-infra-mode.png" >}}
+{{< figure src="agent-infra-mode.png" height="80%" width="80%" >}}
 
 > Kubernetes account names must be unique across all your infrastructure. Clouddriver rejects new accounts with a name that matches a different cluster.
 
@@ -69,7 +69,7 @@ Keep the following pros and cons in mind when deciding if Agent mode fits your u
 - There is no authentication/authorization, so any team can start an Agent and register itself with Armory CD (Spinnaker). mTLS encryption can be used so that only agents with the right certificate can register. For information about how to configure mTLS, see {{< linkWithTitle "plugins/scale-agent/tasks/configure-mtls.md" >}}.
 - You need to expose gRPC port for Clouddriver through an external load balancer capable of handling HTTP/2 for gRPC communication.
 
-{{< figure src="/images/scale-agent/agent-mode.png" >}}
+{{< figure src="agent-mode.png" height="80%" width="80%" >}}
 
 
 
diff --git a/content/en/plugins/terraform/use.md b/content/en/plugins/terraform/use/index.md
similarity index 98%
rename from content/en/plugins/terraform/use.md
rename to content/en/plugins/terraform/use/index.md
index 77b8f0c0fe..42559764e8 100644
--- a/content/en/plugins/terraform/use.md
+++ b/content/en/plugins/terraform/use/index.md
@@ -98,7 +98,7 @@ Run the pipeline.
 
 ## Create a Terraform Integration stage
 
-{{< figure src="/images/plugins/terraform/terraform_stage_ui.png" >}}
+{{< figure src="terraform_stage_ui.png" >}}
 
 {{< include "rdbms-utf8-required.md" >}}
 
@@ -126,7 +126,7 @@ To create a new Terraform stage, perform the following steps:
       * **Workspace**: [Terraform workspace](https://www.terraform.io/docs/state/workspaces.html) to use. The workspace gets created if it does not already exist. For remote backends, the workspace must be explicit or prefixed. For more information about what that means, see the Terraform documentation about [remote backends](https://www.terraform.io/docs/backends/types/remote.html)
     * **Main Terraform Artifact**
       * **Expected Artifact**: Required. Select or define only one `git/repo` type artifact.
-        {{< figure src="/images/plugins/terraform/terraform-git-repo.png" >}}
+        {{< figure src="terraform-git-repo.png" >}}
         * **Account**: The account to use for your artifact.
         * **URL**: If you use a GitHub artifact, make sure you supply the _API_ URL of the file, not the URL from the `Raw` GitHub page. Use the following examples as a reference for the API URL:
 
@@ -205,7 +205,7 @@ Terraform Integration caches all the defined plugins by default and does not red
 
 ## View Terraform log output
 
-{{< figure src="/images/plugins/terraform/terraformer-ui-logs.png" >}}
+{{< figure src="terraformer-ui-logs.png" >}}
 
 Terraform provides logs that describe the status of your Terraform action. When you run Terraform actions on your workstation, the log output is streamed to `stdout`. For Armory's Terraform Integration, Spinnaker captures the log output and makes it available on the **Pipelines** page of Deck as part of the **Execution Details**. Exit codes in the log represent the following states:
 
diff --git a/static/images/plugins/terraform/terraform-git-repo.png b/content/en/plugins/terraform/use/terraform-git-repo.png
similarity index 100%
rename from static/images/plugins/terraform/terraform-git-repo.png
rename to content/en/plugins/terraform/use/terraform-git-repo.png
diff --git a/static/images/plugins/terraform/terraform_stage_ui.png b/content/en/plugins/terraform/use/terraform_stage_ui.png
similarity index 100%
rename from static/images/plugins/terraform/terraform_stage_ui.png
rename to content/en/plugins/terraform/use/terraform_stage_ui.png
diff --git a/static/images/plugins/terraform/terraformer-ui-logs.png b/content/en/plugins/terraform/use/terraformer-ui-logs.png
similarity index 100%
rename from static/images/plugins/terraform/terraformer-ui-logs.png
rename to content/en/plugins/terraform/use/terraformer-ui-logs.png
diff --git a/static/images/dinghy/dinghy-events-mvp-default-view.png b/static/images/dinghy/dinghy-events-mvp-default-view.png
deleted file mode 100644
index 9db95a4aa6..0000000000
Binary files a/static/images/dinghy/dinghy-events-mvp-default-view.png and /dev/null differ
diff --git a/static/images/dinghy/dinghy-events-mvp-log-view.png b/static/images/dinghy/dinghy-events-mvp-log-view.png
deleted file mode 100644
index b64042f7f1..0000000000
Binary files a/static/images/dinghy/dinghy-events-mvp-log-view.png and /dev/null differ
diff --git a/static/images/dinghy/dinghy-events-user-flow.png b/static/images/dinghy/dinghy-events-user-flow.png
deleted file mode 100644
index 3348092f43..0000000000
Binary files a/static/images/dinghy/dinghy-events-user-flow.png and /dev/null differ
diff --git a/static/images/pacrd/new_relic.png b/static/images/pacrd/new_relic.png
deleted file mode 100644
index 8b9c630d6f..0000000000
Binary files a/static/images/pacrd/new_relic.png and /dev/null differ
diff --git a/static/images/plugins/terraform/terraform_version.png b/static/images/plugins/terraform/terraform_version.png
deleted file mode 100644
index c58259e2c2..0000000000
Binary files a/static/images/plugins/terraform/terraform_version.png and /dev/null differ
diff --git a/static/images/plugins/terraform/terraformer-artifact-git-repo.png b/static/images/plugins/terraform/terraformer-artifact-git-repo.png
deleted file mode 100644
index 3cd6392c95..0000000000
Binary files a/static/images/plugins/terraform/terraformer-artifact-git-repo.png and /dev/null differ
diff --git a/static/images/plugins/terraform/terraformer-ui-stage.png b/static/images/plugins/terraform/terraformer-ui-stage.png
deleted file mode 100644
index a96b721754..0000000000
Binary files a/static/images/plugins/terraform/terraformer-ui-stage.png and /dev/null differ
diff --git a/static/images/scale-agent/agent-monitoring.png b/static/images/scale-agent/agent-monitoring.png
deleted file mode 100644
index c94e5a582a..0000000000
Binary files a/static/images/scale-agent/agent-monitoring.png and /dev/null differ
diff --git a/static/images/scale-agent/agent-networking.png b/static/images/scale-agent/agent-networking.png
deleted file mode 100644
index c86e596728..0000000000
Binary files a/static/images/scale-agent/agent-networking.png and /dev/null differ
diff --git a/static/images/scale-agent/agent-overview.png b/static/images/scale-agent/agent-overview.png
deleted file mode 100644
index fde36747f1..0000000000
Binary files a/static/images/scale-agent/agent-overview.png and /dev/null differ
diff --git a/static/images/scale-agent/install-mode-agent.png b/static/images/scale-agent/install-mode-agent.png
deleted file mode 100644
index d711ba8583..0000000000
Binary files a/static/images/scale-agent/install-mode-agent.png and /dev/null differ
diff --git a/static/images/scale-agent/install-mode-cluster.png b/static/images/scale-agent/install-mode-cluster.png
deleted file mode 100644
index b785b63eb6..0000000000
Binary files a/static/images/scale-agent/install-mode-cluster.png and /dev/null differ
diff --git a/static/images/scale-agent/install-mode-infra.png b/static/images/scale-agent/install-mode-infra.png
deleted file mode 100644
index 8956689d1c..0000000000
Binary files a/static/images/scale-agent/install-mode-infra.png and /dev/null differ