diff --git a/admin/access-control/password-reset.md b/admin/access-control/password-reset.md
index c961c2866..d26d5b348 100644
--- a/admin/access-control/password-reset.md
+++ b/admin/access-control/password-reset.md
@@ -11,7 +11,7 @@ To reset a user's password:
 1. Click **Reset password**. Coder will display a temporary password that you
    can provide to the user. Click **Reset Password** to proceed with the reset.
 
-![Confirm password reset](../../assets/reset-password.png)
+![Confirm password reset](../../assets/admin/reset-password.png)
 
 When the user logs in using the temporary password, Coder will prompt them to
 change it.
diff --git a/admin/account-dormancy.md b/admin/account-dormancy.md
index 3094ff622..3aeaf846a 100644
--- a/admin/account-dormancy.md
+++ b/admin/account-dormancy.md
@@ -11,4 +11,4 @@ For example, you can set Coder to delete accounts 30 days after they go dormant
 (this means that the user has been inactive for 120 days: 90 days to become
 dormant, plus an additional 30 days).
 
-![Account dormancy](../assets/account-dormancy.png)
+![Account dormancy](../assets/admin/account-dormancy.png)
diff --git a/admin/appearance.md b/admin/appearance.md
index ba3c067c3..9014e52ad 100644
--- a/admin/appearance.md
+++ b/admin/appearance.md
@@ -18,7 +18,7 @@ To customize your system banner messages:
    in your **Header** and **Footer**.
 1. Click **Save Preferences** to save your changes.
 
-![System appearance](../assets/system-banners.png)
+![System appearance](../assets/admin/system-banners.png)
 
 ## Terms of service
 
@@ -30,7 +30,7 @@ To enable the display of terms of service and to edit the text displayed:
    Markdown formatting.
 1. Click **Save Preferences** to save your changes.
 
-![Terms of service](../assets/terms-of-service.png)
+![Terms of service](../assets/admin/terms-of-service.png)
 
 **Note**: If you enable the use of terms of service, users will not be able to
 log in to Coder without first accepting the terms of service.
diff --git a/admin/audit.md b/admin/audit.md
index 8a9d8ef69..3486f85b1 100644
--- a/admin/audit.md
+++ b/admin/audit.md
@@ -13,7 +13,7 @@ Any user who is a **Site Manager** or an **Auditor** can log into Coder, go to
 By default, this page displays a chronological list of all actions taken on the
 system.
 
-![Audit logs](../assets/audit-log.png)
+![Audit logs](../assets/admin/audit-log.png)
 
 You can filter the logs displayed using the search filters available at the top:
 
diff --git a/admin/devurls.md b/admin/devurls.md
index 4c6c24c3b..73f8c602f 100644
--- a/admin/devurls.md
+++ b/admin/devurls.md
@@ -82,7 +82,7 @@ scroll down to **Dev URL Access Permissions**.
   </tr>
 </table>
 
-![Setting dev URL permissions](../assets/admin-devurl-permissions.png)
+![Setting dev URL permissions](../assets/admin/admin-devurl-permissions.png)
 
 You can set the maximum access level, but developers may choose to restrict
 access further.
diff --git a/admin/git.md b/admin/git.md
index e68021c43..e0053f531 100644
--- a/admin/git.md
+++ b/admin/git.md
@@ -26,7 +26,7 @@ However, Coder doesn't test these and cannot provide recommendations or support.
 **Note** The public key provided by Coder uses the ECDSA key algorithm. Ensure
 your git provider supports this.
 
-![Configure Git Integration](../assets/git-admin.png)
+![Configure Git Integration](../assets/admin/git-admin.png)
 
 ## Configuring OAuth
 
diff --git a/admin/metrics.md b/admin/metrics.md
index 3e4d3c24f..0e627fe97 100644
--- a/admin/metrics.md
+++ b/admin/metrics.md
@@ -6,4 +6,4 @@ description: Learn how to track usage of your Coder deployment.
 Metrics allow you to track the number of people using Coder on a day-to-day
 basis. Access the following view from **Manage > Metrics**.
 
-![Metrics UI](../assets/metrics.png)
+![Metrics UI](../assets/admin/metrics.png)
diff --git a/admin/organizations.md b/admin/organizations.md
index 28361be24..dcc0751ab 100644
--- a/admin/organizations.md
+++ b/admin/organizations.md
@@ -25,7 +25,7 @@ can also change which organizations are defaults at any time.
 [Site admins and site managers](access-control/user-roles.md) can create new
 organizations by going to **Manage** > **Organizations** > **New Organization**.
 
-![Create a new organization dialog](../assets/create-an-org.png)
+![Create a new organization dialog](../assets/admin/create-an-org.png)
 
 Provide a **name** and (optionally) a **description** for this organization. If
 you want this to become a **Default organization**, make sure to check the
@@ -52,7 +52,7 @@ When you've set your parameters, click **Create** to proceed.
 You can edit an organization at any time by going to **Manage** >
 **Organizations**.
 
-![Edit an organization dialog](../assets/edit-an-org.png)
+![Edit an organization dialog](../assets/admin/edit-an-org.png)
 
 Find the organization you want to edit, and click to open. In the top-right,
 click **Edit** to launch the **Edit Organizations** dialog.
diff --git a/admin/registries/default-registry.md b/admin/registries/default-registry.md
index 145eee769..dac757938 100644
--- a/admin/registries/default-registry.md
+++ b/admin/registries/default-registry.md
@@ -26,4 +26,4 @@ To do so:
    option.
 1. Click **Save Registry**.
 
-![Import default registry](../../assets/import-default-registry.png)
+![Import default registry](../../assets/admin/import-default-registry.png)
diff --git a/admin/telemetry.md b/admin/telemetry.md
index b5c0348a5..be1286187 100644
--- a/admin/telemetry.md
+++ b/admin/telemetry.md
@@ -13,7 +13,7 @@ Reports**, **Send Usage Telemetry**, or **Send Enhanced Usage Telemetry**.
 
 Be sure to click **Save Preferences** after you make your changes.
 
-![Telemetry](../assets/telemetry.png)
+![Telemetry](../assets/admin/telemetry.png)
 
 > You cannot modify the default telemetry settings during a
 > [free trial](https://coder.com/trial) of Coder or by those with evaluation
diff --git a/admin/templates.md b/admin/templates.md
index e655bd0b6..284d05362 100644
--- a/admin/templates.md
+++ b/admin/templates.md
@@ -17,7 +17,7 @@ To create your button:
 Once you've filled out the form, Coder generates a custom Markdown snippet,
 which you can then add to your repository's `README.md`.
 
-![Open In Coder Button](../assets/wac-badge.png)
+![Open In Coder Button](../assets/admin/wac-badge.png)
 
 ## Enabling workspaces as code
 
@@ -25,4 +25,4 @@ By default, workspaces as code is an opt-in feature. To enable workspaces as
 code, go to **Admin > Templates** and set **Enable using Workspace Templates**
 to **On**.
 
-![toggle workspaces as code](../assets/wac_toggle.png)
+![toggle workspaces as code](../assets/admin/wac_toggle.png)
diff --git a/admin/workspace-management/extensions.md b/admin/workspace-management/extensions.md
index d4c9b2147..b9afb5b3a 100644
--- a/admin/workspace-management/extensions.md
+++ b/admin/workspace-management/extensions.md
@@ -18,7 +18,7 @@ then scrolling down to **Extensions**:
 - **Custom**: your organization's custom VS Code extension marketplace API,
   accessed via the URL you provide
 
-![Configuring extensions marketplace](../../assets/configure-extensions.png)
+![Configuring extensions marketplace](../../assets/admin/configure-extensions.png)
 
 ## Air-gapped marketplaces
 
diff --git a/admin/workspace-management/gpu-acceleration.md b/admin/workspace-management/gpu-acceleration.md
index ef3682ca0..fd55cfe04 100644
--- a/admin/workspace-management/gpu-acceleration.md
+++ b/admin/workspace-management/gpu-acceleration.md
@@ -21,4 +21,4 @@ Go to **Manage** > **Admin**. On the **Infrastructure** tab, find the **GPU
 Vendor** setting, and change it to the GPU vendor of choice (either **AMD** or
 **Nvidia**). Click **Save Vendor**.
 
-![Enable GPU vendor](../../assets/gpu.png)
+![Enable GPU vendor](../../assets/admin/gpu.png)
diff --git a/admin/workspace-management/memory-overprovisioning.md b/admin/workspace-management/memory-overprovisioning.md
index 5dbaa3fde..c49d11e54 100644
--- a/admin/workspace-management/memory-overprovisioning.md
+++ b/admin/workspace-management/memory-overprovisioning.md
@@ -15,7 +15,7 @@ A site admin/manager must complete these steps:
 1. Under the **Infrastructure** tab, check the box next to **Enable Memory
    Overprovisioning**.
 
-![Enable memory overprovisioning](../../assets/enable-memory-overprovisioning.png)
+![Enable memory overprovisioning](../../assets/admin/enable-memory-overprovisioning.png)
 
 ## Step 2: Changing the memory provisioning rate
 
@@ -24,4 +24,4 @@ A site admin/manager must complete these steps:
    down to **Memory Provisioning Rate** and set the maximum ratio
 1. Click **Update**.
 
-![Set memory overprovisioning ratios](../../assets/set-memory-ratios.png)
+![Set memory overprovisioning ratios](../../assets/admin/set-memory-ratios.png)
diff --git a/admin/workspace-management/shutdown.md b/admin/workspace-management/shutdown.md
index 2648d74ed..d0b9b98c9 100644
--- a/admin/workspace-management/shutdown.md
+++ b/admin/workspace-management/shutdown.md
@@ -26,4 +26,4 @@ Click **Edit** in the top-right. In the dialog that opens, use the slider
 underneath **Workspace Shutdown Behavior** to select the maximum allowed
 duration.
 
-![Configure shutdown behavior](../../assets/workspace-shutdown.png)
+![Configure shutdown behavior](../../assets/admin/workspace-shutdown.png)
diff --git a/admin/workspace-providers/deployment.md b/admin/workspace-providers/deployment.md
index 2aced2523..9fc6bbd11 100644
--- a/admin/workspace-providers/deployment.md
+++ b/admin/workspace-providers/deployment.md
@@ -139,7 +139,7 @@ when communicating with the Coder deployment.
 1. Once the Helm chart has deployed successfully, you should see the workspace
    provider in a `ready` state on the **Workspace provider admin** page.
 
-   ![Workspace providers admin](../../assets/workspace-providers-admin.png)
+   ![Workspace providers admin](../../assets/admin/workspace-providers-admin.png)
 
 1. From the **Workspace provider admin** page, add the desired organizations to
    its allowlist.
diff --git a/admin/workspace-providers/index.md b/admin/workspace-providers/index.md
index 41bde1e8c..4e0f163ab 100644
--- a/admin/workspace-providers/index.md
+++ b/admin/workspace-providers/index.md
@@ -41,7 +41,7 @@ expand your Coder deployment to additional Kubernetes clusters.
 Site admins and site managers can view the workspace providers configuration
 page available via **Manage** > **Admin** > **Workspace Providers**.
 
-![Workspace providers admin](../../assets/workspace-providers-admin.png)
+![Workspace providers admin](../../assets/admin/workspace-providers-admin.png)
 
 The Admin panel shows an overview of all configured workspace providers and
 indicates their statuses and details. The **default** tag indicates the provider
@@ -51,7 +51,7 @@ that will be selected by default when a user creates a workspace using the
 You can expand individual listings to view in-depth information:
 
 ![Detailed workspace providers
-info](../../assets/workspace-providers-detail.png)
+info](../../assets/admin/workspace-providers-detail.png)
 
 ### Status
 
diff --git a/assets/account-dormancy.png b/assets/admin/account-dormancy.png
similarity index 100%
rename from assets/account-dormancy.png
rename to assets/admin/account-dormancy.png
diff --git a/assets/admin-devurl-permissions.png b/assets/admin/admin-devurl-permissions.png
similarity index 100%
rename from assets/admin-devurl-permissions.png
rename to assets/admin/admin-devurl-permissions.png
diff --git a/assets/audit-log.png b/assets/admin/audit-log.png
similarity index 100%
rename from assets/audit-log.png
rename to assets/admin/audit-log.png
diff --git a/assets/configure-extensions.png b/assets/admin/configure-extensions.png
similarity index 100%
rename from assets/configure-extensions.png
rename to assets/admin/configure-extensions.png
diff --git a/assets/create-an-org.png b/assets/admin/create-an-org.png
similarity index 100%
rename from assets/create-an-org.png
rename to assets/admin/create-an-org.png
diff --git a/assets/edit-an-org.png b/assets/admin/edit-an-org.png
similarity index 100%
rename from assets/edit-an-org.png
rename to assets/admin/edit-an-org.png
diff --git a/assets/enable-memory-overprovisioning.png b/assets/admin/enable-memory-overprovisioning.png
similarity index 100%
rename from assets/enable-memory-overprovisioning.png
rename to assets/admin/enable-memory-overprovisioning.png
diff --git a/assets/git-admin.png b/assets/admin/git-admin.png
similarity index 100%
rename from assets/git-admin.png
rename to assets/admin/git-admin.png
diff --git a/assets/gpu.png b/assets/admin/gpu.png
similarity index 100%
rename from assets/gpu.png
rename to assets/admin/gpu.png
diff --git a/assets/import-default-registry.png b/assets/admin/import-default-registry.png
similarity index 100%
rename from assets/import-default-registry.png
rename to assets/admin/import-default-registry.png
diff --git a/assets/metrics.png b/assets/admin/metrics.png
similarity index 100%
rename from assets/metrics.png
rename to assets/admin/metrics.png
diff --git a/assets/reset-password.png b/assets/admin/reset-password.png
similarity index 100%
rename from assets/reset-password.png
rename to assets/admin/reset-password.png
diff --git a/assets/set-memory-ratios.png b/assets/admin/set-memory-ratios.png
similarity index 100%
rename from assets/set-memory-ratios.png
rename to assets/admin/set-memory-ratios.png
diff --git a/assets/system-banners.png b/assets/admin/system-banners.png
similarity index 100%
rename from assets/system-banners.png
rename to assets/admin/system-banners.png
diff --git a/assets/telemetry.png b/assets/admin/telemetry.png
similarity index 100%
rename from assets/telemetry.png
rename to assets/admin/telemetry.png
diff --git a/assets/terms-of-service.png b/assets/admin/terms-of-service.png
similarity index 100%
rename from assets/terms-of-service.png
rename to assets/admin/terms-of-service.png
diff --git a/assets/wac-badge.png b/assets/admin/wac-badge.png
similarity index 100%
rename from assets/wac-badge.png
rename to assets/admin/wac-badge.png
diff --git a/assets/wac_toggle.png b/assets/admin/wac_toggle.png
similarity index 100%
rename from assets/wac_toggle.png
rename to assets/admin/wac_toggle.png
diff --git a/assets/workspace-providers-admin.png b/assets/admin/workspace-providers-admin.png
similarity index 100%
rename from assets/workspace-providers-admin.png
rename to assets/admin/workspace-providers-admin.png
diff --git a/assets/workspace-providers-detail.png b/assets/admin/workspace-providers-detail.png
similarity index 100%
rename from assets/workspace-providers-detail.png
rename to assets/admin/workspace-providers-detail.png
diff --git a/assets/workspace-shutdown.png b/assets/admin/workspace-shutdown.png
similarity index 100%
rename from assets/workspace-shutdown.png
rename to assets/admin/workspace-shutdown.png
diff --git a/assets/app-registration.png b/assets/guides/admin/app-registration.png
similarity index 100%
rename from assets/app-registration.png
rename to assets/guides/admin/app-registration.png
diff --git a/assets/client-id.png b/assets/guides/admin/client-id.png
similarity index 100%
rename from assets/client-id.png
rename to assets/guides/admin/client-id.png
diff --git a/assets/client-secret.png b/assets/guides/admin/client-secret.png
similarity index 100%
rename from assets/client-secret.png
rename to assets/guides/admin/client-secret.png
diff --git a/assets/compute-1.png b/assets/guides/admin/compute-1.png
similarity index 100%
rename from assets/compute-1.png
rename to assets/guides/admin/compute-1.png
diff --git a/assets/compute-2.png b/assets/guides/admin/compute-2.png
similarity index 100%
rename from assets/compute-2.png
rename to assets/guides/admin/compute-2.png
diff --git a/assets/compute-3.png b/assets/guides/admin/compute-3.png
similarity index 100%
rename from assets/compute-3.png
rename to assets/guides/admin/compute-3.png
diff --git a/assets/compute-4.png b/assets/guides/admin/compute-4.png
similarity index 100%
rename from assets/compute-4.png
rename to assets/guides/admin/compute-4.png
diff --git a/assets/compute-5.png b/assets/guides/admin/compute-5.png
similarity index 100%
rename from assets/compute-5.png
rename to assets/guides/admin/compute-5.png
diff --git a/assets/compute-6.png b/assets/guides/admin/compute-6.png
similarity index 100%
rename from assets/compute-6.png
rename to assets/guides/admin/compute-6.png
diff --git a/assets/compute-7.png b/assets/guides/admin/compute-7.png
similarity index 100%
rename from assets/compute-7.png
rename to assets/guides/admin/compute-7.png
diff --git a/assets/cpu_provision_ratio.png b/assets/guides/admin/cpu_provision_ratio.png
similarity index 100%
rename from assets/cpu_provision_ratio.png
rename to assets/guides/admin/cpu_provision_ratio.png
diff --git a/assets/issuer.png b/assets/guides/admin/issuer.png
similarity index 100%
rename from assets/issuer.png
rename to assets/guides/admin/issuer.png
diff --git a/assets/okta-add-app.jpg b/assets/guides/admin/okta-add-app.jpg
similarity index 100%
rename from assets/okta-add-app.jpg
rename to assets/guides/admin/okta-add-app.jpg
diff --git a/assets/okta-assign-app.jpg b/assets/guides/admin/okta-assign-app.jpg
similarity index 100%
rename from assets/okta-assign-app.jpg
rename to assets/guides/admin/okta-assign-app.jpg
diff --git a/assets/okta-client-id-and-secret.jpg b/assets/guides/admin/okta-client-id-and-secret.jpg
similarity index 100%
rename from assets/okta-client-id-and-secret.jpg
rename to assets/guides/admin/okta-client-id-and-secret.jpg
diff --git a/assets/okta-create-new-app.jpg b/assets/guides/admin/okta-create-new-app.jpg
similarity index 100%
rename from assets/okta-create-new-app.jpg
rename to assets/guides/admin/okta-create-new-app.jpg
diff --git a/assets/okta-create-openid-integration.jpg b/assets/guides/admin/okta-create-openid-integration.jpg
similarity index 100%
rename from assets/okta-create-openid-integration.jpg
rename to assets/guides/admin/okta-create-openid-integration.jpg
diff --git a/assets/okta-custom-app-creation.jpg b/assets/guides/admin/okta-custom-app-creation.jpg
similarity index 100%
rename from assets/okta-custom-app-creation.jpg
rename to assets/guides/admin/okta-custom-app-creation.jpg
diff --git a/assets/okta-issuer.jpg b/assets/guides/admin/okta-issuer.jpg
similarity index 100%
rename from assets/okta-issuer.jpg
rename to assets/guides/admin/okta-issuer.jpg
diff --git a/assets/register.png b/assets/guides/admin/register.png
similarity index 100%
rename from assets/register.png
rename to assets/guides/admin/register.png
diff --git a/assets/resources-new.svg b/assets/guides/admin/resources-new.svg
similarity index 100%
rename from assets/resources-new.svg
rename to assets/guides/admin/resources-new.svg
diff --git a/assets/resources-old.svg b/assets/guides/admin/resources-old.svg
similarity index 100%
rename from assets/resources-old.svg
rename to assets/guides/admin/resources-old.svg
diff --git a/assets/macos-keybinding.png b/assets/guides/customization/macos-keybinding.png
similarity index 100%
rename from assets/macos-keybinding.png
rename to assets/guides/customization/macos-keybinding.png
diff --git a/assets/SAML-config-1.png b/assets/guides/deployments/SAML-config-1.png
similarity index 100%
rename from assets/SAML-config-1.png
rename to assets/guides/deployments/SAML-config-1.png
diff --git a/assets/SAML-config-2.png b/assets/guides/deployments/SAML-config-2.png
similarity index 100%
rename from assets/SAML-config-2.png
rename to assets/guides/deployments/SAML-config-2.png
diff --git a/assets/SAML-process.png b/assets/guides/deployments/SAML-process.png
similarity index 100%
rename from assets/SAML-process.png
rename to assets/guides/deployments/SAML-process.png
diff --git a/assets/applications.png b/assets/guides/deployments/applications.png
similarity index 100%
rename from assets/applications.png
rename to assets/guides/deployments/applications.png
diff --git a/assets/keycloak-IdP-redirector.png b/assets/guides/deployments/keycloak-IdP-redirector.png
similarity index 100%
rename from assets/keycloak-IdP-redirector.png
rename to assets/guides/deployments/keycloak-IdP-redirector.png
diff --git a/assets/keycloak-add-client.png b/assets/guides/deployments/keycloak-add-client.png
similarity index 100%
rename from assets/keycloak-add-client.png
rename to assets/guides/deployments/keycloak-add-client.png
diff --git a/assets/keycloak-authenticator-config.png b/assets/guides/deployments/keycloak-authenticator-config.png
similarity index 100%
rename from assets/keycloak-authenticator-config.png
rename to assets/guides/deployments/keycloak-authenticator-config.png
diff --git a/assets/keycloak-client-config.png b/assets/guides/deployments/keycloak-client-config.png
similarity index 100%
rename from assets/keycloak-client-config.png
rename to assets/guides/deployments/keycloak-client-config.png
diff --git a/assets/keycloak-coder-config.png b/assets/guides/deployments/keycloak-coder-config.png
similarity index 100%
rename from assets/keycloak-coder-config.png
rename to assets/guides/deployments/keycloak-coder-config.png
diff --git a/assets/keycloak-create-client.png b/assets/guides/deployments/keycloak-create-client.png
similarity index 100%
rename from assets/keycloak-create-client.png
rename to assets/guides/deployments/keycloak-create-client.png
diff --git a/assets/keycloak-default-IdP.png b/assets/guides/deployments/keycloak-default-IdP.png
similarity index 100%
rename from assets/keycloak-default-IdP.png
rename to assets/guides/deployments/keycloak-default-IdP.png
diff --git a/assets/keycloak-identity-providers.png b/assets/guides/deployments/keycloak-identity-providers.png
similarity index 100%
rename from assets/keycloak-identity-providers.png
rename to assets/guides/deployments/keycloak-identity-providers.png
diff --git a/assets/keycloak-metadata-import.png b/assets/guides/deployments/keycloak-metadata-import.png
similarity index 100%
rename from assets/keycloak-metadata-import.png
rename to assets/guides/deployments/keycloak-metadata-import.png
diff --git a/assets/keycloak-secret.png b/assets/guides/deployments/keycloak-secret.png
similarity index 100%
rename from assets/keycloak-secret.png
rename to assets/guides/deployments/keycloak-secret.png
diff --git a/assets/manage-users.png b/assets/guides/deployments/manage-users.png
similarity index 100%
rename from assets/manage-users.png
rename to assets/guides/deployments/manage-users.png
diff --git a/assets/android-avd.png b/assets/guides/mobile-development/android-avd.png
similarity index 100%
rename from assets/android-avd.png
rename to assets/guides/mobile-development/android-avd.png
diff --git a/assets/android-sdk-missing.png b/assets/guides/mobile-development/android-sdk-missing.png
similarity index 100%
rename from assets/android-sdk-missing.png
rename to assets/guides/mobile-development/android-sdk-missing.png
diff --git a/assets/android-sdk-path.png b/assets/guides/mobile-development/android-sdk-path.png
similarity index 100%
rename from assets/android-sdk-path.png
rename to assets/guides/mobile-development/android-sdk-path.png
diff --git a/assets/cloudflare-1.png b/assets/guides/ssl-certificates/cloudflare-1.png
similarity index 100%
rename from assets/cloudflare-1.png
rename to assets/guides/ssl-certificates/cloudflare-1.png
diff --git a/assets/configure.png b/assets/images/configure.png
similarity index 100%
rename from assets/configure.png
rename to assets/images/configure.png
diff --git a/assets/default-tag.png b/assets/images/default-tag.png
similarity index 100%
rename from assets/default-tag.png
rename to assets/images/default-tag.png
diff --git a/assets/deprecate-image.png b/assets/images/deprecate-image.png
similarity index 100%
rename from assets/deprecate-image.png
rename to assets/images/deprecate-image.png
diff --git a/assets/embed-1.png b/assets/images/embed-1.png
similarity index 100%
rename from assets/embed-1.png
rename to assets/images/embed-1.png
diff --git a/assets/embed-2.png b/assets/images/embed-2.png
similarity index 100%
rename from assets/embed-2.png
rename to assets/images/embed-2.png
diff --git a/assets/existing-tag-as-default.png b/assets/images/existing-tag-as-default.png
similarity index 100%
rename from assets/existing-tag-as-default.png
rename to assets/images/existing-tag-as-default.png
diff --git a/assets/import-image.png b/assets/images/import-image.png
similarity index 100%
rename from assets/import-image.png
rename to assets/images/import-image.png
diff --git a/assets/org-resources.png b/assets/org-resources.png
deleted file mode 100644
index b1c1d1841..000000000
Binary files a/assets/org-resources.png and /dev/null differ
diff --git a/assets/pwa.png b/assets/pwa.png
deleted file mode 100644
index 3ec67e391..000000000
Binary files a/assets/pwa.png and /dev/null differ
diff --git a/assets/architecture.png b/assets/setup/architecture.png
similarity index 100%
rename from assets/architecture.png
rename to assets/setup/architecture.png
diff --git a/assets/licensing.png b/assets/setup/licensing.png
similarity index 100%
rename from assets/licensing.png
rename to assets/setup/licensing.png
diff --git a/assets/workspace-providers-org-whitelist.png b/assets/workspace-providers-org-whitelist.png
deleted file mode 100644
index d26de452f..000000000
Binary files a/assets/workspace-providers-org-whitelist.png and /dev/null differ
diff --git a/assets/advanced-workspace-config.png b/assets/workspaces/advanced-workspace-config.png
similarity index 100%
rename from assets/advanced-workspace-config.png
rename to assets/workspaces/advanced-workspace-config.png
diff --git a/assets/autostart_save_preferences.png b/assets/workspaces/autostart_save_preferences.png
similarity index 100%
rename from assets/autostart_save_preferences.png
rename to assets/workspaces/autostart_save_preferences.png
diff --git a/assets/create-devurl.png b/assets/workspaces/create-devurl.png
similarity index 100%
rename from assets/create-devurl.png
rename to assets/workspaces/create-devurl.png
diff --git a/assets/create-workspace.png b/assets/workspaces/create-workspace.png
similarity index 100%
rename from assets/create-workspace.png
rename to assets/workspaces/create-workspace.png
diff --git a/assets/cvm-create.png b/assets/workspaces/cvm-create.png
similarity index 100%
rename from assets/cvm-create.png
rename to assets/workspaces/cvm-create.png
diff --git a/assets/devurls.png b/assets/workspaces/devurls.png
similarity index 100%
rename from assets/devurls.png
rename to assets/workspaces/devurls.png
diff --git a/assets/dotfiles-preferences.png b/assets/workspaces/dotfiles-preferences.png
similarity index 100%
rename from assets/dotfiles-preferences.png
rename to assets/workspaces/dotfiles-preferences.png
diff --git a/assets/enable-autostart.png b/assets/workspaces/enable-autostart.png
similarity index 100%
rename from assets/enable-autostart.png
rename to assets/workspaces/enable-autostart.png
diff --git a/assets/launch-workspace.png b/assets/workspaces/launch-workspace.png
similarity index 100%
rename from assets/launch-workspace.png
rename to assets/workspaces/launch-workspace.png
diff --git a/assets/personalize-log.png b/assets/workspaces/personalize-log.png
similarity index 100%
rename from assets/personalize-log.png
rename to assets/workspaces/personalize-log.png
diff --git a/assets/set_autostart_time.png b/assets/workspaces/set_autostart_time.png
similarity index 100%
rename from assets/set_autostart_time.png
rename to assets/workspaces/set_autostart_time.png
diff --git a/assets/vscode-remote-ssh-panel.png b/assets/workspaces/vscode-remote-ssh-panel.png
similarity index 100%
rename from assets/vscode-remote-ssh-panel.png
rename to assets/workspaces/vscode-remote-ssh-panel.png
diff --git a/assets/create-from-template.png b/assets/workspaces/workspaces-as-code/create-from-template.png
similarity index 100%
rename from assets/create-from-template.png
rename to assets/workspaces/workspaces-as-code/create-from-template.png
diff --git a/assets/wac-location.png b/assets/workspaces/workspaces-as-code/wac-location.png
similarity index 100%
rename from assets/wac-location.png
rename to assets/workspaces/workspaces-as-code/wac-location.png
diff --git a/assets/wac-user-form.png b/assets/workspaces/workspaces-as-code/wac-user-form.png
similarity index 100%
rename from assets/wac-user-form.png
rename to assets/workspaces/workspaces-as-code/wac-user-form.png
diff --git a/assets/workspaces.svg b/assets/workspaces/workspaces.svg
similarity index 100%
rename from assets/workspaces.svg
rename to assets/workspaces/workspaces.svg
diff --git a/guides/admin/oidc-azuread.md b/guides/admin/oidc-azuread.md
index 3d934e16c..0fd4d22b9 100644
--- a/guides/admin/oidc-azuread.md
+++ b/guides/admin/oidc-azuread.md
@@ -22,7 +22,7 @@ information you need to provide to Coder.
 1. Using the search bar at the top, enter **App registrations** and click the
    matching search result.
 
-   ![App registration](../../assets/app-registration.png)
+   ![App registration](../../assets/guides/admin/app-registration.png)
 
 1. Click **New registration**.
 1. Provide a **Name** for your application.
@@ -30,7 +30,7 @@ information you need to provide to Coder.
    only - Single tenant** option should be sufficient for testing, but you may
    need a **multitenant** option for production environments.
 
-   ![Register your app](../../assets/register.png)
+   ![Register your app](../../assets/guides/admin/register.png)
 
 1. Provide your **Redirect URL** (it will be formatted similar to
    `https://coder.exampleCo.com/oidc/callback`).
@@ -53,7 +53,7 @@ On your application's **Overview**, look for the **Application (client) ID**
 under the **Essentials** section. This is the value Coder expects as the
 **Client ID**.
 
-![Client ID](../../assets/client-id.png)
+![Client ID](../../assets/guides/admin/client-id.png)
 
 ### Client secret
 
@@ -67,14 +67,14 @@ You'll need to create the client secret. To do so:
 1. You'll be redirected back to the **Certificates & secrets** page; save the
    **Value** field string for use as your client secret.
 
-![Client secret value](../../assets/client-secret.png)
+![Client secret value](../../assets/guides/admin/client-secret.png)
 
 ### Issuer
 
 On your app's **Overview** page, click **Endpoints**. Find **OpenID Connect
 metadata document**, and copy the first 2/3s of this value.
 
-![Issuer](../../assets/issuer.png)
+![Issuer](../../assets/guides/admin/issuer.png)
 
 For example, if the full value is:
 
diff --git a/guides/admin/oidc-okta.md b/guides/admin/oidc-okta.md
index 95c29ef8c..e18d9d82d 100644
--- a/guides/admin/oidc-okta.md
+++ b/guides/admin/oidc-okta.md
@@ -21,22 +21,22 @@ information you need to provide to Coder.
 1. From the admin dashboard, click **Applications** and click the
    **Applications** sub-menu.
 
-   ![Okta Applications](../../assets/okta-add-app.jpg)
+   ![Okta Applications](../../assets/guides/admin/okta-add-app.jpg)
 
 1. Click **Add Application**.
 
-   ![Okta Add Application](../../assets/okta-create-new-app.jpg)
+   ![Okta Add Application](../../assets/guides/admin/okta-create-new-app.jpg)
 
 1. Click **Create New App**.
 
-   ![Okta Create Application Modal](../../assets/okta-custom-app-creation.jpg)
+   ![Okta Create Application Modal](../../assets/guides/admin/okta-custom-app-creation.jpg)
 
 1. Select **OpenID Connect** and click **Create**
 1. Fill in the **Application name** (i.e. `Coder`), optionally add a logo
 1. Add the **Login redirect URIs** for Coder (it will be formatted similar
    to `https://coder.my-company.com/oidc/callback`).
   
-   ![Okta Create OpenID Application](../../assets/okta-create-openid-integration.jpg)
+   ![Okta Create OpenID Application](../../assets/guides/admin/okta-create-openid-integration.jpg)
 
 1. Click **Save** to proceed.
 
@@ -56,20 +56,20 @@ Once you've saved your app, you can obtain your:
 On your application's **General** tab, look for the **Client ID** under
 the **Client Credentials** section. Below this is the **Client secret**.
 
-![Client ID and Secret](../../assets/okta-client-id-and-secret.jpg)
+![Client ID and Secret](../../assets/guides/admin/okta-client-id-and-secret.jpg)
 
 ### Issuer
 
 On your app's **Overview** page, click the **Sign On** tab. Find the
 **OpenID Connect ID Token** section, and copy the **Issuer**.
 
-![Issuer](../../assets/okta-issuer.jpg)
+![Issuer](../../assets/guides/admin/okta-issuer.jpg)
 
 ## Step 3: Assign People and/or Groups to Coder
 
 On your app's **Overview** page, click the **Assignments** tab.
 
-![Assignments](../../assets/okta-assign-app.jpg)
+![Assignments](../../assets/guides/admin/okta-assign-app.jpg)
 
 From here, you can assign People and Groups to the application to
 provide access to Coder.
diff --git a/guides/admin/resources.md b/guides/admin/resources.md
index bcaef49e3..7d45bf1fd 100644
--- a/guides/admin/resources.md
+++ b/guides/admin/resources.md
@@ -23,7 +23,7 @@ each machine would see 100% utilization of its resources. However, these
 processes are relatively quick, so the machine is underutilized the vast
 majority of the time.
 
-![resources-nonshared.svg](../../assets/resources-old.svg)
+![resources-nonshared.svg](../../assets/guides/admin/resources-old.svg)
 
 However, sharing resources can allow you to provide your developers with access
 to the computing resources while minimizing underutilization.
@@ -35,7 +35,7 @@ resources they need during peak load (e.g., compilation, build); this offers
 them a performant experience when required. However, the shared resources
 minimize resource underutilization.
 
-![resources-shared.svg](../../assets/resources-new.svg)
+![resources-shared.svg](../../assets/guides/admin/resources-new.svg)
 
 ## Resource contention
 
@@ -60,4 +60,4 @@ compute costs:
 - The Coder organization's workspace inactivity shutdown threshold
 - The magnitude and frequency of code compilation operations
 
-![cpu_provision_ratio.png](../../assets/cpu_provision_ratio.png)
+![cpu_provision_ratio.png](../../assets/guides/admin/cpu_provision_ratio.png)
diff --git a/guides/admin/usage-monitoring.md b/guides/admin/usage-monitoring.md
index 3cfbc3200..7b767393a 100644
--- a/guides/admin/usage-monitoring.md
+++ b/guides/admin/usage-monitoring.md
@@ -16,9 +16,9 @@ contention can result in the throttling of developer workspaces, while excessive
 underutilization suggests that you may be spending more on your cloud workspace
 than necessary.
 
-![Monitoring CPU utilization](../../assets/compute-1.png)
+![Monitoring CPU utilization](../../assets/guides/admin/compute-1.png)
 
-![Monitoring Memory utilization](../../assets/compute-2.png)
+![Monitoring Memory utilization](../../assets/guides/admin/compute-2.png)
 
 There are several tools available to you to balance the tradeoff between
 workspace performance and cloud cost. Read more about this on
@@ -31,9 +31,9 @@ cluster resources to Coder's product-level resource identifiers. For example,
 the following chart tracks the CPU/Memory Limit Utilization of each workspace
 container and labels them with the username and workspace name identifiers:
 
-![Monitoring CPU Utilization by workspace and user](../../assets/compute-3.png)
+![Monitoring CPU Utilization by workspace and user](../../assets/guides/admin/compute-3.png)
 
-![Monitoring Memory Utilization by workspace and user](../../assets/compute-4.png)
+![Monitoring Memory Utilization by workspace and user](../../assets/guides/admin/compute-4.png)
 
 These views can help you track which users may require larger CPU allocations,
 enabling greater "burst-ability" under peak loads. However, remember that using
@@ -47,8 +47,8 @@ Monitoring the Coder control plane can help you maintain high uptime. For
 example, the following charts provide high-level insight into the state of the
 Coder API server:
 
-![Monitoring log event severity](../../assets/compute-5.png)
+![Monitoring log event severity](../../assets/guides/admin/compute-5.png)
 
-![Monitoring API status codes](../../assets/compute-6.png)
+![Monitoring API status codes](../../assets/guides/admin/compute-6.png)
 
-![Monitoring HTTP latency](../../assets/compute-7.png)
+![Monitoring HTTP latency](../../assets/guides/admin/compute-7.png)
diff --git a/guides/customization/macos-keybinding.md b/guides/customization/macos-keybinding.md
index 7da6a6a2b..6b7427bb9 100644
--- a/guides/customization/macos-keybinding.md
+++ b/guides/customization/macos-keybinding.md
@@ -16,4 +16,4 @@ To switch the keybindings:
 1. Use the **Keymap** toggle at the top to switch to **macOS**
 1. Click **OK** to save your changes and proceed
 
-![Configuring macOS keybindings](../../assets/macos-keybinding.png)
+![Configuring macOS keybindings](../../assets/guides/customization/macos-keybinding.png)
diff --git a/guides/deployments/code-server.md b/guides/deployments/code-server.md
index 6d9902e58..120968db1 100644
--- a/guides/deployments/code-server.md
+++ b/guides/deployments/code-server.md
@@ -14,7 +14,7 @@ addition to the base code-server functionality.
 - [Manage and distribute workspace images](https://coder.com/docs/images)
 - [Build custom workspaces that include your project's dependencies](https://coder.com/docs/images/structure)
 
-![Coder Dashboard](../../assets/applications.png)
+![Coder Dashboard](../../assets/guides/deployments/applications.png)
 
 ## Developer workflows
 
@@ -26,7 +26,7 @@ addition to the base code-server functionality.
 - [Manage workspaces with the Coder CLI](https://coder.com/docs/cli)
 - [Personalize workspaces](https://coder.com/docs/workspaces/personalization)
 
-![User management icon](../../assets/manage-users.png)
+![User management icon](../../assets/guides/deployments/manage-users.png)
 
 ## Team management
 
@@ -34,7 +34,7 @@ addition to the base code-server functionality.
 - [Assign user roles](https://coder.com/docs/admin/access-control/user-roles)
 - [Manage organizations](https://coder.com/docs/admin/access-control/organizations)
 
-![Workspace providers](../../assets/workspace-providers-admin.png)
+![Workspace providers](../../assets/admin/workspace-providers-admin.png)
 
 ## Operations
 
diff --git a/guides/deployments/keycloak.md b/guides/deployments/keycloak.md
index 4b666124c..fba5327a1 100644
--- a/guides/deployments/keycloak.md
+++ b/guides/deployments/keycloak.md
@@ -12,7 +12,7 @@ Administration Guide's
 [Identity Brokering](https://www.keycloak.org/docs/latest/server_admin/#_identity_broker)
 section.
 
-![Identity broker process](../../assets/SAML-process.png)
+![Identity broker process](../../assets/guides/deployments/SAML-process.png)
 
 ## Step 1: Create a new Realm in Keycloak
 
@@ -47,14 +47,14 @@ Realm will be where we will add the
    **ACS URL**:
    `https://<my-keycloak-url>/auth/realms/<realm-name>/broker/<keycloak-idp-alias>/endpoint`
 
-   ![Entity ID](../../assets/SAML-config-1.png)
+   ![Entity ID](../../assets/guides/deployments/SAML-config-1.png)
 
 1. The remaining parameters can be left as is, so click **Save** to proceed.
 
 1. At this point, you should be able to open the **Application Configuration**
    backup on JumpCloud and export the IdP metadata to use with Keycloak.
 
-   ![Export SAML Metadata](../../assets/SAML-config-2.png)
+   ![Export SAML Metadata](../../assets/guides/deployments/SAML-config-2.png)
 
 1. On the **User Groups** tab, add the JumpCloud User Group(s) that need access
    to Coder.
@@ -69,7 +69,7 @@ Realm will be where we will add the
    ([this Keycloak document](https://www.keycloak.org/docs/latest/server_admin/#saml-v2-0-identity-providers)
    provides additional information about adding a SAML 2.0 Identity Provider).
 
-   ![Keycloak identity providers](../../assets/keycloak-identity-providers.png)
+   ![Keycloak identity providers](../../assets/guides/deployments/keycloak-identity-providers.png)
 
 1. On the IdP configuration page, specify an **Alias** to use for your IdP
    provider.
@@ -77,7 +77,7 @@ Realm will be where we will add the
 1. Scroll to the bottom of the configuration page and upload the IdP metadata
    you exported from JumpCloud.
 
-   ![Keycloak metadata import](../../assets/keycloak-metadata-import.png)
+   ![Keycloak metadata import](../../assets/guides/deployments/keycloak-metadata-import.png)
 
 ### Optional: Specify JumpCloud as the default IdP
 
@@ -85,27 +85,27 @@ Realm will be where we will add the
 
 1. Select the **Browser** flow from the dropdown in the top-left.
 
-   ![Default Identity Provider](../../assets/keycloak-default-IdP.png)
+   ![Default Identity Provider](../../assets/guides/deployments/keycloak-default-IdP.png)
 
 1. Find the **Identity Provider Redirector** row and click **Actions** >
    **Config**.
 
-   ![Identity Provider Redirector](../../assets/keycloak-IdP-redirector.png)
+   ![Identity Provider Redirector](../../assets/guides/deployments/keycloak-IdP-redirector.png)
 
 1. Set **Alias** and **Default Identity Provider** to the alias of the identity
    provider you created earlier.
 
-   ![Authenticator Config](../../assets/keycloak-authenticator-config.png)
+   ![Authenticator Config](../../assets/guides/deployments/keycloak-authenticator-config.png)
 
 ## Step 4: Configure the OpenID Connect (OIDC) Connector in Keycloak
 
 1. Navigate to **Clients** and click **Create**.
 
-   ![Create Client Connector](../../assets/keycloak-create-client.png)
+   ![Create Client Connector](../../assets/guides/deployments/keycloak-create-client.png)
 
 1. Add a new OIDC Client to point to your Coder deployment and click **Save**.
 
-   ![Add OIDC client](../../assets/keycloak-add-client.png)
+   ![Add OIDC client](../../assets/guides/deployments/keycloak-add-client.png)
 
 1. Once on the **Clients** configuration page, set the **Access Type** to
    **Confidential** and click **Save**.
@@ -113,7 +113,7 @@ Realm will be where we will add the
 1. Your client configuration should look something like the following (make sure
    that all of the values point to your Coder deployment):
 
-   ![Client Configuration](../../assets/keycloak-client-config.png)
+   ![Client Configuration](../../assets/guides/deployments/keycloak-client-config.png)
 
 At this point, you can configure your Coder deployment to use the Keycloak OIDC
 Connector.
@@ -129,12 +129,12 @@ Connector.
 1. Add the **Secret** to the **Client Secret** field (you can get this value
    from the **Credentials** page in the Keycloak Clients Configuration).
 
-   ![Keycloak Secret](../../assets/keycloak-secret.png)
+   ![Keycloak Secret](../../assets/guides/deployments/keycloak-secret.png)
 
 1. Add your Keycloak instance and Realm as the `Issuer`. This will be a URL
    formatted as follows: `https://<my-keycloak-url>/auth/realms/<my-realm>`
 
-   ![Coder Keycloak Config](../../assets/keycloak-coder-config.png)
+   ![Coder Keycloak Config](../../assets/guides/deployments/keycloak-coder-config.png)
 
 1. Click **Save Preferences**.
 
diff --git a/guides/mobile-development/index.md b/guides/mobile-development/index.md
index bce63f812..5652a9404 100644
--- a/guides/mobile-development/index.md
+++ b/guides/mobile-development/index.md
@@ -17,19 +17,19 @@ developed remotely on Coder.
 
 1. Start Android Studio, and when prompted, install the SDK.
 
-   ![Android SDK Install](../../assets/android-sdk-missing.png)
+   ![Android SDK Install](../../assets/guides/mobile-development/android-sdk-missing.png)
 
 1. [Create and start](https://developer.android.com/studio/run/managing-avds) a
    Virtual Device.
 
-   ![Android Device](../../assets/android-avd.png)
+   ![Android Device](../../assets/guides/mobile-development/android-avd.png)
 
 1. Create a workspace variable called `ANDROID_SDK_PATH` and set it to the
    installation path of your Android SDK (for example, it's typically
    `~/Library/Android/sdk` on macOS and
    `C:\Users\<USER_NAME>\AppData\Local\Android\sdk` on Windows).
 
-   ![Android SDK Path](../../assets/android-sdk-path.png)
+   ![Android SDK Path](../../assets/guides/mobile-development/android-sdk-path.png)
 
 1. Start the Android Debug Server on port 5555:
 
diff --git a/guides/ssl-certificates/cloudflare.md b/guides/ssl-certificates/cloudflare.md
index 837e27bb8..f94a83cda 100644
--- a/guides/ssl-certificates/cloudflare.md
+++ b/guides/ssl-certificates/cloudflare.md
@@ -81,7 +81,7 @@ Create a token with the following settings:
 You can also add more zones (or give the token access to all zones in your
 account), and set an expiry date.
 
-![Create Custom Token](../../assets/cloudflare-1.png)
+![Create Custom Token](../../assets/guides/ssl-certificates/cloudflare-1.png)
 
 Click **Continue to summary**, then **Create Token**. Be sure to copy and save
 the token displayed because Cloudflare will not display it again.
diff --git a/images/configure.md b/images/configure.md
index ac6752c83..490c9c4de 100644
--- a/images/configure.md
+++ b/images/configure.md
@@ -90,7 +90,7 @@ Coder will run the configure file during the build process, and you can verify
 this using the **Workspace Overview** page (Coder runs the configure file as the
 penultimate step of the build process):
 
-![Workspace Overview Page](../assets/configure.png)
+![Workspace Overview Page](../assets/images/configure.png)
 
 ## Examples
 
diff --git a/images/deprecating.md b/images/deprecating.md
index 695d64834..3b537366c 100644
--- a/images/deprecating.md
+++ b/images/deprecating.md
@@ -11,7 +11,7 @@ workspaces.
 1. Select the **Deprecate this image** checkbox.
 1. Click **Update Image** to save your changes.
 
-![Deprecating an image](../assets/deprecate-image.png)
+![Deprecating an image](../assets/images/deprecate-image.png)
 
 > Users cannot create new workspaces using deprecated images. However, they can
 > continue to use _existing_ workspaces created with the now-deprecated images
diff --git a/images/embed-button.md b/images/embed-button.md
index 563f6d0c7..b12e22637 100644
--- a/images/embed-button.md
+++ b/images/embed-button.md
@@ -8,7 +8,7 @@ documentation to provide developers with a one-click way to start contributing.
 When a developer clicks on the embedded button, their workspace will use the
 image as you've configured it and automatically pull in the repository.
 
-![The Embed Button](../assets/embed-1.png)
+![The Embed Button](../assets/images/embed-1.png)
 
 ## Requirements
 
@@ -33,4 +33,4 @@ button.
    Markdown or HTML snippets). Copy the code and paste it into your README.md
    file.
 
-![Create embed button](../assets/embed-2.png)
+![Create embed button](../assets/images/embed-2.png)
diff --git a/images/importing.md b/images/importing.md
index 8bc4c1e40..5749b7b11 100644
--- a/images/importing.md
+++ b/images/importing.md
@@ -16,4 +16,4 @@ To import an image:
    workspace should have when using this image.
 1. Click **Import Image**.
 
-![Import image window](../assets/import-image.png)
+![Import image window](../assets/images/import-image.png)
diff --git a/images/tags.md b/images/tags.md
index 734183f10..69ba5a0b4 100644
--- a/images/tags.md
+++ b/images/tags.md
@@ -37,9 +37,9 @@ you create a workspace.
 When adding a tag, check **Set tag as default** to make it the default tag for
 that image.
 
-![Set default tag](../assets/default-tag.png)
+![Set default tag](../assets/images/default-tag.png)
 
 To use an existing tag as the default tag, click the **vertical ellipsis** for a
 tag and select **Make default**.
 
-![Set existing tag as default](../assets/existing-tag-as-default.png)
+![Set existing tag as default](../assets/images/existing-tag-as-default.png)
diff --git a/setup/architecture.md b/setup/architecture.md
index fd5c30764..28ebb6ccf 100644
--- a/setup/architecture.md
+++ b/setup/architecture.md
@@ -12,7 +12,7 @@ Coder is deployed on Kubernetes and includes the following components:
 
 Each component runs in its own Kubernetes pod.
 
-![Architecture](../assets/architecture.png)
+![Architecture](../assets/setup/architecture.png)
 
 ## Kubernetes NGINX ingress
 
diff --git a/setup/licensing.md b/setup/licensing.md
index 95462a949..9d8b70858 100644
--- a/setup/licensing.md
+++ b/setup/licensing.md
@@ -16,7 +16,7 @@ The **License** tab displays the details for your current license, including:
 - When the license was issued
 - When the license expires
 
-![License configuration screen](../assets/licensing.png)
+![License configuration screen](../assets/setup/licensing.png)
 
 You can also upload a new license file by clicking **Upload License**.
 
diff --git a/workspaces/autostart.md b/workspaces/autostart.md
index e7cb3c869..4ec7b5a8b 100644
--- a/workspaces/autostart.md
+++ b/workspaces/autostart.md
@@ -29,12 +29,12 @@ all queued workspaces are ready on time.
 
 1. Select the **Autostart** tab and set your desired Autostart time.
 
-   ![Set autostart time](../assets/set_autostart_time.png)
+   ![Set autostart time](../assets/workspaces/set_autostart_time.png)
 
 1. Select the workspaces for which you want to enable Autostart and save.
 
    ![Select workspaces to
-autostart](../assets/autostart_save_preferences.png)
+autostart](../assets/workspaces/autostart_save_preferences.png)
 
 ### Enabling Autostart for new workspaces
 
@@ -42,4 +42,4 @@ When creating a new workspace, you may enable Autostart by checking the box
 labeled **Automatically turn this workspace on at (HH:MM)** (where HH:MM is your
 configured time).
 
-![Enable autostart with new workspace](../assets/enable-autostart.png)
+![Enable autostart with new workspace](../assets/workspaces/enable-autostart.png)
diff --git a/workspaces/cvms.md b/workspaces/cvms.md
index 5754f0659..55e7c1313 100644
--- a/workspaces/cvms.md
+++ b/workspaces/cvms.md
@@ -26,7 +26,7 @@ To create a workspace capable of securely running system-level applications like
 Docker, make sure that the `Run as Container-based Virtual Machine` box is
 checked when you create a new workspace (it should be enabled by default).
 
-![Create CVM](../assets/cvm-create.png)
+![Create CVM](../assets/workspaces/cvm-create.png)
 
 ## Disk
 
diff --git a/workspaces/devurls.md b/workspaces/devurls.md
index f0061f4bf..5b7a27f2a 100644
--- a/workspaces/devurls.md
+++ b/workspaces/devurls.md
@@ -18,7 +18,7 @@ indicate who can **access** the URL and the **internal server scheme** (e.g.,
 whether Coder should use HTTP or HTTPS when proxying requests to the internal
 server).
 
-![Create a dev URL](../assets/create-devurl.png)
+![Create a dev URL](../assets/workspaces/create-devurl.png)
 
 ## Access control
 
@@ -38,7 +38,7 @@ To access a dev URL, you can click:
 - The **Open in browser** icon to launch a new browser window
 - The **Copy** button to copy the URL for sharing
 
-![Dev URLs List](../assets/devurls.png)
+![Dev URLs List](../assets/workspaces/devurls.png)
 
 ### Direct access
 
diff --git a/workspaces/editors.md b/workspaces/editors.md
index f29e815dc..e2c61dc92 100644
--- a/workspaces/editors.md
+++ b/workspaces/editors.md
@@ -26,14 +26,14 @@ from your local VS Code, connected to your Coder workspace for compute, etc.
 1. In VS Code's left-hand nav bar, click **Remote Explorer** and right-click on
    a workspace to connect
 
-![VS Code Remote Explorer](../assets/vscode-remote-ssh-panel.png)
+![VS Code Remote Explorer](../assets/workspaces/vscode-remote-ssh-panel.png)
 
 ## VS Code in the browser
 
 Launch VS Code in the browser from the workspaces page by clicking the _Code
 Web_ icon.
 
-![Launch a workspace](../assets/launch-workspace.png)
+![Launch a workspace](../assets/workspaces/launch-workspace.png)
 
 ## JetBrains IDEs in the browser
 
@@ -43,7 +43,7 @@ you can launch it from the dashboard. Coder launches JetBrains IDEs in their own
 windows; be sure to set your browser to allow popup windows so that you can use
 your IDE.
 
-![JetBrains logos](../assets/applications.png)
+![JetBrains logos](../assets/guides/deployments/applications.png)
 
 > If you need a valid license to run your IDE locally, you'll also need one to
 > run it in Coder.
diff --git a/workspaces/getting-started.md b/workspaces/getting-started.md
index d141c9405..3136550de 100644
--- a/workspaces/getting-started.md
+++ b/workspaces/getting-started.md
@@ -18,7 +18,7 @@ Workspace**.
 > To learn more about creating an environment from templates, see
 > [Workspaces as code](workspaces-as-code/index.md).
 
-![Create a workspace](../assets/create-workspace.png)
+![Create a workspace](../assets/workspaces/create-workspace.png)
 
 1. Enter a friendly name for your workspace, and choose an
    [image](../images/index.md) to use.
@@ -57,7 +57,7 @@ You can also specify the resources Coder should allocate.
 Once you've created a workspace, it's time to hop in. Read more about how to
 [connect your favorite editor or IDE](./editors.md) with your new workspace!
 
-![Start coding](../assets/applications.png)
+![Start coding](../assets/guides/deployments/applications.png)
 
 > [Integrate with Git](./personalization#git-integration) to have your SSH key
 > injected automatically into Workspaces.
diff --git a/workspaces/index.md b/workspaces/index.md
index e86d7ef4c..41612c0a2 100644
--- a/workspaces/index.md
+++ b/workspaces/index.md
@@ -23,7 +23,7 @@ description: "Learn about development workspaces in Coder."
 A workspace is your remote development environment. All workspaces are based on
 a shared [image](../images/index.md) and therefore reproducible.
 
-![Workspaces](../assets/workspaces.svg)
+![Workspaces](../assets/workspaces/workspaces.svg)
 
 ## In this section
 
diff --git a/workspaces/personalization.md b/workspaces/personalization.md
index 8975eb538..0efeb0419 100644
--- a/workspaces/personalization.md
+++ b/workspaces/personalization.md
@@ -79,7 +79,7 @@ echo "[user]\n\temail = youremailhere@gmail.com\n\tname = Your Name" > ~/.gitcon
 The Workspaces page shows the log output of the `~/personalize` script in the
 build log whenever it runs:
 
-![~/personalize log output](../assets/personalize-log.png)
+![~/personalize log output](../assets/workspaces/personalize-log.png)
 
 ## Git integration
 
@@ -110,4 +110,4 @@ Read more about dotfiles repos [here](http://dotfiles.github.io/).
 You can provide a link to your dotfiles repo that's hosted with the Git provider
 of your choice under [User preferences](preferences.md):
 
-![Dotfiles preferences](../assets/dotfiles-preferences.png)
+![Dotfiles preferences](../assets/workspaces/dotfiles-preferences.png)
diff --git a/workspaces/workspace-params.md b/workspaces/workspace-params.md
index 50b5fc992..240b6f942 100644
--- a/workspaces/workspace-params.md
+++ b/workspaces/workspace-params.md
@@ -14,7 +14,7 @@ To create a workspace, launch the creation dialog by:
 - Clicking **Create Workspace** (if available), or
 - Clicking **New Workspace** in the top-right
 
-![Create a workspace](../assets/create-workspace.png)
+![Create a workspace](../assets/workspaces/create-workspace.png)
 
 When prompted, provide the following information:
 
@@ -59,7 +59,7 @@ workspace. You can choose to run your workspace as a container-based virtual
 machine, provide a dotfiles URI for [personalization](personalization.md), and
 set your resource allocation.
 
-![Workspace setup advanced settings](../assets/advanced-workspace-config.png)
+![Workspace setup advanced settings](../assets/workspaces/advanced-workspace-config.png)
 
 <table>
     <tr>
diff --git a/workspaces/workspaces-as-code/index.md b/workspaces/workspaces-as-code/index.md
index cd9c4086e..0eb758a8f 100644
--- a/workspaces/workspaces-as-code/index.md
+++ b/workspaces/workspaces-as-code/index.md
@@ -29,7 +29,7 @@ in our [syntax guide](templates.md).
 To create a new workspace using a template, go to **New Workspace** > **Create
 from Template**.
 
-![Create from template button](../../assets/create-from-template.png)
+![Create from template button](../../assets/workspaces/workspaces-as-code/create-from-template.png)
 
 When prompted, provide:
 
@@ -42,7 +42,7 @@ When prompted, provide:
   will be `.coder/coder.yaml`, but if you choose a different path, provide it
   here
 
-![Create workspace from template](../../assets/wac-user-form.png)
+![Create workspace from template](../../assets/workspaces/workspaces-as-code/wac-user-form.png)
 
 ## Adding an embeddable button
 
diff --git a/workspaces/workspaces-as-code/templates.md b/workspaces/workspaces-as-code/templates.md
index 180f811d8..9622e3a37 100644
--- a/workspaces/workspaces-as-code/templates.md
+++ b/workspaces/workspaces-as-code/templates.md
@@ -20,7 +20,7 @@ Coder looks for your workspace template at the following path:
 <repository-root>/.coder/<template-name>.yaml
 ```
 
-![Template Location](../../assets/wac-location.png)
+![Template Location](../../assets/workspaces/workspaces-as-code/wac-location.png)
 
 ## Workspace template sample