diff --git a/src/Elastic.ApiExplorer/ApiRenderContext.cs b/src/Elastic.ApiExplorer/ApiRenderContext.cs
index 5d6dd220c..73d37bdd9 100644
--- a/src/Elastic.ApiExplorer/ApiRenderContext.cs
+++ b/src/Elastic.ApiExplorer/ApiRenderContext.cs
@@ -17,4 +17,5 @@ StaticFileContentHashProvider StaticFileContentHashProvider
 	: RenderContext<OpenApiDocument>(BuildContext, Model)
 {
 	public required string NavigationHtml { get; init; }
+	public required INavigationItem CurrentNavigation { get; init; }
 }
diff --git a/src/Elastic.ApiExplorer/ApiViewModel.cs b/src/Elastic.ApiExplorer/ApiViewModel.cs
index 9a8f22856..762ae9a75 100644
--- a/src/Elastic.ApiExplorer/ApiViewModel.cs
+++ b/src/Elastic.ApiExplorer/ApiViewModel.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Site.FileProviders;
+using Elastic.Documentation.Site.Navigation;
 
 namespace Elastic.ApiExplorer;
 
@@ -10,4 +11,5 @@ public abstract class ApiViewModel
 {
 	public required string NavigationHtml { get; init; }
 	public required StaticFileContentHashProvider StaticFileContentHashProvider { get; init; }
+	public required INavigationItem CurrentNavigationItem { get; init; }
 }
diff --git a/src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs b/src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs
index f65f8ba7b..356e7651c 100644
--- a/src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs
+++ b/src/Elastic.ApiExplorer/Endpoints/ApiEndpoint.cs
@@ -4,32 +4,24 @@
 
 using System.IO.Abstractions;
 using Elastic.ApiExplorer.Landing;
+using Elastic.ApiExplorer.Operations;
 using Elastic.Documentation.Site.Navigation;
 using Microsoft.OpenApi.Models.Interfaces;
 using RazorSlices;
 
 namespace Elastic.ApiExplorer.Endpoints;
 
-public record ApiEndpoint : IPageInformation, IPageRenderer<ApiRenderContext>
+public record ApiEndpoint : INavigationModel, IPageRenderer<ApiRenderContext>
 {
-	public ApiEndpoint(string url, string route, IOpenApiPathItem pathValue, IGroupNavigationItem navigationRoot)
+	public ApiEndpoint(string route, IOpenApiPathItem openApiPath)
 	{
 		Route = route;
-		PathValue = pathValue;
-		NavigationRoot = navigationRoot;
+		OpenApiPath = openApiPath;
 
-		//TODO
-		NavigationTitle = pathValue.Summary;
-		CrossLink = pathValue.Summary;
-		Url = url;
 	}
 
-	public string NavigationTitle { get; }
-	public string CrossLink { get; }
-	public string Url { get; }
 	public string Route { get; }
-	public IOpenApiPathItem PathValue { get; }
-	public IGroupNavigationItem NavigationRoot { get; }
+	public IOpenApiPathItem OpenApiPath { get; }
 
 	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)
 	{
@@ -37,34 +29,39 @@ public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context,
 		{
 			ApiEndpoint = this,
 			StaticFileContentHashProvider = context.StaticFileContentHashProvider,
-			NavigationHtml = context.NavigationHtml
+			NavigationHtml = context.NavigationHtml,
+			CurrentNavigationItem = context.CurrentNavigation
+
 		};
 		var slice = EndpointView.Create(viewModel);
 		await slice.RenderAsync(stream, cancellationToken: ctx);
 	}
 }
 
-public class EndpointNavigationItem : IGroupNavigationItem
+public class EndpointNavigationItem : INodeNavigationItem<ApiEndpoint, OperationNavigationItem>
 {
-	public EndpointNavigationItem(int depth, ApiEndpoint apiEndpoint, IGroupNavigationItem? parent, LandingNavigationItem root)
+	public EndpointNavigationItem(int depth, string url, ApiEndpoint apiEndpoint, LandingNavigationItem parent, LandingNavigationItem root)
 	{
 		Parent = parent;
 		Depth = depth;
-		//Current = group.Current;
 		NavigationRoot = root;
 		Id = NavigationRoot.Id;
 
 		Index = apiEndpoint;
-		Current = apiEndpoint;
-		Endpoint = apiEndpoint;
+		Url = url;
+		//TODO
+		NavigationTitle = apiEndpoint.OpenApiPath.Summary;
 	}
 
-	public IGroupNavigationItem NavigationRoot { get; }
 	public string Id { get; }
-	public IGroupNavigationItem? Parent { get; set; }
 	public int Depth { get; }
-	public IPageInformation? Current { get; }
-	public IPageInformation? Index { get; }
-	public ApiEndpoint Endpoint { get; }
-	public IReadOnlyCollection<INavigationItem> NavigationItems { get; set; } = [];
+	public ApiEndpoint Index { get; }
+	public string Url { get; }
+	public string NavigationTitle { get; }
+
+	public IReadOnlyCollection<OperationNavigationItem> NavigationItems { get; set; } = [];
+
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
+
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 }
diff --git a/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml b/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml
index 27bfd0e0a..023545495 100644
--- a/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml
+++ b/src/Elastic.ApiExplorer/Endpoints/EndpointView.cshtml
@@ -9,7 +9,7 @@
 		Description = "",
 		Layout = null,
 		PageTocItems = [],
-		CurrentDocument = Model.ApiEndpoint,
+		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = null,
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
@@ -29,5 +29,5 @@
 	};
 }
 <section id="elastic-docs-v3">
-	<h1>@Model.ApiEndpoint.Url</h1>
+	<h1>@Model.CurrentNavigationItem.Url</h1>
 </section>
diff --git a/src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs b/src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs
index a12b2c3a7..6a1f798a9 100644
--- a/src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs
+++ b/src/Elastic.ApiExplorer/Landing/LandingNavigationItem.cs
@@ -3,21 +3,15 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions;
+using Elastic.ApiExplorer.Endpoints;
 using Elastic.Documentation.Extensions;
 using Elastic.Documentation.Site.Navigation;
 using RazorSlices;
 
 namespace Elastic.ApiExplorer.Landing;
 
-public class ApiLanding(IGroupNavigationItem root, string url) : IPageInformation, IPageRenderer<ApiRenderContext>
+public class ApiLanding : INavigationModel, IPageRenderer<ApiRenderContext>
 {
-	public IGroupNavigationItem NavigationRoot { get; } = root;
-	public string Url { get; } = url;
-
-	//TODO
-	public string NavigationTitle { get; } = "API Documentation";
-	public string CrossLink { get; } = string.Empty;
-
 	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)
 	{
 		var viewModel = new LandingViewModel
@@ -26,34 +20,36 @@ public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context,
 			StaticFileContentHashProvider = context.StaticFileContentHashProvider,
 			NavigationHtml = context.NavigationHtml,
 			ApiInfo = context.Model.Info,
+			CurrentNavigationItem = context.CurrentNavigation
 		};
 		var slice = LandingView.Create(viewModel);
 		await slice.RenderAsync(stream, cancellationToken: ctx);
 	}
 }
 
-public class LandingNavigationItem : IGroupNavigationItem
+public class LandingNavigationItem : INodeNavigationItem<ApiLanding, EndpointNavigationItem>
 {
-	public IGroupNavigationItem NavigationRoot { get; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 	public string Id { get; }
-	public IGroupNavigationItem? Parent { get; set; }
 	public int Depth { get; }
-	public IPageInformation Current { get; set; }
-	public IPageInformation Index { get; set; }
-	public ApiLanding Landing { get; set; }
-	public IReadOnlyCollection<INavigationItem> NavigationItems { get; set; } = [];
+	public ApiLanding Index { get; }
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
+	public IReadOnlyCollection<EndpointNavigationItem> NavigationItems { get; set; } = [];
+	public string Url { get; }
+
+	//TODO
+	public string NavigationTitle { get; } = "API Documentation";
+
 
 	public LandingNavigationItem(string url)
 	{
-		Parent = null;
 		Depth = 0;
 		NavigationRoot = this;
 		Id = ShortId.Create("root");
 
-		var landing = new ApiLanding(this, url);
+		var landing = new ApiLanding();
+		Url = url;
 
 		Index = landing;
-		Current = landing;
-		Landing = landing;
 	}
 }
diff --git a/src/Elastic.ApiExplorer/Landing/LandingView.cshtml b/src/Elastic.ApiExplorer/Landing/LandingView.cshtml
index 4716512f8..ac0db7b18 100644
--- a/src/Elastic.ApiExplorer/Landing/LandingView.cshtml
+++ b/src/Elastic.ApiExplorer/Landing/LandingView.cshtml
@@ -9,7 +9,7 @@
 		Description = "",
 		Layout = null,
 		PageTocItems = [],
-		CurrentDocument = Model.Landing,
+		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = null,
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
diff --git a/src/Elastic.ApiExplorer/OpenApiGenerator.cs b/src/Elastic.ApiExplorer/OpenApiGenerator.cs
index a93d24e45..595430bee 100644
--- a/src/Elastic.ApiExplorer/OpenApiGenerator.cs
+++ b/src/Elastic.ApiExplorer/OpenApiGenerator.cs
@@ -29,14 +29,14 @@ public static LandingNavigationItem CreateNavigation(OpenApiDocument openApiDocu
 		foreach (var path in openApiDocument.Paths)
 		{
 			var endpointUrl = $"{url}/{path.Key.Trim('/').Replace('/', '-').Replace("{", "").Replace("}", "")}";
-			var apiEndpoint = new ApiEndpoint(endpointUrl, path.Key, path.Value, rootNavigation);
-			var endpointNavigationItem = new EndpointNavigationItem(1, apiEndpoint, rootNavigation, rootNavigation);
+			var apiEndpoint = new ApiEndpoint(path.Key, path.Value);
+			var endpointNavigationItem = new EndpointNavigationItem(1, endpointUrl, apiEndpoint, rootNavigation, rootNavigation);
 			var endpointNavigationItems = new List<OperationNavigationItem>();
 			foreach (var operation in path.Value.Operations)
 			{
 				var operationUrl = $"{endpointUrl}/{operation.Key.ToString().ToLowerInvariant()}";
-				var apiOperation = new ApiOperation(operationUrl, operation.Key, operation.Value, rootNavigation);
-				var navigation = new OperationNavigationItem(2, apiOperation, endpointNavigationItem, rootNavigation);
+				var apiOperation = new ApiOperation(operation.Key, operation.Value);
+				var navigation = new OperationNavigationItem(2, operationUrl, apiOperation, endpointNavigationItem, rootNavigation);
 				endpointNavigationItems.Add(navigation);
 			}
 
@@ -65,21 +65,22 @@ public async Task Generate(Cancel ctx = default)
 
 		var renderContext = new ApiRenderContext(context, openApiDocument, _contentHashProvider)
 		{
-			NavigationHtml = navigationHtml
+			NavigationHtml = navigationHtml,
+			CurrentNavigation = navigation,
 		};
-		_ = await Render(navigation.Landing, renderContext, ctx);
-		foreach (var endpoint in navigation.NavigationItems.OfType<EndpointNavigationItem>())
+		_ = await Render(navigation.Index, renderContext, ctx);
+		foreach (var endpoint in navigation.NavigationItems)
 		{
-			_ = await Render(endpoint.Endpoint, renderContext, ctx);
-			foreach (var operation in endpoint.NavigationItems.OfType<OperationNavigationItem>())
-				_ = await Render(operation.Operation, renderContext, ctx);
+			_ = await Render(endpoint.Index, renderContext, ctx);
+			foreach (var operation in endpoint.NavigationItems)
+				_ = await Render(operation.Model, renderContext, ctx);
 		}
 	}
 
 	private async Task<IFileInfo> Render<T>(T page, ApiRenderContext renderContext, Cancel ctx)
-		where T : IPageInformation, IPageRenderer<ApiRenderContext>
+		where T : INavigationModel, IPageRenderer<ApiRenderContext>
 	{
-		var outputFile = OutputFile(page);
+		var outputFile = OutputFile(renderContext.CurrentNavigation);
 		if (!outputFile.Directory!.Exists)
 			outputFile.Directory.Create();
 
@@ -87,10 +88,10 @@ private async Task<IFileInfo> Render<T>(T page, ApiRenderContext renderContext,
 		await page.RenderAsync(stream, renderContext, ctx);
 		return outputFile;
 
-		IFileInfo OutputFile(IPageInformation pageInformation)
+		IFileInfo OutputFile(INavigationItem currentNavigation)
 		{
 			const string indexHtml = "index.html";
-			var fileName = pageInformation.Url + "/" + indexHtml;
+			var fileName = currentNavigation.Url + "/" + indexHtml;
 			var fileInfo = _writeFileSystem.FileInfo.New(Path.Combine(context.DocumentationOutputDirectory.FullName, fileName.Trim('/')));
 			return fileInfo;
 		}
diff --git a/src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs b/src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs
index 98fe4d220..81c040654 100644
--- a/src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs
+++ b/src/Elastic.ApiExplorer/Operations/OperationNavigationItem.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions;
+using Elastic.ApiExplorer.Endpoints;
 using Elastic.ApiExplorer.Landing;
 using Elastic.Documentation.Site.Navigation;
 using Microsoft.OpenApi.Models;
@@ -10,62 +11,44 @@
 
 namespace Elastic.ApiExplorer.Operations;
 
-public record ApiOperation : IPageInformation, IPageRenderer<ApiRenderContext>
+public record ApiOperation(OperationType OperationType, OpenApiOperation Operation) : INavigationModel, IPageRenderer<ApiRenderContext>
 {
-	public ApiOperation(string url, OperationType operationType, OpenApiOperation operation, IGroupNavigationItem navigationRoot)
-	{
-		OperationType = operationType;
-		Operation = operation;
-		NavigationRoot = navigationRoot;
-
-		//TODO
-		NavigationTitle = $"{operationType.ToString().ToLowerInvariant()} {operation.OperationId}";
-		CrossLink = "";
-		Url = url;
-	}
-
-	public string NavigationTitle { get; }
-	public string CrossLink { get; }
-	public string Url { get; }
-
-	public OperationType OperationType { get; }
-	public OpenApiOperation Operation { get; }
-	public IGroupNavigationItem NavigationRoot { get; }
-
-	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, CancellationToken ctx = default)
+	public async Task RenderAsync(FileSystemStream stream, ApiRenderContext context, Cancel ctx = default)
 	{
 		var viewModel = new OperationViewModel
 		{
 			Operation = this,
 			StaticFileContentHashProvider = context.StaticFileContentHashProvider,
-			NavigationHtml = context.NavigationHtml
+			NavigationHtml = context.NavigationHtml,
+			CurrentNavigationItem = context.CurrentNavigation
 		};
 		var slice = OperationView.Create(viewModel);
 		await slice.RenderAsync(stream, cancellationToken: ctx);
 	}
 }
 
-public class OperationNavigationItem : IGroupNavigationItem
+public class OperationNavigationItem : ILeafNavigationItem<ApiOperation>
 {
-	public OperationNavigationItem(int depth, ApiOperation apiOperation, IGroupNavigationItem? parent, LandingNavigationItem root)
+	public OperationNavigationItem(int depth, string url, ApiOperation apiOperation, EndpointNavigationItem parent, LandingNavigationItem root)
 	{
 		Parent = parent;
 		Depth = depth;
 		//Current = group.Current;
 		NavigationRoot = root;
 		Id = NavigationRoot.Id;
-
-		Index = apiOperation;
-		Current = apiOperation;
-		Operation = apiOperation;
+		Model = apiOperation;
+		Url = url;
+		//TODO
+		NavigationTitle = $"{apiOperation.OperationType.ToString().ToLowerInvariant()} {apiOperation.Operation.OperationId}";
 	}
 
-	public IGroupNavigationItem NavigationRoot { get; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
 	public string Id { get; }
-	public IGroupNavigationItem? Parent { get; set; }
 	public int Depth { get; }
-	public IPageInformation Current { get; }
-	public IPageInformation Index { get; }
-	public IReadOnlyCollection<INavigationItem> NavigationItems { get; set; } = [];
-	public ApiOperation Operation { get; set; }
+	public ApiOperation Model { get; }
+	public string Url { get; }
+
+	public string NavigationTitle { get; }
+
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 }
diff --git a/src/Elastic.ApiExplorer/Operations/OperationView.cshtml b/src/Elastic.ApiExplorer/Operations/OperationView.cshtml
index deff450bb..8404f7fbe 100644
--- a/src/Elastic.ApiExplorer/Operations/OperationView.cshtml
+++ b/src/Elastic.ApiExplorer/Operations/OperationView.cshtml
@@ -9,7 +9,7 @@
 		Description = "",
 		Layout = null,
 		PageTocItems = [],
-		CurrentDocument = Model.Operation,
+		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = null,
 		Next = null,
 		NavigationHtml = Model.NavigationHtml,
diff --git a/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs b/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
index da49bfbf9..285cdca6b 100644
--- a/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
+++ b/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Text.RegularExpressions;
-using Elastic.Documentation.Serialization;
 using YamlDotNet.Serialization;
 using YamlStaticContext = Elastic.Documentation.Configuration.Serialization.YamlStaticContext;
 
diff --git a/src/Elastic.Documentation.LinkIndex/LinkIndexReader.cs b/src/Elastic.Documentation.LinkIndex/LinkIndexReader.cs
index b66b69aba..b3a51192f 100644
--- a/src/Elastic.Documentation.LinkIndex/LinkIndexReader.cs
+++ b/src/Elastic.Documentation.LinkIndex/LinkIndexReader.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Net;
 using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
@@ -15,7 +14,7 @@ public class Aws3LinkIndexReader(IAmazonS3 s3Client, string bucketName = "elasti
 
 	// <summary>
 	// Using <see cref="AnonymousAWSCredentials"/> to access the link index
-	// allows to read from the link index without the need to provide AWS credentials.
+	// allows reading from the link index without the need to provide AWS credentials.
 	// </summary>
 	public static Aws3LinkIndexReader CreateAnonymous()
 	{
diff --git a/src/Elastic.Documentation.LinkIndex/LinkIndexReaderWriter.cs b/src/Elastic.Documentation.LinkIndex/LinkIndexReaderWriter.cs
index aee8d47c6..358bb309d 100644
--- a/src/Elastic.Documentation.LinkIndex/LinkIndexReaderWriter.cs
+++ b/src/Elastic.Documentation.LinkIndex/LinkIndexReaderWriter.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Net;
-using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Elastic.Documentation.Links;
diff --git a/src/Elastic.Documentation.Site/FileProviders/Preloader.cs b/src/Elastic.Documentation.Site/FileProviders/Preloader.cs
index eb6d7f243..1364995a8 100644
--- a/src/Elastic.Documentation.Site/FileProviders/Preloader.cs
+++ b/src/Elastic.Documentation.Site/FileProviders/Preloader.cs
@@ -5,7 +5,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace Elastic.Markdown.Helpers;
+namespace Elastic.Documentation.Site.FileProviders;
 
 public static partial class FontPreloader
 {
diff --git a/src/Elastic.Documentation.Site/Layout/_Head.cshtml b/src/Elastic.Documentation.Site/Layout/_Head.cshtml
index 272833b44..0080c521e 100644
--- a/src/Elastic.Documentation.Site/Layout/_Head.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_Head.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-@using Elastic.Markdown.Helpers
+@using FontPreloader = Elastic.Documentation.Site.FileProviders.FontPreloader
 <head hx-head="merge">
 	<meta charset="utf-8">
 	<title>@Model.Title</title>
diff --git a/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs b/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
index 23a6e28fb..f916e635e 100644
--- a/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
+++ b/src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs
@@ -8,7 +8,7 @@ namespace Elastic.Documentation.Site.Navigation;
 
 public interface INavigationHtmlWriter
 {
-	Task<string> RenderNavigation(IGroupNavigationItem currentRootNavigation, Uri navigationSource, Cancel ctx = default);
+	Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default);
 
 	async Task<string> Render(NavigationViewModel model, Cancel ctx)
 	{
diff --git a/src/Elastic.Documentation.Site/Navigation/INavigationItem.cs b/src/Elastic.Documentation.Site/Navigation/INavigationItem.cs
index 3ea77cd9d..5cf0894bf 100644
--- a/src/Elastic.Documentation.Site/Navigation/INavigationItem.cs
+++ b/src/Elastic.Documentation.Site/Navigation/INavigationItem.cs
@@ -4,33 +4,62 @@
 
 namespace Elastic.Documentation.Site.Navigation;
 
-public interface INavigationScope
+/// Represents navigation model data for documentation elements.
+public interface INavigationModel
 {
-	IGroupNavigationItem NavigationRoot { get; }
+	// This interface serves as a marker interface for navigation models
+	// It's used as a constraint in other navigation-related interfaces
 }
 
-public interface INavigationItem : INavigationScope
+/// Represents an item in the navigation hierarchy.
+public interface INavigationItem
 {
-	string Id { get; }
-	IGroupNavigationItem? Parent { get; set; }
-	int Depth { get; }
-	//TODO not nullable
-	IPageInformation? Current { get; }
+	/// Gets the URL for this navigation item.
+	string Url { get; }
+
+	/// Gets the title displayed in navigation.
+	string NavigationTitle { get; }
+
+	/// Gets the root navigation item.
+	INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; }
+
+	/// <summary>
+	/// Gets or sets the parent navigation item.
+	/// </summary>
+	/// <remarks>
+	/// TODO: This should be read-only however currently needs the setter in assembler.
+	/// </remarks>
+	INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 }
 
-// TODO make generic TINdex and TNavigationItem
-public interface IGroupNavigationItem : INavigationItem
+/// Represents a leaf node in the navigation tree with associated model data.
+/// <typeparam name="TModel">The type attached to the navigation model.</typeparam>
+public interface ILeafNavigationItem<out TModel> : INavigationItem
+	where TModel : INavigationModel
 {
-	IPageInformation? Index { get; }
-	IReadOnlyCollection<INavigationItem> NavigationItems { get; }
+	/// Gets the navigation model associated with this navigation item.
+	TModel Model { get; }
 }
 
-public interface IPageInformation : INavigationScope
+
+/// Represents a node in the navigation tree that can contain child items.
+/// <typeparam name="TIndex">The type of the index model.</typeparam>
+/// <typeparam name="TChildNavigation">The type of child navigation items.</typeparam>
+public interface INodeNavigationItem<out TIndex, out TChildNavigation> : INavigationItem
+	where TIndex : INavigationModel
+	where TChildNavigation : INavigationItem
 {
-	string Url { get; }
-	string NavigationTitle { get; }
+	/// Gets the depth level in the navigation hierarchy.
+	int Depth { get; }
 
-	//TODO investigate if this is needed, only used by breadcrumbs to deduplicate
-	string CrossLink { get; }
-}
+	/// Gets the unique identifier for this node.
+	string Id { get; }
+
+	/// Gets the index model associated with this node.
+	TIndex Index { get; }
 
+	/// <summary>
+	/// Gets the collection of child navigation items.
+	/// </summary>
+	IReadOnlyCollection<TChildNavigation> NavigationItems { get; }
+}
diff --git a/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs b/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
index f3a686773..d43e7c7cc 100644
--- a/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
+++ b/src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs
@@ -7,12 +7,12 @@
 
 namespace Elastic.Documentation.Site.Navigation;
 
-public class IsolatedBuildNavigationHtmlWriter(BuildContext context, IGroupNavigationItem siteRoot)
+public class IsolatedBuildNavigationHtmlWriter(BuildContext context, INodeNavigationItem<INavigationModel, INavigationItem> siteRoot)
 	: INavigationHtmlWriter
 {
 	private readonly ConcurrentDictionary<string, string> _renderedNavigationCache = [];
 
-	public async Task<string> RenderNavigation(IGroupNavigationItem currentRootNavigation, Uri navigationSource, Cancel ctx = default)
+	public async Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)
 	{
 		var navigation = context.Configuration.Features.IsPrimaryNavEnabled
 			? currentRootNavigation
@@ -27,14 +27,14 @@ public async Task<string> RenderNavigation(IGroupNavigationItem currentRootNavig
 		return value;
 	}
 
-	private NavigationViewModel CreateNavigationModel(IGroupNavigationItem navigation) =>
+	private NavigationViewModel CreateNavigationModel(INodeNavigationItem<INavigationModel, INavigationItem> navigation) =>
 		new()
 		{
-			Title = navigation.Index?.NavigationTitle ?? "Docs",
-			TitleUrl = navigation.Index?.Url ?? context.UrlPathPrefix ?? "/",
+			Title = navigation.NavigationTitle,
+			TitleUrl = navigation.Url,
 			Tree = navigation,
 			IsPrimaryNavEnabled = context.Configuration.Features.IsPrimaryNavEnabled,
 			IsGlobalAssemblyBuild = false,
-			TopLevelItems = siteRoot.NavigationItems.OfType<IGroupNavigationItem>().ToList()
+			TopLevelItems = siteRoot.NavigationItems.OfType<INodeNavigationItem<INavigationModel, INavigationItem>>().ToList()
 		};
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
index 64b3d9b3c..8e689111e 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationTreeItem.cs
@@ -8,7 +8,7 @@ public class NavigationTreeItem
 {
 	public required int Level { get; init; }
 	//public required MarkdownFile CurrentDocument { get; init; }
-	public required IGroupNavigationItem SubTree { get; init; }
+	public required INodeNavigationItem<INavigationModel, INavigationItem> SubTree { get; init; }
 	public required bool IsPrimaryNavEnabled { get; init; }
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	public required string RootNavigationId { get; set; }
diff --git a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
index 1c13ce5b7..70800b015 100644
--- a/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
+++ b/src/Elastic.Documentation.Site/Navigation/NavigationViewModel.cs
@@ -8,10 +8,10 @@ public class NavigationViewModel
 {
 	public required string Title { get; init; }
 	public required string TitleUrl { get; init; }
-	public required IGroupNavigationItem Tree { get; init; }
+	public required INodeNavigationItem<INavigationModel, INavigationItem> Tree { get; init; }
 	/// controls whether to split the navigation tree automatically
 	public required bool IsPrimaryNavEnabled { get; init; }
 	public required bool IsGlobalAssemblyBuild { get; init; }
 	//public required IEnumerable<GroupNavigationItem> TopLevelItems { get; init; }
-	public required IEnumerable<IGroupNavigationItem> TopLevelItems { get; init; }
+	public required IEnumerable<INodeNavigationItem<INavigationModel, INavigationItem>> TopLevelItems { get; init; }
 }
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
index 7c16ddf72..d47cf40f6 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTree.cshtml
@@ -12,9 +12,9 @@
 					<div>
 						<a
 							class="pages-dropdown_active hover:underline text-blue-elastic hover:text-blue-elastic-100"
-							href="@current.Index?.Url"
+							href="@current.Url"
 							@Htmx.GetNavHxAttributes(true)>
-							@current.Index?.NavigationTitle
+							@current.NavigationTitle
 						</a>
 					</div>
 					<div class="flex items-center justify-center size-6 hover:bg-grey-20 rounded-sm">
@@ -33,14 +33,13 @@
 					<ul class="mt-1 py-2 bg-white border-1 border-grey-20 rounded-sm shadow-md">
 						@foreach (var item in Model.TopLevelItems)
 						{
-							if (item.Index == null) continue;
 							if (item.Id == current?.Id) continue;
 							<li class="block">
 								<a
-									class="block py-2 px-4 hover:underline hover:text-black hover:bg-grey-10 active:bg-blue-elastic-70 active:text-white font-semibold @(item.Index.NavigationRoot.Id == Model.Tree.Id ? "text-blue-elastic" : "")"
-									href="@item.Index.Url"
+									class="block py-2 px-4 hover:underline hover:text-black hover:bg-grey-10 active:bg-blue-elastic-70 active:text-white font-semibold @(item.NavigationRoot.Id == Model.Tree.Id ? "text-blue-elastic" : "")"
+									href="@item.Url"
 									@Htmx.GetNavHxAttributes(false, "mouseover")>
-									@item.Index.NavigationTitle
+									@item.NavigationTitle
 								</a>
 							</li>
 						}
diff --git a/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml b/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
index 1105e420b..31246dcd5 100644
--- a/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
+++ b/src/Elastic.Documentation.Site/Navigation/_TocTreeNav.cshtml
@@ -5,34 +5,30 @@
 }
 @foreach (var item in Model.SubTree.NavigationItems)
 {
-	var id = item.Id;
-	if (item is IGroupNavigationItem { NavigationItems.Count: 0, Index: not null } group)
+	if (item is INodeNavigationItem<INavigationModel, INavigationItem> { NavigationItems.Count: 0, Index: not null } group)
 	{
-		var f = group.Index;
 		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
 			<a
-				href="@f.Url"
-				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && f.NavigationRoot.Id == Model.RootNavigationId || true)
+				href="@group.Url"
+				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && group.NavigationRoot.Id == Model.RootNavigationId || true)
 				class="sidebar-link group-[.current]/li:text-blue-elastic!"
-				id="page-@id"
 			>
-				@f.NavigationTitle
+				@group.NavigationTitle
 			</a>
 		</li>
 	}
-	else if (item is IGroupNavigationItem folder)
+	else if (item is INodeNavigationItem<INavigationModel, INavigationItem> folder)
 	{
 		var g = folder;
 		<li class="flex flex-wrap group-navigation @(isTopLevel ? "mt-6" : "mt-4")">
 			<div class="peer grid grid-cols-[1fr_auto] w-full">
 				<a
-					href="@(g.Index?.Url ?? "")"
+					href="@(g.Url)"
 					@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && g.NavigationRoot.Id == Model.RootNavigationId || true)
-					id="page-@(g.Index?.NavigationRoot.Id ?? id)"
 					class="sidebar-link pr-2 content-center @(isTopLevel ? "font-semibold" : "")">
-					@(g.Index?.NavigationTitle ?? "Untitled")
+					@(g.NavigationTitle)
 				</a>
-				<label for="@id" class="group/label flex mr-2 items-start">
+				<label for="@folder.Id" class="group/label flex mr-2 items-start">
 					<div class="hover:bg-grey-20 rounded-sm p-1 cursor-pointer">
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
@@ -66,17 +62,15 @@
 			}
 		</li>
 	}
-	else if (item is { Current: { Url: not null } } && Model.SubTree.Index?.Url != item.Current.Url)
+	else if (item is ILeafNavigationItem<INavigationModel> leaf && Model.SubTree.Url != leaf.Url)
 	{
-		var f = item.Current;
 		<li class="flex group/li pr-8 @(isTopLevel ? "font-semibold mt-6" : "mt-4")">
 			<a
-				href="@f.Url"
-				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && f.NavigationRoot.Id == Model.RootNavigationId || true)
+				href="@leaf.Url"
+				@Htmx.GetNavHxAttributes(Model.IsPrimaryNavEnabled && leaf.NavigationRoot.Id == Model.RootNavigationId || true)
 				class="sidebar-link grow group-[.current]/li:text-blue-elastic!"
-				id="page-@id"
 			>
-				@f.NavigationTitle
+				@leaf.NavigationTitle
 			</a>
 		</li>
 	}
diff --git a/src/Elastic.Documentation.Site/_ViewModels.cs b/src/Elastic.Documentation.Site/_ViewModels.cs
index fdae79b0e..bf080e779 100644
--- a/src/Elastic.Documentation.Site/_ViewModels.cs
+++ b/src/Elastic.Documentation.Site/_ViewModels.cs
@@ -18,9 +18,9 @@ public class GlobalLayoutViewModel
 	public required LayoutName? Layout { get; init; }
 
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
-	public required IPageInformation CurrentDocument { get; init; }
-	public required IPageInformation? Previous { get; init; }
-	public required IPageInformation? Next { get; init; }
+	public required INavigationItem? CurrentNavigationItem { get; init; }
+	public required INavigationItem? Previous { get; init; }
+	public required INavigationItem? Next { get; init; }
 	public required string NavigationHtml { get; init; }
 	public required LegacyPageMapping? LegacyPage { get; init; }
 	public required string? UrlPathPrefix { get; init; }
@@ -29,10 +29,11 @@ public class GlobalLayoutViewModel
 	public required bool AllowIndexing { get; init; }
 	public required Uri? CanonicalBaseUrl { get; init; }
 	public required GoogleTagManagerConfiguration GoogleTagManager { get; init; }
-	public string? CanonicalUrl => CanonicalBaseUrl is not null ? new Uri(CanonicalBaseUrl, CurrentDocument.Url).ToString().TrimEnd('/') : null;
+	public string? CanonicalUrl => CanonicalBaseUrl is not null ?
+		new Uri(CanonicalBaseUrl, CurrentNavigationItem?.Url).ToString().TrimEnd('/') : null;
 	public required FeatureFlags Features { get; init; }
 
-	public required IPageInformation[] Parents { get; init; }
+	public required INavigationItem[] Parents { get; init; }
 
 	public required string? Products { get; init; }
 
diff --git a/src/Elastic.Documentation/Links/LinkRegistry.cs b/src/Elastic.Documentation/Links/LinkRegistry.cs
index 55ec7eeda..bec39f3b6 100644
--- a/src/Elastic.Documentation/Links/LinkRegistry.cs
+++ b/src/Elastic.Documentation/Links/LinkRegistry.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Elastic.Documentation.Serialization;
@@ -34,9 +33,7 @@ public LinkRegistry WithLinkRegistryEntry(LinkRegistryEntry entry)
 			}
 			// branch does not exist in the repository entry
 			else
-			{
 				existingRepositoryEntry[branch] = entry;
-			}
 		}
 		// onboarding new repository
 		else
diff --git a/src/Elastic.Markdown/Diagnostics/ProcessorDiagnosticExtensions.cs b/src/Elastic.Markdown/Diagnostics/ProcessorDiagnosticExtensions.cs
index fefe25d45..180a89b7f 100644
--- a/src/Elastic.Markdown/Diagnostics/ProcessorDiagnosticExtensions.cs
+++ b/src/Elastic.Markdown/Diagnostics/ProcessorDiagnosticExtensions.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.IO.Abstractions;
-using Elastic.Documentation;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Markdown.Myst;
 using Elastic.Markdown.Myst.Directives;
diff --git a/src/Elastic.Markdown/DocumentationGenerator.cs b/src/Elastic.Markdown/DocumentationGenerator.cs
index 7a668a0b7..e6a33e968 100644
--- a/src/Elastic.Markdown/DocumentationGenerator.cs
+++ b/src/Elastic.Markdown/DocumentationGenerator.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions;
-using System.Reflection;
 using System.Text.Json;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Legacy;
diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRulesDocsBuilderExtension.cs b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRulesDocsBuilderExtension.cs
index be9e857a6..ee3257e75 100644
--- a/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRulesDocsBuilderExtension.cs
+++ b/src/Elastic.Markdown/Extensions/DetectionRules/DetectionRulesDocsBuilderExtension.cs
@@ -8,7 +8,6 @@
 using Elastic.Documentation.Configuration.TableOfContents;
 using Elastic.Markdown.Exporters;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.IO.Navigation;
 
 namespace Elastic.Markdown.Extensions.DetectionRules;
 
diff --git a/src/Elastic.Markdown/Extensions/DetectionRules/RuleDocumentationFileExporter.cs b/src/Elastic.Markdown/Extensions/DetectionRules/RuleDocumentationFileExporter.cs
index 66e9a04ca..496970dae 100644
--- a/src/Elastic.Markdown/Extensions/DetectionRules/RuleDocumentationFileExporter.cs
+++ b/src/Elastic.Markdown/Extensions/DetectionRules/RuleDocumentationFileExporter.cs
@@ -5,7 +5,6 @@
 using System.IO.Abstractions;
 using Elastic.Markdown.Exporters;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.Slices;
 
 namespace Elastic.Markdown.Extensions.DetectionRules;
 
diff --git a/src/Elastic.Markdown/Helpers/Interpolation.cs b/src/Elastic.Markdown/Helpers/Interpolation.cs
index 48ffee0f7..b74b0d7a8 100644
--- a/src/Elastic.Markdown/Helpers/Interpolation.cs
+++ b/src/Elastic.Markdown/Helpers/Interpolation.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Myst;
 
 namespace Elastic.Markdown.Helpers;
diff --git a/src/Elastic.Markdown/IO/DocumentationFile.cs b/src/Elastic.Markdown/IO/DocumentationFile.cs
index f1dcbaff1..e867af7d7 100644
--- a/src/Elastic.Markdown/IO/DocumentationFile.cs
+++ b/src/Elastic.Markdown/IO/DocumentationFile.cs
@@ -5,7 +5,6 @@
 using Elastic.Documentation.Site;
 using Elastic.Markdown.Myst;
 using Elastic.Markdown.Myst.FrontMatter;
-using Elastic.Markdown.Slices;
 
 namespace Elastic.Markdown.IO;
 
diff --git a/src/Elastic.Markdown/IO/DocumentationSet.cs b/src/Elastic.Markdown/IO/DocumentationSet.cs
index fe2b70a5c..2d7c5b842 100644
--- a/src/Elastic.Markdown/IO/DocumentationSet.cs
+++ b/src/Elastic.Markdown/IO/DocumentationSet.cs
@@ -33,8 +33,9 @@ public interface IPositionalNavigation
 {
 	FrozenDictionary<string, INavigationItem> MarkdownNavigationLookup { get; }
 
-	MarkdownFile? GetPrevious(MarkdownFile current);
-	MarkdownFile? GetNext(MarkdownFile current);
+	INavigationItem? GetPrevious(MarkdownFile current);
+	INavigationItem? GetNext(MarkdownFile current);
+	INavigationItem? GetCurrent(MarkdownFile file) => MarkdownNavigationLookup.GetValueOrDefault(file.CrossLink);
 
 	INavigationItem[] GetParents(INavigationItem current)
 	{
@@ -50,27 +51,8 @@ INavigationItem[] GetParents(INavigationItem current)
 
 		return [.. parents];
 	}
-	MarkdownFile[] GetParentMarkdownFiles(INavigationItem current)
-	{
-		var parents = new List<MarkdownFile>();
-		var navigationParents = GetParents(current);
-		foreach (var parent in navigationParents)
-		{
-			if (parent is FileNavigationItem f)
-				parents.Add(f.File);
-			if (parent is GroupNavigationItem { DocumentationGroup.MarkdownFileIndex: not null } g)
-				parents.Add(g.DocumentationGroup.MarkdownFileIndex);
-			if (parent is DocumentationGroup { MarkdownFileIndex: not null } dg)
-				parents.Add(dg.MarkdownFileIndex);
-		}
-		return [.. parents];
-	}
-	MarkdownFile[] GetParentMarkdownFiles(MarkdownFile file)
-	{
-		if (MarkdownNavigationLookup.TryGetValue(file.CrossLink, out var navigationItem))
-			return GetParentMarkdownFiles(navigationItem);
-		return [];
-	}
+	INavigationItem[] GetParentsOfMarkdownFile(MarkdownFile file) =>
+		MarkdownNavigationLookup.TryGetValue(file.CrossLink, out var navigationItem) ? GetParents(navigationItem) : [];
 }
 
 public record NavigationLookups : INavigationLookups
@@ -79,7 +61,6 @@ public record NavigationLookups : INavigationLookups
 	public required IReadOnlyCollection<ITocItem> TableOfContents { get; init; }
 	public required IReadOnlyCollection<IDocsBuilderExtension> EnabledExtensions { get; init; }
 	public required FrozenDictionary<string, DocumentationFile[]> FilesGroupedByFolder { get; init; }
-	//public required FrozenDictionary<Uri, TableOfContentsReference> IndexedTableOfContents { get; init; }
 }
 
 public class DocumentationSet : INavigationLookups, IPositionalNavigation
@@ -192,12 +173,13 @@ public DocumentationSet(
 	public static (string, INavigationItem)[] Pairs(INavigationItem item)
 	{
 		if (item is FileNavigationItem f)
-			return [(f.File.CrossLink, item)];
-		if (item is GroupNavigationItem g)
+			return [(f.Model.CrossLink, item)];
+		if (item is DocumentationGroup g)
 		{
-			var index = new List<(string, INavigationItem)>();
-			if (g.DocumentationGroup.Index is not null)
-				index.Add((g.DocumentationGroup.Index.CrossLink, g));
+			var index = new List<(string, INavigationItem)>
+			{
+				(g.Index.CrossLink, g)
+			};
 
 			return index.Concat(g.NavigationItems.SelectMany(Pairs).ToArray())
 				.DistinctBy(kv => kv.Item1)
@@ -300,7 +282,7 @@ void ValidateExists(string from, string to, IReadOnlyDictionary<string, string?>
 		return FlatMappedFiles.GetValueOrDefault(relativePath);
 	}
 
-	public MarkdownFile? GetPrevious(MarkdownFile current)
+	public INavigationItem? GetPrevious(MarkdownFile current)
 	{
 		var index = current.NavigationIndex;
 		do
@@ -309,14 +291,17 @@ void ValidateExists(string from, string to, IReadOnlyDictionary<string, string?>
 			if (previous is null)
 				return null;
 			if (!previous.Hidden)
-				return previous;
+			{
+				if (MarkdownNavigationLookup.TryGetValue(previous.CrossLink, out var navigationItem))
+					return navigationItem;
+			}
 			index--;
 		} while (index > 0);
 
 		return null;
 	}
 
-	public MarkdownFile? GetNext(MarkdownFile current)
+	public INavigationItem? GetNext(MarkdownFile current)
 	{
 		var index = current.NavigationIndex;
 		do
@@ -325,7 +310,10 @@ void ValidateExists(string from, string to, IReadOnlyDictionary<string, string?>
 			if (previous is null)
 				return null;
 			if (!previous.Hidden)
-				return previous;
+			{
+				if (MarkdownNavigationLookup.TryGetValue(previous.CrossLink, out var navigationItem))
+					return navigationItem;
+			}
 			index++;
 		} while (index <= MarkdownFiles.Count - 1);
 
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index d0d2960a6..b9f5cd08b 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -6,7 +6,6 @@
 using System.Runtime.InteropServices;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Extensions;
 using Elastic.Documentation.Navigation;
 using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
@@ -23,7 +22,7 @@
 
 namespace Elastic.Markdown.IO;
 
-public record MarkdownFile : DocumentationFile, INavigationScope, ITableOfContentsScope, IPageInformation
+public record MarkdownFile : DocumentationFile, ITableOfContentsScope, INavigationModel
 {
 	private string? _navigationTitle;
 
@@ -44,7 +43,6 @@ DocumentationSet set
 	{
 		FileName = sourceFile.Name;
 		FilePath = sourceFile.FullName;
-		IsIndex = FileName == "index.md";
 
 		UrlPathPrefix = build.UrlPathPrefix;
 		MarkdownParser = parser;
@@ -52,7 +50,6 @@ DocumentationSet set
 		_configurationFile = build.Configuration.SourceFile;
 		_globalSubstitutions = build.Configuration.Substitutions;
 		_set = set;
-		Id = ShortId.Create(FilePath);
 		//may be updated by DocumentationGroup.ProcessTocItems
 		//todo refactor mutability of MarkdownFile as a whole
 		ScopeDirectory = build.Configuration.ScopeDirectory;
@@ -63,12 +60,10 @@ DocumentationSet set
 
 	public IDirectoryInfo ScopeDirectory { get; set; }
 
-	public IGroupNavigationItem NavigationRoot { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; set; }
 
 	public Uri NavigationSource { get; set; }
 
-	public string Id { get; }
-
 	private IDiagnosticsCollector Collector { get; }
 
 	public bool Hidden { get; internal set; }
@@ -77,8 +72,6 @@ DocumentationSet set
 	public YamlFrontMatter? YamlFrontMatter { get; private set; }
 	public string? TitleRaw { get; protected set; }
 
-	public bool IsIndex { get; internal set; }
-
 	public string? Title
 	{
 		get => _title;
diff --git a/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs b/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
index b387f9db7..bd239ce1b 100644
--- a/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
+++ b/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
@@ -12,36 +12,13 @@
 
 namespace Elastic.Markdown.IO.Navigation;
 
-//TODO see if we can remove these proxy classes `TocNavigationItem` and `GroupNavigationItem`
-//They wrap `DocumentationGroup` which is now by itself a `IGroupNavigationItem`
-
-[DebuggerDisplay("Toc >{Depth} {DocumentationGroup.FolderName}")]
-public record TocNavigationItem(int Depth, DocumentationGroup DocumentationGroup, Uri Source, IGroupNavigationItem? Parent)
-	: GroupNavigationItem(Depth, DocumentationGroup, Parent)
+[DebuggerDisplay("Current: {Model.RelativePath}")]
+public record FileNavigationItem(MarkdownFile Model, DocumentationGroup Group) : ILeafNavigationItem<MarkdownFile>
 {
-	/// Only used for tests
-	public IReadOnlyDictionary<Uri, TocNavigationItem> NavigationLookup =>
-		DocumentationGroup.NavigationItems.OfType<TocNavigationItem>().ToDictionary(i => i.Source, i => i);
-}
-
-[DebuggerDisplay("Group >{Depth} {DocumentationGroup.FolderName}")]
-public record GroupNavigationItem(int Depth, DocumentationGroup DocumentationGroup, IGroupNavigationItem? Parent) : IGroupNavigationItem
-{
-	public string Id { get; } = DocumentationGroup.Id;
-	public IGroupNavigationItem? Parent { get; set; } = Parent;
-	public IPageInformation? Index { get; } = DocumentationGroup.Index;
-	public IPageInformation? Current => DocumentationGroup.Index;
-	public IReadOnlyCollection<INavigationItem> NavigationItems => DocumentationGroup.NavigationItems;
-	public IGroupNavigationItem NavigationRoot { get; } = Parent?.NavigationRoot ?? DocumentationGroup;
-}
-
-[DebuggerDisplay("File >{Depth} {File.RelativePath}")]
-public record FileNavigationItem(int Depth, MarkdownFile File, IGroupNavigationItem? Parent) : INavigationItem
-{
-	public string Id { get; } = File.Id;
-	public IGroupNavigationItem? Parent { get; set; } = Parent;
-	public IPageInformation Current => File;
-	public IGroupNavigationItem NavigationRoot { get; } = Parent?.NavigationRoot ?? File.NavigationRoot;
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; } = Group;
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; } = Group.NavigationRoot;
+	public string Url => Model.Url;
+	public string NavigationTitle => Model.NavigationTitle;
 }
 
 public class TableOfContentsTreeCollector
@@ -86,7 +63,7 @@ public TableOfContentsTree(
 		DocumentationSet = documentationSet;
 
 		//edge case if a tree only holds a single group, ensure we collapse it down to the root (this)
-		if (NavigationItems.Count == 1 && NavigationItems.First() is GroupNavigationItem { NavigationItems.Count: 0 })
+		if (NavigationItems.Count == 1 && NavigationItems.First() is DocumentationGroup { NavigationItems.Count: 0 })
 			NavigationItems = [];
 
 
@@ -101,9 +78,8 @@ internal TableOfContentsTree(
 		ref int fileIndex,
 		int depth,
 		DocumentationGroup? toplevelTree,
-		DocumentationGroup? parent,
-		MarkdownFile? index = null
-	) : base(folderName, treeCollector, context, lookups, source, ref fileIndex, depth, toplevelTree, parent, index)
+		DocumentationGroup? parent
+	) : base(folderName, treeCollector, context, lookups, source, ref fileIndex, depth, toplevelTree, parent)
 	{
 		Source = source;
 		TreeCollector = treeCollector;
@@ -116,21 +92,21 @@ internal TableOfContentsTree(
 }
 
 [DebuggerDisplay("Group >{Depth} {FolderName} ({NavigationItems.Count} items)")]
-public class DocumentationGroup : IGroupNavigationItem
+public class DocumentationGroup : INodeNavigationItem<MarkdownFile, INavigationItem>
 {
 	private readonly TableOfContentsTreeCollector _treeCollector;
 
 	public string Id { get; }
 
-	public IGroupNavigationItem NavigationRoot { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; protected init; }
 
 	public Uri NavigationSource { get; set; }
 
-	public MarkdownFile? MarkdownFileIndex { get; set; }
+	public MarkdownFile Index { get; }
 
-	public IPageInformation? Index => MarkdownFileIndex;
+	public string Url => Index.Url;
 
-	public IPageInformation? Current => Index;
+	public string NavigationTitle => Index.NavigationTitle;
 
 	private IReadOnlyCollection<MarkdownFile> FilesInOrder { get; }
 
@@ -138,11 +114,9 @@ public class DocumentationGroup : IGroupNavigationItem
 
 	public IReadOnlyCollection<INavigationItem> NavigationItems { get; set; }
 
-	public IGroupNavigationItem GroupNavigationItem { get; }
-
-	public int Depth { get; set; }
+	public int Depth { get; }
 
-	public IGroupNavigationItem? Parent { get; set; }
+	public INodeNavigationItem<INavigationModel, INavigationItem>? Parent { get; set; }
 
 	public string FolderName { get; }
 
@@ -155,14 +129,13 @@ protected DocumentationGroup(
 		Uri navigationSource,
 		ref int fileIndex
 	)
-		: this(".", treeCollector, context, lookups, navigationSource, ref fileIndex, depth: 0, null, null)
+		: this(".", treeCollector, context, lookups, navigationSource, ref fileIndex, depth: 0, toplevelTree: null, parent: null)
 	{
 		NavigationSource = navigationSource;
 		_treeCollector = treeCollector;
 	}
 
-	protected DocumentationGroup(
-		string folderName,
+	protected DocumentationGroup(string folderName,
 		TableOfContentsTreeCollector treeCollector,
 		BuildContext context,
 		NavigationLookups lookups,
@@ -170,8 +143,8 @@ protected DocumentationGroup(
 		ref int fileIndex,
 		int depth,
 		DocumentationGroup? toplevelTree,
-		IGroupNavigationItem? parent,
-		MarkdownFile? index = null
+		DocumentationGroup? parent,
+		MarkdownFile? virtualIndexFile = null
 	)
 	{
 		Parent = parent;
@@ -188,24 +161,21 @@ protected DocumentationGroup(
 		// ReSharper enable VirtualMemberCallInConstructor
 		NavigationRoot = toplevelTree;
 		// ReSharper restore VirtualMemberCallInConstructor
-		MarkdownFileIndex = ProcessTocItems(context, toplevelTree, index, lookups, depth, ref fileIndex, out var groups, out var files, out var navigationItems);
+		Index = ProcessTocItems(context, toplevelTree, lookups, depth, virtualIndexFile, ref fileIndex, out var groups, out var files, out var navigationItems);
 
 		GroupsInOrder = groups;
 		FilesInOrder = files;
 		NavigationItems = navigationItems;
 		Id = ShortId.Create(NavigationSource.ToString(), FolderName);
-		if (MarkdownFileIndex is not null)
-			FilesInOrder = [.. FilesInOrder.Except([MarkdownFileIndex])];
 
-		GroupNavigationItem = new GroupNavigationItem(Depth, this, null);
+		FilesInOrder = [.. FilesInOrder.Except([Index])];
 	}
 
-	private MarkdownFile? ProcessTocItems(
-		BuildContext context,
+	private MarkdownFile ProcessTocItems(BuildContext context,
 		DocumentationGroup topLevelGroup,
-		MarkdownFile? configuredIndex,
 		NavigationLookups lookups,
 		int depth,
+		MarkdownFile? virtualIndexFile,
 		ref int fileIndex,
 		out List<DocumentationGroup> groups,
 		out List<MarkdownFile> files,
@@ -214,8 +184,8 @@ protected DocumentationGroup(
 		groups = [];
 		navigationItems = [];
 		files = [];
-		var indexFile = configuredIndex;
-		foreach (var (tocItem, index) in lookups.TableOfContents.Select((t, i) => (t, i)))
+		var indexFile = virtualIndexFile;
+		foreach (var tocItem in lookups.TableOfContents)
 		{
 			if (tocItem is FileReference file)
 			{
@@ -233,8 +203,11 @@ protected DocumentationGroup(
 				}
 
 				if (d is not MarkdownFile md)
+				{
+					if (d is not SnippetFile)
+						context.EmitError(context.ConfigurationPath, $"{d.RelativePath} is not a Markdown file.");
 					continue;
-
+				}
 
 				md.Hidden = file.Hidden;
 				var navigationIndex = Interlocked.Increment(ref fileIndex);
@@ -246,18 +219,18 @@ protected DocumentationGroup(
 				foreach (var extension in lookups.EnabledExtensions)
 					extension.Visit(d, tocItem);
 
-				if (file.Children.Count > 0 && d is MarkdownFile virtualIndex)
+				if (file.Children.Count > 0)
 				{
 					if (file.Hidden)
 						context.EmitError(context.ConfigurationPath, $"The following file is hidden but has children: {file.RelativePath}");
-					var group = new DocumentationGroup(virtualIndex.RelativePath,
+					var group = new DocumentationGroup(md.RelativePath,
 						_treeCollector, context, lookups with
 						{
 							TableOfContents = file.Children,
-						}, NavigationSource, ref fileIndex, depth + 1, topLevelGroup, this, virtualIndex);
+						}, NavigationSource, ref fileIndex, depth + 1, topLevelGroup, this, md);
 					groups.Add(group);
-					navigationItems.Add(new GroupNavigationItem(depth, group, this));
-					indexFile ??= virtualIndex;
+					navigationItems.Add(group);
+					indexFile ??= md;
 					continue;
 				}
 
@@ -265,12 +238,12 @@ protected DocumentationGroup(
 				if (file.RelativePath.EndsWith("index.md") && d is MarkdownFile i)
 					indexFile ??= i;
 
-				// add the page to navigation items unless it's the index file
+				// Add the page to navigation items unless it's the index file
 				// the index file can either be the discovered `index.md` or the parent group's
-				// explicit index page. E.g. when grouping related files together.
-				// if the page is referenced as hidden in the TOC do not include it in the navigation
+				// explicit index page. E.g., when grouping related files together.
+				// If the page is referenced as hidden in the TOC do not include it in the navigation
 				if (indexFile != md && !md.Hidden)
-					navigationItems.Add(new FileNavigationItem(depth, md, this));
+					navigationItems.Add(new FileNavigationItem(md, this));
 			}
 			else if (tocItem is FolderReference folder)
 			{
@@ -293,7 +266,7 @@ .. documentationFiles
 					}, ref fileIndex, depth + 1, topLevelGroup, this);
 
 					group = toc;
-					navigationItems.Add(new TocNavigationItem(depth, toc, tocReference.Source, this));
+					navigationItems.Add(toc);
 				}
 				else
 				{
@@ -301,17 +274,15 @@ .. documentationFiles
 					{
 						TableOfContents = children
 					}, NavigationSource, ref fileIndex, depth + 1, topLevelGroup, this);
-					navigationItems.Add(new GroupNavigationItem(depth, group, this));
+					navigationItems.Add(group);
 				}
 
 				groups.Add(group);
 			}
 		}
 
-		if (indexFile is not null)
-			indexFile.IsIndex = true;
-
-		return indexFile ?? files.FirstOrDefault();
+		var index = indexFile ?? files.FirstOrDefault() ?? groups.FirstOrDefault()?.Index;
+		return index ?? throw new InvalidOperationException($"No index file found. {depth}, {fileIndex}");
 	}
 
 	private bool _resolved;
@@ -324,7 +295,7 @@ public async Task Resolve(Cancel ctx = default)
 		await Parallel.ForEachAsync(FilesInOrder, ctx, async (file, token) => await file.MinimalParseAsync(token));
 		await Parallel.ForEachAsync(GroupsInOrder, ctx, async (group, token) => await group.Resolve(token));
 
-		await (MarkdownFileIndex?.MinimalParseAsync(ctx) ?? Task.CompletedTask);
+		_ = await Index.MinimalParseAsync(ctx);
 
 		_resolved = true;
 	}
diff --git a/src/Elastic.Markdown/Links/CrossLinks/ConfigurationCrossLinkFetcher.cs b/src/Elastic.Markdown/Links/CrossLinks/ConfigurationCrossLinkFetcher.cs
index 4b9f56971..20b3e9973 100644
--- a/src/Elastic.Markdown/Links/CrossLinks/ConfigurationCrossLinkFetcher.cs
+++ b/src/Elastic.Markdown/Links/CrossLinks/ConfigurationCrossLinkFetcher.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Collections.Frozen;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration.Builder;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
diff --git a/src/Elastic.Markdown/Links/CrossLinks/CrossLinkFetcher.cs b/src/Elastic.Markdown/Links/CrossLinks/CrossLinkFetcher.cs
index c6d850113..4923ab188 100644
--- a/src/Elastic.Markdown/Links/CrossLinks/CrossLinkFetcher.cs
+++ b/src/Elastic.Markdown/Links/CrossLinks/CrossLinkFetcher.cs
@@ -4,13 +4,10 @@
 
 using System.Collections.Frozen;
 using System.Text.Json;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
 using Elastic.Documentation.Serialization;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using Microsoft.Extensions.Logging;
 
 namespace Elastic.Markdown.Links.CrossLinks;
diff --git a/src/Elastic.Markdown/Links/InboundLinks/LinkIndexCrossLinkFetcher.cs b/src/Elastic.Markdown/Links/InboundLinks/LinkIndexCrossLinkFetcher.cs
index cb04c235b..3812b9192 100644
--- a/src/Elastic.Markdown/Links/InboundLinks/LinkIndexCrossLinkFetcher.cs
+++ b/src/Elastic.Markdown/Links/InboundLinks/LinkIndexCrossLinkFetcher.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Collections.Frozen;
-using Elastic.Documentation;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
 using Elastic.Markdown.Links.CrossLinks;
diff --git a/src/Elastic.Markdown/Links/InboundLinks/LinkIndexLinkChecker.cs b/src/Elastic.Markdown/Links/InboundLinks/LinkIndexLinkChecker.cs
index 59fc8eef4..b4d47f1a3 100644
--- a/src/Elastic.Markdown/Links/InboundLinks/LinkIndexLinkChecker.cs
+++ b/src/Elastic.Markdown/Links/InboundLinks/LinkIndexLinkChecker.cs
@@ -6,8 +6,6 @@
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using Elastic.Markdown.Links.CrossLinks;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlock.cs b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlock.cs
index 4911de4d2..8443cdd4c 100644
--- a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlock.cs
+++ b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlock.cs
@@ -5,7 +5,6 @@
 using System.IO.Abstractions;
 using Elastic.Documentation.Configuration;
 using Elastic.Markdown.Myst.Directives;
-using Elastic.Markdown.Myst.FrontMatter;
 using Markdig.Parsers;
 using Markdig.Syntax;
 
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs
index bf3f3875c..f79bd5f07 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs
@@ -24,7 +24,7 @@ public static MarkdownPipelineBuilder UseDirectives(this MarkdownPipelineBuilder
 /// Extension to allow custom containers.
 /// </summary>
 /// <seealso cref="IMarkdownExtension" />
-public class DirectiveMarkdownExtension() : IMarkdownExtension
+public class DirectiveMarkdownExtension : IMarkdownExtension
 {
 	public void Setup(MarkdownPipelineBuilder pipeline)
 	{
diff --git a/src/Elastic.Markdown/Myst/Directives/VersionBlock.cs b/src/Elastic.Markdown/Myst/Directives/VersionBlock.cs
index ccb2d0aa3..8ad491cc3 100644
--- a/src/Elastic.Markdown/Myst/Directives/VersionBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/VersionBlock.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Documentation;
 using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.Helpers;
 using static System.StringSplitOptions;
 
 namespace Elastic.Markdown.Myst.Directives;
diff --git a/src/Elastic.Markdown/Myst/FrontMatter/AllVersions.cs b/src/Elastic.Markdown/Myst/FrontMatter/AllVersions.cs
index d12deeb6a..025a0c6fc 100644
--- a/src/Elastic.Markdown/Myst/FrontMatter/AllVersions.cs
+++ b/src/Elastic.Markdown/Myst/FrontMatter/AllVersions.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation;
-using Elastic.Markdown.Helpers;
 using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
diff --git a/src/Elastic.Markdown/Myst/FrontMatter/Applicability.cs b/src/Elastic.Markdown/Myst/FrontMatter/Applicability.cs
index 1bea59ded..8bd08a837 100644
--- a/src/Elastic.Markdown/Myst/FrontMatter/Applicability.cs
+++ b/src/Elastic.Markdown/Myst/FrontMatter/Applicability.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Elastic.Documentation;
-using Elastic.Markdown.Helpers;
 using YamlDotNet.Serialization;
 
 namespace Elastic.Markdown.Myst.FrontMatter;
diff --git a/src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs b/src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs
index ae3f7c064..e76bfb477 100644
--- a/src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs
+++ b/src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs
@@ -97,7 +97,7 @@ private static void ParseStylingInstructions(LinkInline link, ParserContext cont
 
 			title = title[..matches.Index];
 		}
-		link.Title = title?.ReplaceSubstitutions(context);
+		link.Title = title.ReplaceSubstitutions(context);
 	}
 
 	private static bool IsInCommentBlock(LinkInline link) =>
diff --git a/src/Elastic.Markdown/Myst/MarkdownParser.cs b/src/Elastic.Markdown/Myst/MarkdownParser.cs
index 1651febc6..7e5c1c8e0 100644
--- a/src/Elastic.Markdown/Myst/MarkdownParser.cs
+++ b/src/Elastic.Markdown/Myst/MarkdownParser.cs
@@ -3,11 +3,8 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions;
-using System.Text.RegularExpressions;
-
 using Cysharp.IO;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Diagnostics;
 using Elastic.Markdown.Myst.CodeBlocks;
 using Elastic.Markdown.Myst.Comments;
 using Elastic.Markdown.Myst.Directives;
@@ -16,7 +13,6 @@
 using Elastic.Markdown.Myst.InlineParsers.Substitution;
 using Elastic.Markdown.Myst.Linters;
 using Elastic.Markdown.Myst.Renderers;
-using Elastic.Markdown.Myst.Roles;
 using Elastic.Markdown.Myst.Roles.AppliesTo;
 
 using Markdig;
diff --git a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
index 22398075d..0d9360abe 100644
--- a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
@@ -4,9 +4,7 @@
 
 using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
-using Elastic.Markdown.Helpers;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.IO.Navigation;
 using Markdig;
 using Markdig.Renderers;
 using Markdig.Renderers.Html.Inlines;
@@ -39,8 +37,8 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 
 			if (link.Url?.StartsWith('/') == true)
 			{
-				var currentRootNavigation = link.GetData(nameof(MarkdownFile.NavigationRoot)) as IGroupNavigationItem;
-				var targetRootNavigation = link.GetData($"Target{nameof(MarkdownFile.NavigationRoot)}") as IGroupNavigationItem;
+				var currentRootNavigation = link.GetData(nameof(MarkdownFile.NavigationRoot)) as INodeNavigationItem<INavigationModel, INavigationItem>;
+				var targetRootNavigation = link.GetData($"Target{nameof(MarkdownFile.NavigationRoot)}") as INodeNavigationItem<INavigationModel, INavigationItem>;
 				var hasSameTopLevelGroup = !isCrossLink && (currentRootNavigation?.Id == targetRootNavigation?.Id);
 				_ = renderer.Write(" hx-get=\"");
 				_ = renderer.WriteEscapeUrl(url);
diff --git a/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs b/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs
index e1da4b3a0..e6947b5e2 100644
--- a/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs
+++ b/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using Elastic.Documentation;
 using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.Helpers;
 using Elastic.Markdown.Myst.FrontMatter;
 using Markdig;
 using Markdig.Parsers;
diff --git a/src/Elastic.Markdown/Slices/Directives/Image.cshtml b/src/Elastic.Markdown/Slices/Directives/Image.cshtml
index 42f80b987..f0e3ac4b4 100644
--- a/src/Elastic.Markdown/Slices/Directives/Image.cshtml
+++ b/src/Elastic.Markdown/Slices/Directives/Image.cshtml
@@ -1,4 +1,3 @@
-@using Microsoft.AspNetCore.Mvc.ModelBinding.Validation
 @inherits RazorSlice<ImageViewModel>
 <a class="reference internal image-reference" href="javascript:void(0)" onclick="document.getElementById('modal-@Model.UniqueImageId').style.display='flex'">
 	<img loading="lazy" title="@Model.Title" alt="@(Model.Alt == string.Empty ? HtmlString.Empty : new HtmlString(Model.Alt))" src="@Model.ImageUrl" style="@Model.Style" class="@Model.Screenshot" />
diff --git a/src/Elastic.Markdown/Slices/HtmlWriter.cs b/src/Elastic.Markdown/Slices/HtmlWriter.cs
index c482e440b..f123958ac 100644
--- a/src/Elastic.Markdown/Slices/HtmlWriter.cs
+++ b/src/Elastic.Markdown/Slices/HtmlWriter.cs
@@ -6,12 +6,10 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration.Builder;
 using Elastic.Documentation.Legacy;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.FileProviders;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.Extensions.DetectionRules;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.IO.Navigation;
 using Markdig.Syntax;
 using RazorSlices;
 using IFileInfo = System.IO.Abstractions.IFileInfo;
@@ -49,9 +47,10 @@ private async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument
 
 		var navigationHtml = await NavigationHtmlWriter.RenderNavigation(markdown.NavigationRoot, markdown.NavigationSource, ctx);
 
+		var current = PositionalNavigation.GetCurrent(markdown);
 		var previous = PositionalNavigation.GetPrevious(markdown);
 		var next = PositionalNavigation.GetNext(markdown);
-		var parents = PositionalNavigation.GetParentMarkdownFiles(markdown);
+		var parents = PositionalNavigation.GetParentsOfMarkdownFile(markdown);
 
 		var remote = DocumentationSet.Context.Git.RepositoryName;
 		var branch = DocumentationSet.Context.Git.Branch;
@@ -68,7 +67,7 @@ private async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument
 			reportLinkParameter = new Uri(DocumentationSet.Context.CanonicalBaseUrl, Path.Combine(DocumentationSet.Context.UrlPathPrefix ?? string.Empty, markdown.Url));
 		var reportUrl = $"https://github.com/elastic/docs-content/issues/new?template=issue-report.yaml&link={reportLinkParameter}&labels=source:web";
 
-		var siteName = DocumentationSet.Tree.MarkdownFileIndex?.Title ?? "Elastic Documentation";
+		var siteName = DocumentationSet.Tree.Index.Title ?? "Elastic Documentation";
 
 		var legacyPage = LegacyUrlMapper.MapLegacyUrl(markdown.YamlFrontMatter?.MappedPages);
 
@@ -97,6 +96,7 @@ private async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument
 			PageTocItems = [.. markdown.PageTableOfContent.Values],
 			Tree = DocumentationSet.Tree,
 			CurrentDocument = markdown,
+			CurrentNavigationItem = current,
 			PreviousDocument = previous,
 			NextDocument = next,
 			Parents = parents,
diff --git a/src/Elastic.Markdown/Slices/Index.cshtml b/src/Elastic.Markdown/Slices/Index.cshtml
index c99d16892..258b35b39 100644
--- a/src/Elastic.Markdown/Slices/Index.cshtml
+++ b/src/Elastic.Markdown/Slices/Index.cshtml
@@ -1,5 +1,3 @@
-@using Elastic.Documentation.Site
-@using Elastic.Documentation.Site.Navigation
 @using Elastic.Markdown.Slices.Components
 @using Markdig
 @inherits RazorSliceHttpResult<IndexViewModel>
@@ -12,10 +10,10 @@
 		Title = $"{Model.Title} | {Model.SiteName}",
 		Description = Model.Description,
 		PageTocItems = Model.PageTocItems.Where(i => i is { Level: 2 or 3 }).ToList(),
-		CurrentDocument = Model.CurrentDocument,
+		CurrentNavigationItem = Model.CurrentNavigationItem,
 		Previous = Model.PreviousDocument,
 		Next = Model.NextDocument,
-		Parents = Model.Parents.Cast<IPageInformation>().ToArray(),
+		Parents = Model.Parents,
 		NavigationHtml = Model.NavigationHtml,
 		UrlPathPrefix = Model.UrlPathPrefix,
 		GithubEditUrl = Model.GithubEditUrl,
diff --git a/src/Elastic.Markdown/Slices/IndexViewModel.cs b/src/Elastic.Markdown/Slices/IndexViewModel.cs
index f27ba9090..6334d5684 100644
--- a/src/Elastic.Markdown/Slices/IndexViewModel.cs
+++ b/src/Elastic.Markdown/Slices/IndexViewModel.cs
@@ -7,6 +7,7 @@
 using Elastic.Documentation.Legacy;
 using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.FileProviders;
+using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Navigation;
 using Elastic.Markdown.Myst.FrontMatter;
@@ -24,9 +25,11 @@ public class IndexViewModel
 	public required DocumentationGroup Tree { get; init; }
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
 	public required MarkdownFile CurrentDocument { get; init; }
-	public required MarkdownFile? PreviousDocument { get; init; }
-	public required MarkdownFile? NextDocument { get; init; }
-	public required MarkdownFile[] Parents { get; init; }
+
+	public required INavigationItem? CurrentNavigationItem { get; init; }
+	public required INavigationItem? PreviousDocument { get; init; }
+	public required INavigationItem? NextDocument { get; init; }
+	public required INavigationItem[] Parents { get; init; }
 
 	public required string NavigationHtml { get; init; }
 	public required LegacyPageMapping? LegacyPage { get; init; }
diff --git a/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml b/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml
index a2f22f0cc..e282ec055 100644
--- a/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml
@@ -1,4 +1,3 @@
-@using Elastic.Markdown.Helpers
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 @{
 	var targets =
@@ -6,7 +5,8 @@
 			? Model.Parents.Reverse()
 			: Model.Parents.Reverse().Skip(1);
 
-	var parents = targets.DistinctBy(p => p.CrossLink).ToList();
+	//TODO should we even distinctby
+	var parents = targets.DistinctBy(p => p.Url).ToList();
 	var firstCrumb = parents.FirstOrDefault();
 	var crumbs = parents.Skip(1).TakeLast(2).ToList();
 }
@@ -30,7 +30,7 @@
 			<a
 				itemprop="item"
 				href="@firstCrumb.Url"
-				@Htmx.GetHxAttributes(firstCrumb.Url, Model.CurrentDocument.NavigationRoot.Id == firstCrumb.NavigationRoot.Id)
+				@Htmx.GetHxAttributes(firstCrumb.Url, Model.CurrentNavigationItem?.NavigationRoot.Id == firstCrumb.NavigationRoot.Id)
 			>
 				<span itemprop="name" class="hover:text-black">@firstCrumb.NavigationTitle</span>
 			</a>
@@ -53,7 +53,7 @@
 			<a
 				itemprop="item" 
 				href="@item.Url"
-				@Htmx.GetHxAttributes(item.Url, Model.CurrentDocument.NavigationRoot.Id == item.NavigationRoot.Id)
+				@Htmx.GetHxAttributes(item.Url, Model.CurrentNavigationItem?.NavigationRoot.Id == item.NavigationRoot.Id)
 			>
 				<span itemprop="name" class="hover:text-black">@item.NavigationTitle</span>
 			</a>
diff --git a/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml
index 57ac2b1d4..903e363ad 100644
--- a/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml
@@ -1,4 +1,3 @@
-@using Elastic.Markdown.Helpers
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <footer id="prev-next-nav" class="content-container mt-20 px-4">
 	<div class="flex flex-wrap lg:flex-nowrap gap-2 mt-2">
@@ -7,7 +6,7 @@
 			{
 				<a 
 					href="@Model.Previous.Url"
-					@Htmx.GetHxAttributes(Model.Previous.Url, Model.CurrentDocument.NavigationRoot.Id == Model.Previous.NavigationRoot.Id)
+					@Htmx.GetHxAttributes(Model.Previous.Url, Model.CurrentNavigationItem?.NavigationRoot.Id == Model.Previous.NavigationRoot.Id)
 					class="flex h-full items-center text-ink-light hover:black border-1 border-grey-20 hover:border-grey-80 rounded-lg p-6 shadow-md"
 				>
 					<svg class="size-6 mr-2" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
@@ -25,7 +24,7 @@
 			{
 				<a 
 					href="@Model.Next.Url"
-					@Htmx.GetHxAttributes(Model.Next.Url, Model.CurrentDocument.NavigationRoot.Id == Model.Next.NavigationRoot.Id)
+					@Htmx.GetHxAttributes(Model.Next.Url, Model.CurrentNavigationItem?.NavigationRoot.Id == Model.Next.NavigationRoot.Id)
 					class="flex h-full items-center justify-end text-ink-light hover:black border-1 border-grey-20 hover:border-grey-80 rounded-lg p-6 shadow-md text-right"
 				>
 					<div>
diff --git a/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
index 45390dc34..9a5840816 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
@@ -1,4 +1,3 @@
-@using Elastic.Markdown.Helpers;
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <aside class="sidebar hidden lg:block max-w-65 md:hidden">
 	<nav id="toc-nav" class="sidebar-nav">
diff --git a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
index dedf1f4e5..a922a4c9d 100644
--- a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
@@ -4,7 +4,6 @@
 
 using Actions.Core.Services;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Microsoft.Extensions.Logging;
 using Spectre.Console;
 using Diagnostic = Elastic.Documentation.Diagnostics.Diagnostic;
diff --git a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs
index 7628b8da4..909bc6b03 100644
--- a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using Cysharp.IO;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Errata;
 using Spectre.Console;
 using Diagnostic = Elastic.Documentation.Diagnostics.Diagnostic;
diff --git a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs
index a1ba21fe4..908dc9194 100644
--- a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs
@@ -5,7 +5,6 @@
 using Actions.Core;
 using Actions.Core.Services;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 
 namespace Elastic.Documentation.Tooling.Diagnostics.Console;
 
diff --git a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Log.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Log.cs
index 60f0bb0ac..7c1600e88 100644
--- a/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Log.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Log.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Microsoft.Extensions.Logging;
 
 namespace Elastic.Documentation.Tooling.Diagnostics;
diff --git a/src/tooling/docs-assembler/AssembleContext.cs b/src/tooling/docs-assembler/AssembleContext.cs
index 55db24d78..4fd695ef0 100644
--- a/src/tooling/docs-assembler/AssembleContext.cs
+++ b/src/tooling/docs-assembler/AssembleContext.cs
@@ -7,8 +7,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 
 namespace Documentation.Assembler;
 
diff --git a/src/tooling/docs-assembler/AssembleSources.cs b/src/tooling/docs-assembler/AssembleSources.cs
index 1843a7b74..3f53d0a0b 100644
--- a/src/tooling/docs-assembler/AssembleSources.cs
+++ b/src/tooling/docs-assembler/AssembleSources.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Frozen;
 using System.IO.Abstractions;
-using Amazon.S3;
 using Documentation.Assembler.Building;
 using Documentation.Assembler.Navigation;
 using Documentation.Assembler.Sourcing;
diff --git a/src/tooling/docs-assembler/Building/SitemapBuilder.cs b/src/tooling/docs-assembler/Building/SitemapBuilder.cs
index ca05d16d5..41ccf1c75 100644
--- a/src/tooling/docs-assembler/Building/SitemapBuilder.cs
+++ b/src/tooling/docs-assembler/Building/SitemapBuilder.cs
@@ -32,7 +32,7 @@ public void Generate()
 				new XAttribute("xlmns", "http://www.sitemaps.org/schemas/sitemap/0.9"),
 				flattenedNavigationItems
 					.OfType<FileNavigationItem>()
-					.Select(n => n.File.Url)
+					.Select(n => n.Model.Url)
 					.Distinct()
 					.Select(u => new Uri(BaseUri, u))
 					.Select(u => new XElement("url", [
@@ -57,9 +57,6 @@ private static IReadOnlyCollection<INavigationItem> GetNavigationItems(IReadOnly
 				case FileNavigationItem file:
 					result.Add(file);
 					break;
-				case GroupNavigationItem group:
-					result.AddRange(GetNavigationItems(group.NavigationItems));
-					break;
 				case DocumentationGroup group:
 					result.AddRange(GetNavigationItems(group.NavigationItems));
 					break;
diff --git a/src/tooling/docs-assembler/Cli/ContentSourceCommands.cs b/src/tooling/docs-assembler/Cli/ContentSourceCommands.cs
index f7d627684..026bb7c78 100644
--- a/src/tooling/docs-assembler/Cli/ContentSourceCommands.cs
+++ b/src/tooling/docs-assembler/Cli/ContentSourceCommands.cs
@@ -5,13 +5,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using Actions.Core.Services;
-using Amazon.S3;
 using ConsoleAppFramework;
 using Documentation.Assembler.Building;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
-using Elastic.Markdown.Links.CrossLinks;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Assembler.Cli;
diff --git a/src/tooling/docs-assembler/Cli/DeployCommands.cs b/src/tooling/docs-assembler/Cli/DeployCommands.cs
index 849b35189..6a021b17d 100644
--- a/src/tooling/docs-assembler/Cli/DeployCommands.cs
+++ b/src/tooling/docs-assembler/Cli/DeployCommands.cs
@@ -4,7 +4,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
-using System.Text.Json;
 using Actions.Core.Services;
 using Amazon.S3;
 using Amazon.S3.Transfer;
diff --git a/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs b/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs
index 8d0559e50..90314d50c 100644
--- a/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs
+++ b/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs
@@ -8,9 +8,7 @@
 using ConsoleAppFramework;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
-using Elastic.Markdown.IO;
 using Elastic.Markdown.Links.InboundLinks;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/tooling/docs-assembler/Cli/NavigationCommands.cs b/src/tooling/docs-assembler/Cli/NavigationCommands.cs
index c197ea483..a12ee91e6 100644
--- a/src/tooling/docs-assembler/Cli/NavigationCommands.cs
+++ b/src/tooling/docs-assembler/Cli/NavigationCommands.cs
@@ -10,10 +10,8 @@
 using Documentation.Assembler.Navigation;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Documentation.Tooling.Filters;
-using Elastic.Markdown.IO;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Assembler.Cli;
diff --git a/src/tooling/docs-assembler/Cli/RepositoryCommands.cs b/src/tooling/docs-assembler/Cli/RepositoryCommands.cs
index a5d0a4827..735400030 100644
--- a/src/tooling/docs-assembler/Cli/RepositoryCommands.cs
+++ b/src/tooling/docs-assembler/Cli/RepositoryCommands.cs
@@ -2,11 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Concurrent;
-using System.ComponentModel;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.IO.Abstractions;
 using System.Net.Mime;
 using Actions.Core.Services;
@@ -19,13 +15,11 @@
 using Documentation.Assembler.Sourcing;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
-using Elastic.Documentation.Links;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Markdown;
 using Elastic.Markdown.Exporters;
 using Elastic.Markdown.IO;
 using Microsoft.Extensions.Logging;
-using YamlDotNet.Core;
 
 namespace Documentation.Assembler.Cli;
 
diff --git a/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs b/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs
index 2dfd263dd..b9785e629 100644
--- a/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs
+++ b/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs
@@ -3,16 +3,12 @@
 // See the LICENSE file in the project root for more information
 
 using System.Collections.Immutable;
-using Amazon.S3;
 using Documentation.Assembler.Building;
 using Documentation.Assembler.Navigation;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using Elastic.Markdown.Links.CrossLinks;
 using Elastic.Markdown.Links.InboundLinks;
 using Microsoft.Extensions.Logging;
diff --git a/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs b/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs
index 9315b08f7..d6f13925b 100644
--- a/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs
+++ b/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs
@@ -6,7 +6,6 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
-using Elastic.Markdown;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Navigation;
 using Elastic.Markdown.Links.CrossLinks;
diff --git a/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs
index c6b878db1..401891497 100644
--- a/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs
+++ b/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs
@@ -17,9 +17,9 @@ public record GlobalNavigation : IPositionalNavigation
 
 	public IReadOnlyCollection<INavigationItem> NavigationItems { get; }
 
-	public IReadOnlyCollection<TocNavigationItem> TopLevelItems { get; }
+	public IReadOnlyCollection<TableOfContentsTree> TopLevelItems { get; }
 
-	public IReadOnlyDictionary<Uri, TocNavigationItem> NavigationLookup { get; }
+	public IReadOnlyDictionary<Uri, TableOfContentsTree> NavigationLookup { get; }
 
 	public FrozenDictionary<string, INavigationItem> MarkdownNavigationLookup { get; }
 
@@ -34,7 +34,7 @@ public GlobalNavigation(AssembleSources assembleSources, GlobalNavigationFile na
 		var navigationIndex = 0;
 		var markdownFiles = new HashSet<MarkdownFile>();
 		UpdateNavigationIndex(markdownFiles, NavigationItems, null, ref navigationIndex);
-		TopLevelItems = NavigationItems.OfType<TocNavigationItem>().ToList();
+		TopLevelItems = NavigationItems.OfType<TableOfContentsTree>().ToList();
 		NavigationLookup = TopLevelItems.ToDictionary(kv => kv.Source, kv => kv);
 		var grouped = markdownFiles.GroupBy(f => f.NavigationIndex).ToList();
 		var files = grouped
@@ -52,7 +52,7 @@ public GlobalNavigation(AssembleSources assembleSources, GlobalNavigationFile na
 	private void UpdateNavigationIndex(
 		HashSet<MarkdownFile> markdownFiles,
 		IReadOnlyCollection<INavigationItem> navigationItems,
-		IGroupNavigationItem? parent,
+		INodeNavigationItem<INavigationModel, INavigationItem>? parent,
 		ref int navigationIndex
 	)
 	{
@@ -62,22 +62,17 @@ ref int navigationIndex
 			{
 				case FileNavigationItem fileNavigationItem:
 					var fileIndex = Interlocked.Increment(ref navigationIndex);
-					fileNavigationItem.File.NavigationIndex = fileIndex;
-					fileNavigationItem.Parent = parent;
-					_ = markdownFiles.Add(fileNavigationItem.File);
+					fileNavigationItem.Model.NavigationIndex = fileIndex;
+					if (parent is not null)
+						fileNavigationItem.Parent = parent;
+					_ = markdownFiles.Add(fileNavigationItem.Model);
 					break;
-				case GroupNavigationItem { DocumentationGroup.MarkdownFileIndex: not null } groupNavigationItem:
-					var index = Interlocked.Increment(ref navigationIndex);
-					groupNavigationItem.DocumentationGroup.MarkdownFileIndex.NavigationIndex = index;
-					groupNavigationItem.Parent = parent;
-					_ = markdownFiles.Add(groupNavigationItem.DocumentationGroup.MarkdownFileIndex);
-					UpdateNavigationIndex(markdownFiles, groupNavigationItem.NavigationItems, groupNavigationItem, ref navigationIndex);
-					break;
-				case DocumentationGroup { MarkdownFileIndex: not null } documentationGroup:
+				case DocumentationGroup documentationGroup:
 					var groupIndex = Interlocked.Increment(ref navigationIndex);
-					documentationGroup.MarkdownFileIndex.NavigationIndex = groupIndex;
-					documentationGroup.Parent = parent;
-					_ = markdownFiles.Add(documentationGroup.MarkdownFileIndex);
+					documentationGroup.Index.NavigationIndex = groupIndex;
+					if (parent is not null)
+						documentationGroup.Parent = parent;
+					_ = markdownFiles.Add(documentationGroup.Index);
 					UpdateNavigationIndex(markdownFiles, documentationGroup.NavigationItems, documentationGroup, ref navigationIndex);
 					break;
 				default:
@@ -87,7 +82,7 @@ ref int navigationIndex
 		}
 	}
 
-	private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection<TocReference> node, int depth, IGroupNavigationItem? parent = null)
+	private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection<TocReference> node, int depth)
 	{
 		var list = new List<INavigationItem>();
 		foreach (var toc in node)
@@ -133,7 +128,7 @@ private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection
 					_assembleSources.TreeCollector, ref fileIndex);
 			}
 
-			var navigationItem = new TocNavigationItem(depth, tree, toc.Source, parent);
+			var navigationItem = tree;
 			var tocChildren = toc.Children.OfType<TocReference>().ToArray();
 			var tocNavigationItems = BuildNavigation(tocChildren, depth + 1);
 
@@ -146,7 +141,7 @@ private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection
 			var seenSources = new HashSet<Uri>();
 			foreach (var item in allNavigationItems)
 			{
-				if (item is not TocNavigationItem tocNav)
+				if (item is not TableOfContentsTree tocNav)
 				{
 					cleanNavigationItems.Add(item);
 					continue;
@@ -173,7 +168,7 @@ private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection
 		return list.ToArray().AsReadOnly();
 	}
 
-	public MarkdownFile? GetPrevious(MarkdownFile current)
+	public INavigationItem? GetPrevious(MarkdownFile current)
 	{
 		var index = current.NavigationIndex;
 		do
@@ -182,14 +177,17 @@ private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection
 			if (previous is null)
 				return null;
 			if (!previous.Hidden)
-				return previous;
+			{
+				if (MarkdownNavigationLookup.TryGetValue(previous.CrossLink, out var navigationItem))
+					return navigationItem;
+			}
 			index--;
-		} while (index >= 0);
+		} while (index > 0);
 
 		return null;
 	}
 
-	public MarkdownFile? GetNext(MarkdownFile current)
+	public INavigationItem? GetNext(MarkdownFile current)
 	{
 		var index = current.NavigationIndex;
 		do
@@ -198,10 +196,15 @@ private IReadOnlyCollection<INavigationItem> BuildNavigation(IReadOnlyCollection
 			if (previous is null)
 				return null;
 			if (!previous.Hidden)
-				return previous;
+			{
+				if (MarkdownNavigationLookup.TryGetValue(previous.CrossLink, out var navigationItem))
+					return navigationItem;
+			}
 			index++;
-		} while (index <= MarkdownFiles.Count);
+		} while (index <= MarkdownFiles.Count - 1);
 
 		return null;
 	}
+
+
 }
diff --git a/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs
index e6c690bff..d0f8d0f6a 100644
--- a/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs
+++ b/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs
@@ -5,10 +5,8 @@
 using System.Collections.Concurrent;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO.Navigation;
-using Elastic.Markdown.Slices;
 
 namespace Documentation.Assembler.Navigation;
 
@@ -16,7 +14,8 @@ public class GlobalNavigationHtmlWriter(
 	GlobalNavigationFile navigationFile,
 	AssembleContext assembleContext,
 	GlobalNavigation globalNavigation,
-	AssembleSources assembleSources) : INavigationHtmlWriter
+	AssembleSources assembleSources
+) : INavigationHtmlWriter
 {
 	private readonly ConcurrentDictionary<Uri, string> _renderedNavigationCache = [];
 
@@ -45,7 +44,7 @@ private bool TryGetNavigationRoot(
 		return true;
 	}
 
-	public async Task<string> RenderNavigation(IGroupNavigationItem currentRootNavigation, Uri navigationSource, Cancel ctx = default)
+	public async Task<string> RenderNavigation(INodeNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource, Cancel ctx = default)
 	{
 		if (!TryGetNavigationRoot(navigationSource, out var navigationRoot, out var navigationRootSource))
 			return string.Empty;
@@ -76,9 +75,9 @@ private NavigationViewModel CreateNavigationModel(DocumentationGroup group)
 		var topLevelItems = globalNavigation.TopLevelItems;
 		return new NavigationViewModel
 		{
-			Title = group.Index?.NavigationTitle ?? "Docs",
-			TitleUrl = group.Index?.Url ?? "/",
-			Tree = group.GroupNavigationItem,
+			Title = group.Index.NavigationTitle,
+			TitleUrl = group.Index.Url,
+			Tree = group,
 			IsPrimaryNavEnabled = true,
 			IsGlobalAssemblyBuild = true,
 			TopLevelItems = topLevelItems
diff --git a/src/tooling/docs-assembler/Navigation/GlobalNavigationPathProvider.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationPathProvider.cs
index 3bd9da14c..04f156d64 100644
--- a/src/tooling/docs-assembler/Navigation/GlobalNavigationPathProvider.cs
+++ b/src/tooling/docs-assembler/Navigation/GlobalNavigationPathProvider.cs
@@ -7,7 +7,6 @@
 using Documentation.Assembler.Extensions;
 using Elastic.Documentation;
 using Elastic.Markdown;
-using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Extensions.DetectionRules;
 using Elastic.Markdown.IO;
 
diff --git a/src/tooling/docs-assembler/Program.cs b/src/tooling/docs-assembler/Program.cs
index 17970d420..7f8be481a 100644
--- a/src/tooling/docs-assembler/Program.cs
+++ b/src/tooling/docs-assembler/Program.cs
@@ -8,7 +8,6 @@
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Tooling;
 using Elastic.Documentation.Tooling.Filters;
-using Elastic.Markdown.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 
 await using var serviceProvider = DocumentationTooling.CreateServiceProvider(ref args, services => services
diff --git a/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs b/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
index 4b3c83a87..dd822b2d7 100644
--- a/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
+++ b/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
@@ -9,7 +9,6 @@
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
 using Microsoft.Extensions.Logging;
-using ProcNet;
 using ProcNet.Std;
 
 namespace Documentation.Assembler.Sourcing;
diff --git a/src/tooling/docs-builder/Cli/CheckForUpdatesFilter.cs b/src/tooling/docs-builder/Cli/CheckForUpdatesFilter.cs
index 7813c888a..7334db5b2 100644
--- a/src/tooling/docs-builder/Cli/CheckForUpdatesFilter.cs
+++ b/src/tooling/docs-builder/Cli/CheckForUpdatesFilter.cs
@@ -6,9 +6,6 @@
 using ConsoleAppFramework;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.Helpers;
-using Elastic.Markdown.IO;
 
 namespace Documentation.Builder.Cli;
 
diff --git a/src/tooling/docs-builder/Cli/Commands.cs b/src/tooling/docs-builder/Cli/Commands.cs
index 1bc16f4d9..242e51a19 100644
--- a/src/tooling/docs-builder/Cli/Commands.cs
+++ b/src/tooling/docs-builder/Cli/Commands.cs
@@ -11,7 +11,6 @@
 using Elastic.ApiExplorer;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Refactor;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Documentation.Tooling.Filters;
 using Elastic.Markdown;
diff --git a/src/tooling/docs-builder/Cli/InboundLinkCommands.cs b/src/tooling/docs-builder/Cli/InboundLinkCommands.cs
index b05d4338f..23fa5f2c4 100644
--- a/src/tooling/docs-builder/Cli/InboundLinkCommands.cs
+++ b/src/tooling/docs-builder/Cli/InboundLinkCommands.cs
@@ -8,10 +8,8 @@
 using ConsoleAppFramework;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Documentation.Tooling.Filters;
-using Elastic.Markdown.IO;
 using Elastic.Markdown.Links.InboundLinks;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs b/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs
index 3d38c2cd9..0ae7209ea 100644
--- a/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs
+++ b/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Tooling.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Microsoft.Extensions.Logging;
 using Diagnostic = Elastic.Documentation.Diagnostics.Diagnostic;
 
diff --git a/src/tooling/docs-builder/Http/DocumentationWebHost.cs b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
index 6ec611d73..4ac96aa57 100644
--- a/src/tooling/docs-builder/Http/DocumentationWebHost.cs
+++ b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
@@ -9,7 +9,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Site.FileProviders;
 using Elastic.Documentation.Tooling;
-using Elastic.Markdown;
 using Elastic.Markdown.IO;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
diff --git a/src/tooling/docs-builder/Http/ParcelWatchService.cs b/src/tooling/docs-builder/Http/ParcelWatchService.cs
index ca3ae5de2..8caf323c8 100644
--- a/src/tooling/docs-builder/Http/ParcelWatchService.cs
+++ b/src/tooling/docs-builder/Http/ParcelWatchService.cs
@@ -4,8 +4,6 @@
 
 using System.Diagnostics;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using Microsoft.Extensions.Hosting;
 
 namespace Documentation.Builder.Http;
diff --git a/src/tooling/docs-builder/Program.cs b/src/tooling/docs-builder/Program.cs
index a73494faa..7baebbd2e 100644
--- a/src/tooling/docs-builder/Program.cs
+++ b/src/tooling/docs-builder/Program.cs
@@ -6,7 +6,6 @@
 using Documentation.Builder.Cli;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Tooling;
-using Elastic.Markdown.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 
 await using var serviceProvider = DocumentationTooling.CreateServiceProvider(ref args, services => services
diff --git a/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs b/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
index 5ef2e3e96..8008367a8 100644
--- a/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.Myst.Directives;
 using FluentAssertions;
diff --git a/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs b/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs
index 475675b09..3800bdae6 100644
--- a/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Myst.Directives;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Directives/UnsupportedTests.cs b/tests/Elastic.Markdown.Tests/Directives/UnsupportedTests.cs
index d2ed9f71b..f69967b83 100644
--- a/tests/Elastic.Markdown.Tests/Directives/UnsupportedTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/UnsupportedTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Myst.Directives;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs b/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs
index 47e79a4a9..8b4ffd13c 100644
--- a/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation;
-using Elastic.Markdown.Helpers;
 using Elastic.Markdown.Myst.Directives;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/DocSet/BreadCrumbTests.cs b/tests/Elastic.Markdown.Tests/DocSet/BreadCrumbTests.cs
index c3e14b712..cae721667 100644
--- a/tests/Elastic.Markdown.Tests/DocSet/BreadCrumbTests.cs
+++ b/tests/Elastic.Markdown.Tests/DocSet/BreadCrumbTests.cs
@@ -24,12 +24,12 @@ public void ParsesATableOfContents()
 		var f = positionalNavigation.MarkdownNavigationLookup.FirstOrDefault(kv => kv.Key == "docs-builder://testing/deeply-nested/foo.md");
 		f.Should().NotBeNull();
 
-		positionalNavigation.MarkdownNavigationLookup.Should().ContainKey(doc!.CrossLink);
+		positionalNavigation.MarkdownNavigationLookup.Should().ContainKey(doc.CrossLink);
 		var nav = positionalNavigation.MarkdownNavigationLookup[doc.CrossLink];
 
 		nav.Parent.Should().NotBeNull();
 
-		var parents = positionalNavigation.GetParentMarkdownFiles(doc);
+		var parents = positionalNavigation.GetParentsOfMarkdownFile(doc);
 
 		parents.Should().HaveCount(2);
 
diff --git a/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs b/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
index 5083de35a..18b27d1c3 100644
--- a/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
+++ b/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
@@ -6,7 +6,6 @@
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Builder;
-using Elastic.Documentation.Site;
 using Elastic.Markdown.IO;
 using FluentAssertions;
 using Microsoft.Extensions.Logging;
diff --git a/tests/Elastic.Markdown.Tests/DocSet/NestedTocTests.cs b/tests/Elastic.Markdown.Tests/DocSet/NestedTocTests.cs
index b7f98ec66..ecf937845 100644
--- a/tests/Elastic.Markdown.Tests/DocSet/NestedTocTests.cs
+++ b/tests/Elastic.Markdown.Tests/DocSet/NestedTocTests.cs
@@ -17,19 +17,19 @@ public void InjectsNestedTocsIntoDocumentationSet()
 
 		doc.Should().NotBeNull();
 		IPositionalNavigation positionalNavigation = Generator.DocumentationSet;
-		positionalNavigation.MarkdownNavigationLookup.Should().ContainKey(doc!.CrossLink);
+		positionalNavigation.MarkdownNavigationLookup.Should().ContainKey(doc.CrossLink);
 		var nav = positionalNavigation.MarkdownNavigationLookup[doc.CrossLink];
 
 		var parent = nav.Parent;
 
-		// ensure we link back up to main toc in docset yaml
+		// ensure we link back up to the main toc in docset yaml
 		parent.Should().NotBeNull();
 
 		// its parent should be null
 		parent.Parent.Should().BeNull();
 
 		// its parent should point to an index
-		var index = (parent as DocumentationGroup)?.MarkdownFileIndex;
+		var index = (parent as DocumentationGroup)?.Index;
 		index.Should().NotBeNull();
 		index.RelativePath.Should().Be("index.md");
 
diff --git a/tests/Elastic.Markdown.Tests/DocSet/RepositoryLinksTests.cs b/tests/Elastic.Markdown.Tests/DocSet/RepositoryLinksTests.cs
index 45366e7b1..7ccc7e5e1 100644
--- a/tests/Elastic.Markdown.Tests/DocSet/RepositoryLinksTests.cs
+++ b/tests/Elastic.Markdown.Tests/DocSet/RepositoryLinksTests.cs
@@ -5,8 +5,6 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Links;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using FluentAssertions;
 
 namespace Elastic.Markdown.Tests.DocSet;
diff --git a/tests/Elastic.Markdown.Tests/FrontMatter/YamlFrontMatterTests.cs b/tests/Elastic.Markdown.Tests/FrontMatter/YamlFrontMatterTests.cs
index ca7682dc5..7c87e29ce 100644
--- a/tests/Elastic.Markdown.Tests/FrontMatter/YamlFrontMatterTests.cs
+++ b/tests/Elastic.Markdown.Tests/FrontMatter/YamlFrontMatterTests.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Elastic.Markdown.Myst.FrontMatter;
 using Elastic.Markdown.Tests.Directives;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
index b724deaed..a4af4da49 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 using FluentAssertions;
 using JetBrains.Annotations;
 using Markdig.Syntax.Inlines;
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
index 641ba4d26..1bb7b6f11 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
@@ -4,7 +4,6 @@
 using System.IO.Abstractions.TestingHelpers;
 using System.Runtime.InteropServices;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Site;
 using Elastic.Markdown.IO;
 using FluentAssertions;
 using JetBrains.Annotations;
diff --git a/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs b/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs
index 7425a0e05..132505228 100644
--- a/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs
+++ b/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs
@@ -4,7 +4,6 @@
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Site;
 using Elastic.Markdown.IO;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs b/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs
index 32486ca52..17311ab00 100644
--- a/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs
+++ b/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs
@@ -5,9 +5,6 @@
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.IO;
 using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Tests.Directives;
 using FluentAssertions;
diff --git a/tests/Elastic.Markdown.Tests/TestCrossLinkResolver.cs b/tests/Elastic.Markdown.Tests/TestCrossLinkResolver.cs
index 2e801781b..c2be8f25c 100644
--- a/tests/Elastic.Markdown.Tests/TestCrossLinkResolver.cs
+++ b/tests/Elastic.Markdown.Tests/TestCrossLinkResolver.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
-using Elastic.Documentation;
 using Elastic.Documentation.Links;
 using Elastic.Markdown.Links.CrossLinks;
 using Xunit.Internal;
diff --git a/tests/Elastic.Markdown.Tests/TestDiagnosticsCollector.cs b/tests/Elastic.Markdown.Tests/TestDiagnosticsCollector.cs
index fd28aa402..f5b911d70 100644
--- a/tests/Elastic.Markdown.Tests/TestDiagnosticsCollector.cs
+++ b/tests/Elastic.Markdown.Tests/TestDiagnosticsCollector.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Diagnostics;
 
 namespace Elastic.Markdown.Tests;
 
diff --git a/tests/docs-assembler.Tests/src/docs-assembler.Tests/AssemblerConfigurationTests.cs b/tests/docs-assembler.Tests/src/docs-assembler.Tests/AssemblerConfigurationTests.cs
index 0edfc8a71..557b42b04 100644
--- a/tests/docs-assembler.Tests/src/docs-assembler.Tests/AssemblerConfigurationTests.cs
+++ b/tests/docs-assembler.Tests/src/docs-assembler.Tests/AssemblerConfigurationTests.cs
@@ -6,8 +6,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using FluentAssertions;
 
 namespace Documentation.Assembler.Tests;
diff --git a/tests/docs-assembler.Tests/src/docs-assembler.Tests/DocsSyncTests.cs b/tests/docs-assembler.Tests/src/docs-assembler.Tests/DocsSyncTests.cs
index 67975b74e..07ce24cd9 100644
--- a/tests/docs-assembler.Tests/src/docs-assembler.Tests/DocsSyncTests.cs
+++ b/tests/docs-assembler.Tests/src/docs-assembler.Tests/DocsSyncTests.cs
@@ -8,8 +8,6 @@
 using Documentation.Assembler.Deploying;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Site;
-using Elastic.Markdown.IO;
 using FakeItEasy;
 using FluentAssertions;
 using Microsoft.Extensions.Logging;
diff --git a/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs b/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
index 1500307c9..c715c3b98 100644
--- a/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
+++ b/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
@@ -8,7 +8,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Navigation;
@@ -117,7 +116,7 @@ public async Task ParsesReferences()
 		var navigationFile = new GlobalNavigationFile(Context, assembleSources);
 		var referenceToc = navigationFile.TableOfContents.FirstOrDefault(t => t.Source == expectedRoot);
 		referenceToc.Should().NotBeNull();
-		referenceToc!.TocReferences.Should().NotContainKey(clients);
+		referenceToc.TocReferences.Should().NotContainKey(clients);
 
 		var ingestTools = referenceToc.TocReferences[new Uri("docs-content://reference/ingestion-tools/")];
 		ingestTools.Should().NotBeNull();
@@ -136,26 +135,30 @@ public async Task ParsesReferences()
 		navigation.NavigationItems.Should().HaveSameCount(navigation.NavigationLookup);
 
 		referenceNav.Should().NotBeNull();
-		referenceNav.NavigationLookup.Should().NotContainKey(clients);
-		referenceNav.NavigationItems.OfType<TocNavigationItem>()
+		var navigationLookup = referenceNav.NavigationItems.OfType<TableOfContentsTree>().ToDictionary(i => i.Source, i => i);
+		navigationLookup.Should().NotContainKey(clients);
+		referenceNav.NavigationItems.OfType<TableOfContentsTree>()
 			.Select(n => n.Source)
 			.Should().NotContain(clients);
-		referenceNav.NavigationItems.Should().HaveSameCount(referenceNav.NavigationLookup);
+		referenceNav.NavigationItems.Should().HaveSameCount(navigationLookup);
 
-		var ingestNav = referenceNav.NavigationLookup[new Uri("docs-content://reference/ingestion-tools/")];
+		var ingestNav = navigationLookup[new Uri("docs-content://reference/ingestion-tools/")];
 		ingestNav.Should().NotBeNull();
-		ingestNav.NavigationLookup.Should().NotContainKey(clients);
-		ingestNav.NavigationItems.OfType<TocNavigationItem>()
+		var ingestLookup = ingestNav.NavigationItems.OfType<TableOfContentsTree>().ToDictionary(i => i.Source, i => i);
+		ingestLookup.Should().NotContainKey(clients);
+		ingestNav.NavigationItems.OfType<TableOfContentsTree>()
 			.Select(n => n.Source)
 			.Should().NotContain(clients);
 
-		var apmNav = ingestNav.NavigationLookup[new Uri("docs-content://reference/apm/")];
+		var apmNav = ingestLookup[new Uri("docs-content://reference/apm/")];
 		apmNav.Should().NotBeNull();
 
-		var apmAgentsNav = apmNav.NavigationLookup[expectedParent];
+		var apmLookup = apmNav.NavigationItems.OfType<TableOfContentsTree>().ToDictionary(i => i.Source, i => i);
+		var apmAgentsNav = apmLookup[expectedParent];
 		apmAgentsNav.Should().NotBeNull();
 
-		var dotnetAgentNav = apmAgentsNav.NavigationLookup[sut];
+		var apmAgentLookup = apmAgentsNav.NavigationItems.OfType<TableOfContentsTree>().ToDictionary(i => i.Source, i => i);
+		var dotnetAgentNav = apmAgentLookup[sut];
 		dotnetAgentNav.Should().NotBeNull();
 
 		var resolved = navigation.NavigationItems;
@@ -208,40 +211,41 @@ public async Task ParsesGlobalNavigation()
 
 		var releaseNotes = positionalNavigation.MarkdownNavigationLookup.Where(kv => kv.Key.Contains("release-notes")).ToArray();
 
-
 		var addToHelm = positionalNavigation.MarkdownNavigationLookup.GetValueOrDefault("apm-k8s-attacher://reference/apm-webhook-add-helm-repo.md");
 		addToHelm.Should().NotBeNull();
-		var parentGroup = addToHelm!.Parent as GroupNavigationItem;
+		var parentGroup = addToHelm.Parent as DocumentationGroup;
 		var parents = AssertHasParents(parentGroup, positionalNavigation, addToHelm);
 
-		parents.Select(p => p.CrossLink).Should().ContainInOrder(
+		parents
+			.Select(p => p.Url).Should().ContainInOrder(
 		[
-			"apm-k8s-attacher://reference/apm-get-started-webhook.md",
-			"apm-k8s-attacher://reference/index.md",
-			"docs-content://reference/apm/observability/apm.md",
-			"docs-content://reference/ingestion-tools/index.md",
-			"docs-content://reference/index.md"
+			"/docs/reference/apm/k8s-attacher/apm-get-started-webhook",
+			"/docs/reference/apm/k8s-attacher",
+			"/docs/reference/apm/observability/apm",
+			"/docs/reference/ingestion-tools/",
+			"/docs/reference/",
+			"/docs/"
 		]);
 
 		var getStartedIntro = positionalNavigation.MarkdownNavigationLookup.GetValueOrDefault("docs-content://get-started/introduction.md");
 		getStartedIntro.Should().NotBeNull();
-		parentGroup = getStartedIntro!.Parent as GroupNavigationItem;
+		parentGroup = getStartedIntro.Parent as DocumentationGroup;
 		_ = AssertHasParents(parentGroup, positionalNavigation, getStartedIntro);
 
 	}
 
-	private static MarkdownFile[] AssertHasParents(
-		GroupNavigationItem? parent,
+	private static INavigationItem[] AssertHasParents(
+		DocumentationGroup? parent,
 		IPositionalNavigation positionalNavigation,
 		INavigationItem item
 	)
 	{
 		parent.Should().NotBeNull();
-		parent!.DocumentationGroup.Index.Should().NotBeNull();
+		parent.Index.Should().NotBeNull();
 		var parents2 = positionalNavigation.GetParents(item);
-		var parents3 = positionalNavigation.GetParentMarkdownFiles(item);
-		var markdown = (item as FileNavigationItem)?.File!;
-		var parents = positionalNavigation.GetParentMarkdownFiles(markdown);
+		var parents3 = positionalNavigation.GetParents(item);
+		var markdown = (item as FileNavigationItem)?.Model!;
+		var parents = positionalNavigation.GetParentsOfMarkdownFile(markdown);
 
 		parents.Should().NotBeEmpty().And.HaveCount(parents2.Length).And.HaveCount(parents3.Length);
 		return parents;