diff --git a/docs/bin/generate-manifest.php b/docs/bin/generate-manifest.php
index d44992e9..932dbc7d 100644
--- a/docs/bin/generate-manifest.php
+++ b/docs/bin/generate-manifest.php
@@ -12,6 +12,7 @@
 $repo = 'wordpress/secure-custom-fields';
 
 $manifest = array();
+$slug_map = array(); // Track slugs and their sources
 $paths    = array(
 	$root . '/*.md',
 	$root . '/*/*.md',
@@ -36,8 +37,12 @@
 		// Get relative path from docs directory
 		$key = str_replace( array( $root . '/', '.md' ), '', $file );
 
-		// Handle index.md files specially
-		if ( 'index' === $slug ) {
+		// Special handling for tutorial files
+		if ( 'tutorial' === $slug ) {
+			$bits = explode( '/', $key );
+			array_pop( $bits ); // Remove 'tutorial'
+			$slug = end( $bits ) . '-tutorial'; // Use parent directory name plus -tutorial
+		} elseif ( 'index' === $slug ) { // Handle index.md files specially.
 			$bits = explode( '/', $key );
 			array_pop( $bits ); // Remove 'index'
 			$slug = end( $bits ); // Use parent directory name as slug
@@ -61,6 +66,15 @@
 				basename( $file ) === 'index.md' ? '/index.md' : '.md'
 			),
 		);
+
+		// Check for slug conflicts
+		if ( isset( $slug_map[ $slug ] ) ) {
+			printf( "\nError: Slug conflict detected!\n\n" );
+			printf( "Original entry:\n%s\n\n", json_encode( $manifest[ $slug_map[ $slug ] ], JSON_PRETTY_PRINT ) );
+			printf( "Conflicting entry:\n%s\n\n", json_encode( $manifest[ $key ], JSON_PRETTY_PRINT ) );
+			exit( 1 );
+		}
+		$slug_map[ $slug ] = $key;
 	}
 }
 
diff --git a/docs/bin/manifest.json b/docs/bin/manifest.json
index a8e0bfaa..80413ec5 100644
--- a/docs/bin/manifest.json
+++ b/docs/bin/manifest.json
@@ -29,11 +29,6 @@
         "parent": "features",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/api.md"
     },
-    "features/fields": {
-        "slug": "fields",
-        "parent": "features",
-        "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/index.md"
-    },
     "features": {
         "slug": "features",
         "parent": null,
@@ -69,15 +64,10 @@
         "parent": null,
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/tutorials/index.md"
     },
-    "features/fields/clone": {
-        "slug": "clone",
-        "parent": "features/fields",
-        "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/clone/index.md"
-    },
-    "features/fields/tutorial": {
-        "slug": "tutorial",
-        "parent": "features/fields",
-        "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/tutorial.md"
+    "features/fields": {
+        "slug": "fields",
+        "parent": "features",
+        "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/index.md"
     },
     "features/fields/accordion": {
         "slug": "accordion",
@@ -85,7 +75,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/accordion/index.md"
     },
     "features/fields/accordion/tutorial": {
-        "slug": "tutorial",
+        "slug": "accordion-tutorial",
         "parent": "features/fields/accordion",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/accordion/tutorial.md"
     },
@@ -95,7 +85,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/button-group/index.md"
     },
     "features/fields/button-group/tutorial": {
-        "slug": "tutorial",
+        "slug": "button-group-tutorial",
         "parent": "features/fields/button-group",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/button-group/tutorial.md"
     },
@@ -105,12 +95,17 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/checkbox/index.md"
     },
     "features/fields/checkbox/tutorial": {
-        "slug": "tutorial",
+        "slug": "checkbox-tutorial",
         "parent": "features/fields/checkbox",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/checkbox/tutorial.md"
     },
+    "features/fields/clone": {
+        "slug": "clone",
+        "parent": "features/fields",
+        "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/clone/index.md"
+    },
     "features/fields/clone/tutorial": {
-        "slug": "tutorial",
+        "slug": "clone-tutorial",
         "parent": "features/fields/clone",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/clone/tutorial.md"
     },
@@ -120,7 +115,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/color-picker/index.md"
     },
     "features/fields/color-picker/tutorial": {
-        "slug": "tutorial",
+        "slug": "color-picker-tutorial",
         "parent": "features/fields/color-picker",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/color-picker/tutorial.md"
     },
@@ -130,7 +125,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/date-picker/index.md"
     },
     "features/fields/date-picker/tutorial": {
-        "slug": "tutorial",
+        "slug": "date-picker-tutorial",
         "parent": "features/fields/date-picker",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/date-picker/tutorial.md"
     },
@@ -140,7 +135,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/date-time-picker/index.md"
     },
     "features/fields/date-time-picker/tutorial": {
-        "slug": "tutorial",
+        "slug": "date-time-picker-tutorial",
         "parent": "features/fields/date-time-picker",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/date-time-picker/tutorial.md"
     },
@@ -150,7 +145,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/email/index.md"
     },
     "features/fields/email/tutorial": {
-        "slug": "tutorial",
+        "slug": "email-tutorial",
         "parent": "features/fields/email",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/email/tutorial.md"
     },
@@ -160,7 +155,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/file/index.md"
     },
     "features/fields/file/tutorial": {
-        "slug": "tutorial",
+        "slug": "file-tutorial",
         "parent": "features/fields/file",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/file/tutorial.md"
     },
@@ -170,7 +165,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/flexible-content/index.md"
     },
     "features/fields/flexible-content/tutorial": {
-        "slug": "tutorial",
+        "slug": "flexible-content-tutorial",
         "parent": "features/fields/flexible-content",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/flexible-content/tutorial.md"
     },
@@ -180,7 +175,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/gallery/index.md"
     },
     "features/fields/gallery/tutorial": {
-        "slug": "tutorial",
+        "slug": "gallery-tutorial",
         "parent": "features/fields/gallery",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/gallery/tutorial.md"
     },
@@ -190,7 +185,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/google-map/index.md"
     },
     "features/fields/google-map/tutorial": {
-        "slug": "tutorial",
+        "slug": "google-map-tutorial",
         "parent": "features/fields/google-map",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/google-map/tutorial.md"
     },
@@ -200,7 +195,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/group/index.md"
     },
     "features/fields/group/tutorial": {
-        "slug": "tutorial",
+        "slug": "group-tutorial",
         "parent": "features/fields/group",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/group/tutorial.md"
     },
@@ -210,7 +205,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/icon-picker/index.md"
     },
     "features/fields/icon-picker/tutorial": {
-        "slug": "tutorial",
+        "slug": "icon-picker-tutorial",
         "parent": "features/fields/icon-picker",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/icon-picker/tutorial.md"
     },
@@ -220,7 +215,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/image/index.md"
     },
     "features/fields/image/tutorial": {
-        "slug": "tutorial",
+        "slug": "image-tutorial",
         "parent": "features/fields/image",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/image/tutorial.md"
     },
@@ -230,7 +225,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/link/index.md"
     },
     "features/fields/link/tutorial": {
-        "slug": "tutorial",
+        "slug": "link-tutorial",
         "parent": "features/fields/link",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/link/tutorial.md"
     },
@@ -240,7 +235,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/message/index.md"
     },
     "features/fields/message/tutorial": {
-        "slug": "tutorial",
+        "slug": "message-tutorial",
         "parent": "features/fields/message",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/message/tutorial.md"
     },
@@ -250,7 +245,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/number/index.md"
     },
     "features/fields/number/tutorial": {
-        "slug": "tutorial",
+        "slug": "number-tutorial",
         "parent": "features/fields/number",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/number/tutorial.md"
     },
@@ -260,7 +255,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/oembed/index.md"
     },
     "features/fields/oembed/tutorial": {
-        "slug": "tutorial",
+        "slug": "oembed-tutorial",
         "parent": "features/fields/oembed",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/oembed/tutorial.md"
     },
@@ -270,7 +265,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/page-link/index.md"
     },
     "features/fields/page-link/tutorial": {
-        "slug": "tutorial",
+        "slug": "page-link-tutorial",
         "parent": "features/fields/page-link",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/page-link/tutorial.md"
     },
@@ -280,7 +275,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/password/index.md"
     },
     "features/fields/password/tutorial": {
-        "slug": "tutorial",
+        "slug": "password-tutorial",
         "parent": "features/fields/password",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/password/tutorial.md"
     },
@@ -290,7 +285,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/post-object/index.md"
     },
     "features/fields/post-object/tutorial": {
-        "slug": "tutorial",
+        "slug": "post-object-tutorial",
         "parent": "features/fields/post-object",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/post-object/tutorial.md"
     },
@@ -300,7 +295,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/radio/index.md"
     },
     "features/fields/radio/tutorial": {
-        "slug": "tutorial",
+        "slug": "radio-tutorial",
         "parent": "features/fields/radio",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/radio/tutorial.md"
     },
@@ -310,7 +305,7 @@
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/range/index.md"
     },
     "features/fields/range/tutorial": {
-        "slug": "tutorial",
+        "slug": "range-tutorial",
         "parent": "features/fields/range",
         "markdown_source": "https://github.com/wordpress/secure-custom-fields/blob/trunk/docs/features/fields/range/tutorial.md"
     }
diff --git a/docs/features/fields.md b/docs/features/fields.md
deleted file mode 100644
index e5805813..00000000
--- a/docs/features/fields.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Field Types
-
-Secure Custom Fields provides a variety of field types to handle different content needs.
-
-## Basic Fields
-
-- **Text** - Single line text input
-- **Textarea** - Multi-line text input
-- **Number** - Numeric values
-- **Email** - Email address validation
-- **URL** - Website URL input
-
-## Content Fields
-
-- **WYSIWYG Editor** - Rich text editor
-- **Image** - Image upload and selection
-- **File** - File upload and management
-- **Gallery** - Multiple image management
-
-## Choice Fields
-
-- **Select** - Dropdown selection
-- **Checkbox** - Multiple selections
-- **Radio Button** - Single selection
-- **True/False** - Toggle switch
-
-## Relational Fields
-
-- **Link** - Internal/external link management
-- **Post Object** - Post selection
-- **Page Link** - Internal page linking
-- **Relationship** - Advanced post relationships
-- **Taxonomy** - Term selection
-
-## Layout Fields
-
-- **Message** - Display instructions
-- **Tab** - Group fields into tabs
-- **Group** - Organize fields together
-- **Repeater** - Repeatable field groups
-- **Flexible Content** - Dynamic layouts 
\ No newline at end of file
diff --git a/docs/features/fields/clone.md b/docs/features/fields/clone.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/features/fields/tutorial.md b/docs/features/fields/tutorial.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/features/index.md b/docs/features/index.md
index ebce1b44..75946214 100644
--- a/docs/features/index.md
+++ b/docs/features/index.md
@@ -5,7 +5,7 @@ This section details all features available in Secure Custom Fields.
 ## Core Features
 
 - [Post Types](post-types.md) - Create and manage custom post types
-- [Fields](fields.md) - Available field types and their usage
+- [Fields](fields/index.md) - Available field types and their usage
 - [API](api.md) - Programmatic access and integration
 
 ## Feature Categories
@@ -23,4 +23,31 @@ This section details all features available in Secure Custom Fields.
 3. **Developer Tools**
    - API endpoints
    - Hooks and filters
-   - Helper functions 
\ No newline at end of file
+   - Helper functions
+
+## Available Fields
+
+- [Accordion](fields/accordion/index.md) - Group fields into collapsible sections
+- [Button Group](fields/button-group/index.md) - Select one option from a group of buttons
+- [Checkbox](fields/checkbox/index.md) - Select one or more choices
+- [Clone](fields/clone/index.md) - Duplicate and reuse existing field configurations
+- [Color Picker](fields/color-picker/index.md) - Choose colors with a visual picker
+- [Date Picker](fields/date-picker/index.md) - Select dates from a calendar
+- [Date/Time Picker](fields/date-time-picker/index.md) - Select dates and times
+- [Email](fields/email/index.md) - Input and validate email addresses
+- [File](fields/file/index.md) - Upload and manage files
+- [Flexible Content](fields/flexible-content/index.md) - Create flexible content layouts
+- [Gallery](fields/gallery/index.md) - Manage collections of images
+- [Google Map](fields/google-map/index.md) - Add location data with Google Maps
+- [Group](fields/group/index.md) - Group fields together
+- [Icon Picker](fields/icon-picker/index.md) - Select from available icons
+- [Image](fields/image/index.md) - Upload and manage images
+- [Link](fields/link/index.md) - Create links with titles and targets
+- [Message](fields/message/index.md) - Display instructional text
+- [Number](fields/number/index.md) - Input numeric values
+- [oEmbed](fields/oembed/index.md) - Embed external content
+- [Page Link](fields/page-link/index.md) - Link to internal content
+- [Password](fields/password/index.md) - Securely input passwords
+- [Post Object](fields/post-object/index.md) - Relate to other posts
+- [Radio](fields/radio/index.md) - Select one choice from options
+- [Range](fields/range/index.md) - Select a numeric value with a slider 
\ No newline at end of file