diff --git a/apps/docs/README.md b/apps/docs/README.md
index 9b1824d4..3998feeb 100644
--- a/apps/docs/README.md
+++ b/apps/docs/README.md
@@ -1,22 +1,24 @@
# Task Master Documentation
-Welcome to the Task Master documentation. Use the links below to navigate to the information you need:
+Welcome to the Task Master documentation. This documentation site provides comprehensive guides for getting started with Task Master.
## Getting Started
-- [Configuration Guide](archive/configuration.md) - Set up environment variables and customize Task Master
-- [Tutorial](archive/ctutorial.md) - Step-by-step guide to getting started with Task Master
+- [Quick Start Guide](/getting-started/quick-start) - Complete setup and first-time usage guide
+- [Requirements](/getting-started/quick-start/requirements) - What you need to get started
+- [Installation](/getting-started/quick-start/installation) - How to install Task Master
-## Reference
+## Core Capabilities
-- [Command Reference](archive/ccommand-reference.md) - Complete list of all available commands
-- [Task Structure](archive/ctask-structure.md) - Understanding the task format and features
+- [MCP Tools](/capabilities/mcp) - Model Control Protocol integration
+- [CLI Commands](/capabilities/cli-root-commands) - Command line interface reference
+- [Task Structure](/capabilities/task-structure) - Understanding tasks and subtasks
-## Examples & Licensing
+## Best Practices
-- [Example Interactions](archive/cexamples.md) - Common Cursor AI interaction examples
-- [Licensing Information](archive/clicensing.md) - Detailed information about the license
+- [Advanced Configuration](/best-practices/configuration-advanced) - Detailed configuration options
+- [Advanced Tasks](/best-practices/advanced-tasks) - Working with complex task structures
## Need More Help?
-If you can't find what you're looking for in these docs, please check the [main README](../README.md) or visit our [GitHub repository](https://github.com/eyaltoledano/claude-task-master).
+If you can't find what you're looking for in these docs, please check the root README.md or visit our [GitHub repository](https://github.com/eyaltoledano/claude-task-master).
diff --git a/apps/docs/getting-started/quick-start/configuration-quick.mdx b/apps/docs/getting-started/quick-start/configuration-quick.mdx
index 17908753..74325602 100644
--- a/apps/docs/getting-started/quick-start/configuration-quick.mdx
+++ b/apps/docs/getting-started/quick-start/configuration-quick.mdx
@@ -108,5 +108,5 @@ You don’t need to configure everything up front. Most settings can be left as
-For advanced configuration options and detailed customization, see our [Advanced Configuration Guide](/docs/best-practices/configuration-advanced) page.
+For advanced configuration options and detailed customization, see our [Advanced Configuration Guide](/best-practices/configuration-advanced) page.
\ No newline at end of file
diff --git a/apps/docs/getting-started/quick-start/execute-quick.mdx b/apps/docs/getting-started/quick-start/execute-quick.mdx
index 3c4e884d..80ccdac6 100644
--- a/apps/docs/getting-started/quick-start/execute-quick.mdx
+++ b/apps/docs/getting-started/quick-start/execute-quick.mdx
@@ -56,4 +56,4 @@ If you ran into problems and had to debug errors you can create new rules as you
By now you have all you need to get started executing code faster and smarter with Task Master.
-If you have any questions please check out [Frequently Asked Questions](/docs/getting-started/faq)
+If you have any questions please check out [Frequently Asked Questions](/getting-started/faq)
diff --git a/apps/docs/getting-started/quick-start/quick-start.mdx b/apps/docs/getting-started/quick-start/quick-start.mdx
index c1f44a16..f2b349a3 100644
--- a/apps/docs/getting-started/quick-start/quick-start.mdx
+++ b/apps/docs/getting-started/quick-start/quick-start.mdx
@@ -6,13 +6,13 @@ sidebarTitle: "Quick Start"
This guide is for new users who want to start using Task Master with minimal setup time.
It covers:
-- [Requirements](/docs/getting-started/quick-start/requirements): You will need Node.js and an AI model API Key.
-- [Installation](/docs/getting-started/quick-start/installation): How to Install Task Master.
-- [Configuration](/docs/getting-started/quick-start/configuration-quick): Setting up your API Key, MCP, and more.
-- [PRD](/docs/getting-started/quick-start/prd-quick): Writing and parsing your first PRD.
-- [Task Setup](/docs/getting-started/quick-start/tasks-quick): Preparing your tasks for execution.
-- [Executing Tasks](/docs/getting-started/quick-start/execute-quick): Using Task Master to execute tasks.
-- [Rules & Context](/docs/getting-started/quick-start/rules-quick): Learn how and why to build context in your project over time.
+- [Requirements](/getting-started/quick-start/requirements): You will need Node.js and an AI model API Key.
+- [Installation](/getting-started/quick-start/installation): How to Install Task Master.
+- [Configuration](/getting-started/quick-start/configuration-quick): Setting up your API Key, MCP, and more.
+- [PRD](/getting-started/quick-start/prd-quick): Writing and parsing your first PRD.
+- [Task Setup](/getting-started/quick-start/tasks-quick): Preparing your tasks for execution.
+- [Executing Tasks](/getting-started/quick-start/execute-quick): Using Task Master to execute tasks.
+- [Rules & Context](/getting-started/quick-start/rules-quick): Learn how and why to build context in your project over time.
By the end of this guide, you'll have everything you need to begin working productively with Task Master.
diff --git a/apps/docs/getting-started/quick-start/tasks-quick.mdx b/apps/docs/getting-started/quick-start/tasks-quick.mdx
index 598b1c20..eef7c634 100644
--- a/apps/docs/getting-started/quick-start/tasks-quick.mdx
+++ b/apps/docs/getting-started/quick-start/tasks-quick.mdx
@@ -80,6 +80,6 @@ You can view the report in a friendly table using:
Can you show me the complexity report in a more readable format?
```
-For more detailed CLI options, see the [Analyze Task Complexity](/docs/capabilities/cli-root-commands#analyze-task-complexity) section.
+For more detailed CLI options, see the [Analyze Task Complexity](/capabilities/cli-root-commands#analyze-task-complexity) section.
-Now you are ready to begin [executing tasks](/docs/getting-started/quick-start/execute-quick)
\ No newline at end of file
+Now you are ready to begin [executing tasks](/getting-started/quick-start/execute-quick)
\ No newline at end of file
diff --git a/apps/docs/introduction.mdx b/apps/docs/introduction.mdx
index 17f89164..42ecc560 100644
--- a/apps/docs/introduction.mdx
+++ b/apps/docs/introduction.mdx
@@ -4,7 +4,7 @@ Welcome to v1 of the Task Master Docs. Expect weekly updates as we expand and re
We've organized the docs into three sections depending on your experience level and goals:
-### Getting Started - Jump in to [Quick Start](/docs/getting-started/quick-start)
+### Getting Started - Jump in to [Quick Start](/getting-started/quick-start)
Designed for first-time users. Get set up, create your first PRD, and run your first task.
### Best Practices