diff --git a/src/components/SdkExamples.astro b/src/components/SdkExamples.astro
index 07fe680..0a0cd79 100644
--- a/src/components/SdkExamples.astro
+++ b/src/components/SdkExamples.astro
@@ -3,12 +3,14 @@ import { Tabs, TabItem } from '@astrojs/starlight/components';
 import { getCollection } from 'astro:content';
 
 interface Props {
-    content: string;
+    subfolder: string;
 }
 
-const { content } = Astro.props;
+const { subfolder } = Astro.props;
 
-const unorderedExamples = await getCollection(content);
+const unorderedExamples = await getCollection('sdk-examples', ({ id }) => 
+    id.startsWith(subfolder + '/')
+);
 const orderedExamples = unorderedExamples.sort((a, b) => a.data.order - b.data.order);
 
 ---
diff --git a/src/content.config.ts b/src/content.config.ts
index 824ce8a..b8edc20 100644
--- a/src/content.config.ts
+++ b/src/content.config.ts
@@ -2,7 +2,7 @@ import { defineCollection } from 'astro:content';
 import { docsSchema } from '@astrojs/starlight/schema';
 import { z } from 'astro:content';
 import { ClientPackageSchema } from './schemas/client-package';
-import {CodeExampleSchema} from "src/schemas/code-example.ts";
+import { CodeExampleSchema } from "./schemas/code-example";
 
 const docs = defineCollection({
   schema: docsSchema({
@@ -18,13 +18,7 @@ const sdkExamples = defineCollection({
   schema: CodeExampleSchema,
 })
 
-const tlsExamples = defineCollection({
-  type: 'content',
-  schema: CodeExampleSchema,
-})
-
 export const collections = {
   docs,
   'sdk-examples': sdkExamples,
-  'tls-examples': tlsExamples,
 };
diff --git a/src/content/docs/building-with-kessel/how-to/enable-tls.mdx b/src/content/docs/building-with-kessel/how-to/enable-tls.mdx
index 08577e2..eb23f13 100644
--- a/src/content/docs/building-with-kessel/how-to/enable-tls.mdx
+++ b/src/content/docs/building-with-kessel/how-to/enable-tls.mdx
@@ -34,4 +34,4 @@ This mounts the CA certificate at `/ca-certs/service-ca.crt`, which you can refe
 
 Below are complete examples showing how to configure TLS with OAuth 2.0 authentication in each supported language:
 
-<SdkExamples content="tls-examples" />
+<SdkExamples subfolder="tls" />
diff --git a/src/content/docs/start-here/getting-started.mdx b/src/content/docs/start-here/getting-started.mdx
index 9f1a691..671c9ef 100644
--- a/src/content/docs/start-here/getting-started.mdx
+++ b/src/content/docs/start-here/getting-started.mdx
@@ -240,7 +240,7 @@ This results in that user having the access described by the role to that worksp
 
 ### Report and Check Examples
 
-<SdkExamples content="sdk-examples" />
+<SdkExamples subfolder="getting-started" />
 
 ## Next steps and roadmap
 
@@ -262,4 +262,4 @@ We're open to contributions! Check us out on GitHub at [project-kessel](https://
 |-------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
 | **Schema Language**     | Use multiple files and languages for schema, with overlap and duplicated information        | Unify all these into a single schema language—no duplication or repeated information               |
 | **Configuration Method**| Edit schema and config via files                                                            | Configure everything at runtime via an API                                                         |
-| **RBAC Management**     | Use temporary scripts or the pre-Kessel RBAC v1 API                                         | Use an RBAC management API (v2) to encapsulate access grants and workspace management              |
\ No newline at end of file
+| **RBAC Management**     | Use temporary scripts or the pre-Kessel RBAC v1 API                                         | Use an RBAC management API (v2) to encapsulate access grants and workspace management              |
diff --git a/src/content/sdk-examples/curl.md b/src/content/sdk-examples/getting-started/curl.md
similarity index 100%
rename from src/content/sdk-examples/curl.md
rename to src/content/sdk-examples/getting-started/curl.md
diff --git a/src/content/sdk-examples/go.md b/src/content/sdk-examples/getting-started/go.md
similarity index 100%
rename from src/content/sdk-examples/go.md
rename to src/content/sdk-examples/getting-started/go.md
diff --git a/src/content/sdk-examples/grpcurl.md b/src/content/sdk-examples/getting-started/grpcurl.md
similarity index 100%
rename from src/content/sdk-examples/grpcurl.md
rename to src/content/sdk-examples/getting-started/grpcurl.md
diff --git a/src/content/sdk-examples/java.md b/src/content/sdk-examples/getting-started/java.md
similarity index 100%
rename from src/content/sdk-examples/java.md
rename to src/content/sdk-examples/getting-started/java.md
diff --git a/src/content/sdk-examples/javascript.md b/src/content/sdk-examples/getting-started/javascript.md
similarity index 100%
rename from src/content/sdk-examples/javascript.md
rename to src/content/sdk-examples/getting-started/javascript.md
diff --git a/src/content/sdk-examples/python.md b/src/content/sdk-examples/getting-started/python.md
similarity index 100%
rename from src/content/sdk-examples/python.md
rename to src/content/sdk-examples/getting-started/python.md
diff --git a/src/content/sdk-examples/ruby.md b/src/content/sdk-examples/getting-started/ruby.md
similarity index 100%
rename from src/content/sdk-examples/ruby.md
rename to src/content/sdk-examples/getting-started/ruby.md
diff --git a/src/content/tls-examples/go.md b/src/content/sdk-examples/tls/go.md
similarity index 100%
rename from src/content/tls-examples/go.md
rename to src/content/sdk-examples/tls/go.md
diff --git a/src/content/tls-examples/python.md b/src/content/sdk-examples/tls/python.md
similarity index 100%
rename from src/content/tls-examples/python.md
rename to src/content/sdk-examples/tls/python.md