diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/azure-portal.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/azure-portal.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/azure-portal.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/azure-portal.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/cloud-shell-initialized.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/cloud-shell-initialized.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/cloud-shell-initialized.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/cloud-shell-initialized.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/confirm-event-subscription.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/confirm-event-subscription.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/confirm-event-subscription.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/confirm-event-subscription.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/confirm-function-creation.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/confirm-function-creation.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/confirm-function-creation.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/confirm-function-creation.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/create-storage-cloud-shell.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/create-storage-cloud-shell.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/create-storage-cloud-shell.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/create-storage-cloud-shell.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-changes-summary.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-changes-summary.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-changes-summary.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-changes-summary.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-connection-string.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-connection-string.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-connection-string.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/dependency-storage-connection-string.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/event-hub-add-subscription-link.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/event-hub-add-subscription-link.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/event-hub-add-subscription-link.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/event-hub-add-subscription-link.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/event-hub-namespace-shared-access-policies.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/event-hub-namespace-shared-access-policies.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/event-hub-namespace-shared-access-policies.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/event-hub-namespace-shared-access-policies.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/event-subscription-select-function.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/event-subscription-select-function.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/event-subscription-select-function.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/event-subscription-select-function.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/function-invocations.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/function-invocations.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/function-invocations.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/function-invocations.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/function-runtime-version.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/function-runtime-version.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/function-runtime-version.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/function-runtime-version.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/get-publish-profile.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/get-publish-profile.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/get-publish-profile.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/get-publish-profile.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/import-profile.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/import-profile.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/import-profile.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/import-profile.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/launch-cloud-shell.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/launch-cloud-shell.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/launch-cloud-shell.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/launch-cloud-shell.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/overview.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/overview.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/overview.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/overview.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/publish-select-function-app.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/publish-select-function-app.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/publish-select-function-app.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/publish-select-function-app.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/publish-storage-configure-link.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/publish-storage-configure-link.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/publish-storage-configure-link.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/publish-storage-configure-link.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/query-results.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/query-results.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/query-results.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/query-results.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/resources-in-resource-group.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/resources-in-resource-group.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/resources-in-resource-group.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/resources-in-resource-group.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/run-sql-query.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/run-sql-query.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/run-sql-query.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/run-sql-query.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-dependency-storage.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-dependency-storage.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-dependency-storage.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-dependency-storage.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-function-app.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-function-app.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-function-app.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-function-app.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-publish.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-publish.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-publish.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-publish.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-resource-group.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-resource-group.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/select-resource-group.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/select-resource-group.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/sql-data-warehouse-page.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/sql-data-warehouse-page.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/sql-data-warehouse-page.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/sql-data-warehouse-page.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/sql-server-authentication.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/sql-server-authentication.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/sql-server-authentication.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/sql-server-authentication.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/start-publish-button.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/start-publish-button.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/start-publish-button.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/start-publish-button.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/storage-captured-file.png b/samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/storage-captured-file.png
similarity index 100%
rename from samples/e2e/EventHubsCaptureEventGridDemo/event-grid-event-hubs-functions-synapse-analytics/storage-captured-file.png
rename to samples/e2e/EventHubsCaptureEventGridDemo/media/event-grid-event-hubs-functions-synapse-analytics/storage-captured-file.png
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/EventGridIntegrationOverview.PNG b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/EventGridIntegrationOverview.PNG
deleted file mode 100644
index 2fad0698..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/EventGridIntegrationOverview.PNG and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/add-event-grid-subscription.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/add-event-grid-subscription.png
deleted file mode 100644
index 468d29a6..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/add-event-grid-subscription.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/copy-key.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/copy-key.png
deleted file mode 100644
index 12cee143..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/copy-key.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/event-hub-connection.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/event-hub-connection.png
deleted file mode 100644
index 08360628..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/event-hub-connection.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/pick-target.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/pick-target.png
deleted file mode 100644
index 058aff7f..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/pick-target.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/publish-function-app.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/publish-function-app.png
deleted file mode 100644
index 1a2a9b03..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/publish-function-app.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-function-app.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-function-app.png
deleted file mode 100644
index 0116e466..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-function-app.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-function.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-function.png
deleted file mode 100644
index 7eaa5a3a..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-function.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-publish.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-publish.png
deleted file mode 100644
index 5471bf10..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/select-publish.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/set-subscription-values.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/set-subscription-values.png
deleted file mode 100644
index 44c95a86..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/set-subscription-values.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/show-root-key.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/show-root-key.png
deleted file mode 100644
index a47c57ae..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/show-root-key.png and /dev/null differ
diff --git a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/view-function-app.png b/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/view-function-app.png
deleted file mode 100644
index 3f2947aa..00000000
Binary files a/samples/e2e/EventHubsCaptureEventGridDemo/store-captured-data-data-warehouse/view-function-app.png and /dev/null differ