diff --git a/.vitepress/config.mts b/.vitepress/config.mts
index 616014d7..3aa45736 100644
--- a/.vitepress/config.mts
+++ b/.vitepress/config.mts
@@ -98,9 +98,9 @@ export default defineConfig({
   themeConfig: {
     // https://vitepress.dev/reference/default-theme-config
     nav: [
-      { text: 'Documentation', link: '/documentation/welcome' },
-      { text: 'Guides', link: '/' },
-      { text: 'References', link: '/' },
+      { text: 'Get Started', link: '/get-started/welcome' },
+      { text: 'Guides', link: '/guides/build-iapp/' },
+      { text: 'References', link: '/references/dataProtector' },
       {
         component: 'ChainSelector',
         props: {
diff --git a/.vitepress/sidebar.ts b/.vitepress/sidebar.ts
index 4c011d9c..e27784e4 100644
--- a/.vitepress/sidebar.ts
+++ b/.vitepress/sidebar.ts
@@ -2,577 +2,569 @@ import type { DefaultTheme } from 'vitepress';
 
 export function getSidebar() {
   return {
-    '/documentation/': [
+    '/get-started/': [
       {
         text: 'GET STARTED',
         items: [
-          { text: '💡 Welcome', link: '/documentation/welcome' },
+          { text: '💡 Welcome', link: '/get-started/welcome' },
+          {
+            text: '🛠️ Toolkit',
+            link: '/get-started/toolkit',
+          },
           {
             text: '👋 Hello World',
-            link: '/documentation/helloWorld',
+            link: '/get-started/helloWorld',
             collapsed: true,
             items: [
               {
                 text: 'iExec Overview',
-                link: '/documentation/helloWorld/1-overview',
+                link: '/get-started/helloWorld/1-overview',
               },
               {
                 text: 'Protect Data',
-                link: '/documentation/helloWorld/2-protectData',
+                link: '/get-started/helloWorld/2-protectData',
               },
               {
                 text: 'Build iApp',
-                link: '/documentation/helloWorld/3-buildIApp',
+                link: '/get-started/helloWorld/3-buildIApp',
               },
               {
                 text: 'Manage Data Access',
-                link: '/documentation/helloWorld/4-manageDataAccess',
+                link: '/get-started/helloWorld/4-manageDataAccess',
               },
               {
                 text: 'Bonus Chapter !',
-                link: '/documentation/helloWorld/5-bonusChapter',
+                link: '/get-started/helloWorld/5-bonusChapter',
               },
             ],
           },
           {
             text: '🚀 Quick Start',
-            link: '/documentation/quick-start',
+            link: '/get-started/quick-start',
           },
           {
             text: '📋 Use Cases',
-            link: '/documentation/use-cases',
+            link: '/get-started/use-cases',
+          },
+          {
+            text: '🤖 Develop with AI',
+            link: '/get-started/develop-with-ai',
+          },
+        ],
+      },
+      {
+        text: 'iExec OVERVIEW',
+        items: [
+          {
+            text: '❓ What is iExec ?',
+            link: '/get-started/overview/what-is-iexec',
+          },
+          {
+            text: '❓  What is Protected Data ?',
+            link: '/get-started/overview/what-is-protected-data',
+          },
+          {
+            text: '❓ What is an iApp ?',
+            link: '/get-started/overview/what-is-iapp',
+          },
+          {
+            text: '❓ What is a Workerpool ?',
+            link: '/get-started/overview/what-is-workerpool',
           },
           {
             text: '🪙 RLC Token',
-            link: '/documentation/rlc',
+            link: '/get-started/rlc',
           },
+        ],
+      },
+      {
+        text: 'TOOLING & EXPLORERS',
+        items: [
           {
-            text: '🤖 Develop with AI',
-            link: '/documentation/develop-with-ai',
+            text: 'iExec Explorer',
+            link: '/get-started/tooling-and-explorers/iexec-explorer',
+          },
+          {
+            text: 'Builder Dashboard',
+            link: '/get-started/tooling-and-explorers/builder-dashboard',
+          },
+          {
+            text: 'RLC Bridge',
+            link: '/get-started/tooling-and-explorers/bridge',
+          },
+          {
+            text: 'Subgraph Explorer',
+            link: '/get-started/tooling-and-explorers/subgraph-explorer',
+          },
+          {
+            text: 'Blockchain Explorer',
+            link: '/get-started/tooling-and-explorers/blockchain-explorer',
           },
         ],
       },
+      {
+        text: 'PROTOCOL',
+        items: [
+          {
+            text: '🛡️ Proof of Contribution',
+            link: '/get-started/protocol/proof-of-contribution',
+          },
+          {
+            text: '💸 Pay Per Task Model',
+            link: '/get-started/protocol/pay-per-task',
+          },
+          {
+            text: '⚙️ Workers & Workerpools',
+            collapsed: true,
+            items: [
+              {
+                text: '🚀 Worker Quick Start',
+                link: '/get-started/protocol/worker/quick-start',
+              },
+              {
+                text: '🔒 Manage Workerpool Access',
+                link: '/get-started/protocol/worker/manage-access',
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    '/guides/': [
       {
         text: 'PROTECT AND MANAGE DATA',
         items: [
           {
-            text: '❓  What is Protected Data ?',
-            link: '/documentation/manage-data/what-is-protected-data',
+            text: 'Manage Access',
+            link: '/guides/manage-data/manage-access',
+          },
+          {
+            text: 'Handle Schemas and Dataset Types',
+            link: '/guides/manage-data/handle-schemas-dataset-types',
+          },
+          {
+            text: 'Monetize Protected Data',
+            link: '/guides/manage-data/monetize-protected-data',
+          },
+        ],
+      },
+      {
+        text: 'BUILD YOUR iAPP',
+        items: [
+          {
+            text: 'Build and Deploy',
+            link: '/guides/build-iapp/build-&-deploy',
+          },
+          {
+            text: 'Manage Access',
+            link: '/guides/build-iapp/manage-access',
           },
           {
-            text: '📖 Guides',
+            text: 'Inputs and Outputs',
+            link: '/guides/build-iapp/inputs-and-outputs',
+          },
+          {
+            text: 'Using TDX',
+            link: '/guides/build-iapp/using-tdx',
+          },
+          {
+            text: 'How to Get and Decrypt Results',
+            link: '/guides/build-iapp/how-to-get-and-decrypt-results',
+          },
+          {
+            text: 'Debugging',
+            link: '/guides/build-iapp/debugging',
+          },
+        ],
+      },
+      {
+        text: 'USE AN iAPP',
+        items: [
+          {
+            text: '📝 Introduction',
+            link: '/guides/use-iapp/introduction',
+          },
+          {
+            text: '🚀 Getting Started',
+            link: '/guides/use-iapp/getting-started',
+          },
+          {
+            text: 'Different Ways to Execute an iApp',
+            link: '/guides/use-iapp/different-ways-to-execute',
+          },
+          {
+            text: 'Add Inputs to the Execution',
+            link: '/guides/use-iapp/add-inputs-to-execution',
+          },
+          {
+            text: 'Use iApp with Protected Data',
+            link: '/guides/use-iapp/use-iapp-with-protected-data',
+          },
+          {
+            text: 'Find iApps to Use',
+            link: '/guides/use-iapp/find-iapps',
+          },
+          {
+            text: 'How to Pay the Executions',
+            link: '/guides/use-iapp/how-to-pay-executions',
+          },
+          {
+            text: '💰 How to Pay',
             collapsed: true,
             items: [
               {
-                text: 'Manage Access',
-                link: '/documentation/manage-data/guides/manage-access',
+                text: 'How to Pay for Web3Mail',
+                link: '/guides/use-iapp/how-to-pay/how-to-pay-for-web3mail',
               },
               {
-                text: 'Handle Schemas and Dataset Types',
-                link: '/documentation/manage-data/guides/handle-schemas-dataset-types',
+                text: 'How to Pay for Web3Telegram',
+                link: '/guides/use-iapp/how-to-pay/how-to-pay-for-web3telegram',
               },
               {
-                text: 'Monetize Protected Data',
-                link: '/documentation/manage-data/guides/monetize-protected-data',
+                text: 'Pricing Considerations',
+                link: '/guides/use-iapp/how-to-pay/pricing-considerations',
+              },
+              {
+                text: 'Voucher',
+                link: '/guides/use-iapp/how-to-pay/voucher',
               },
             ],
           },
+        ],
+      },
+    ],
+    '/references/': [
+      {
+        text: '🔐 DataProtector',
+        link: '/references/dataProtector',
+        collapsed: true,
+        items: [
           {
-            text: '🔐 DataProtector',
-            link: '/documentation/manage-data/dataProtector',
+            text: 'Getting Started',
+            link: '/references/dataProtector/getting-started',
+          },
+          {
+            text: 'DataProtector Core',
+            link: '/references/dataProtector/dataProtectorCore',
             collapsed: true,
             items: [
               {
-                text: 'Getting Started',
-                link: '/documentation/manage-data/dataProtector/getting-started',
+                text: 'protectData',
+                link: '/references/dataProtector/dataProtectorCore/protectData',
+              },
+              {
+                text: 'getProtectedData',
+                link: '/references/dataProtector/dataProtectorCore/getProtectedData',
+              },
+              {
+                text: 'transferOwnership',
+                link: '/references/dataProtector/dataProtectorCore/transferOwnership',
+              },
+              {
+                text: 'grantAccess',
+                link: '/references/dataProtector/dataProtectorCore/grantAccess',
+              },
+              {
+                text: 'getGrantedAccess',
+                link: '/references/dataProtector/dataProtectorCore/getGrantedAccess',
+              },
+              {
+                text: 'revokeOneAccess',
+                link: '/references/dataProtector/dataProtectorCore/revokeOneAccess',
+              },
+              {
+                text: 'revokeAllAccess',
+                link: '/references/dataProtector/dataProtectorCore/revokeAllAccess',
               },
               {
-                text: 'DataProtector Core',
-                link: '/documentation/manage-data/dataProtector/dataProtectorCore',
+                text: 'processProtectedData',
+                link: '/references/dataProtector/dataProtectorCore/processProtectedData',
+              },
+              {
+                text: 'getResultFromCompletedTask',
+                link: '/references/dataProtector/dataProtectorCore/getResultFromCompletedTask',
+              },
+            ],
+          },
+          {
+            text: 'DataProtector Sharing',
+            link: '/references/dataProtector/dataProtectorSharing',
+            collapsed: true,
+            items: [
+              {
+                text: 'Collection',
+                link: '/references/dataProtector/dataProtectorSharing/collection',
                 collapsed: true,
                 items: [
                   {
-                    text: 'protectData',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/protectData',
+                    text: 'createCollection',
+                    link: '/references/dataProtector/dataProtectorSharing/collection/createCollection',
                   },
                   {
-                    text: 'getProtectedData',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/getProtectedData',
+                    text: 'removeCollection',
+                    link: '/references/dataProtector/dataProtectorSharing/collection/removeCollection',
                   },
                   {
-                    text: 'transferOwnership',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/transferOwnership',
+                    text: 'addToCollection',
+                    link: '/references/dataProtector/dataProtectorSharing/collection/addToCollection',
                   },
                   {
-                    text: 'grantAccess',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/grantAccess',
-                  },
-                  {
-                    text: 'getGrantedAccess',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/getGrantedAccess',
+                    text: 'removeProtectedDataFromCollection',
+                    link: '/references/dataProtector/dataProtectorSharing/collection/removeProtectedDataFromCollection',
                   },
+                ],
+              },
+              {
+                text: 'Renting',
+                link: '/references/dataProtector/dataProtectorSharing/renting',
+                collapsed: true,
+                items: [
                   {
-                    text: 'revokeOneAccess',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/revokeOneAccess',
+                    text: 'setProtectedDataToRenting',
+                    link: '/references/dataProtector/dataProtectorSharing/renting/setProtectedDataToRenting',
                   },
                   {
-                    text: 'revokeAllAccess',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/revokeAllAccess',
+                    text: 'setProtectedDataRentingParams',
+                    link: '/references/dataProtector/dataProtectorSharing/renting/setProtectedDataRentingParams',
                   },
                   {
-                    text: 'processProtectedData',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/processProtectedData',
+                    text: 'rentProtectedData',
+                    link: '/references/dataProtector/dataProtectorSharing/renting/rentProtectedData',
                   },
                   {
-                    text: 'getResultFromCompletedTask',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorCore/getResultFromCompletedTask',
+                    text: 'removeProtectedDataFromRenting',
+                    link: '/references/dataProtector/dataProtectorSharing/renting/removeProtectedDataFromRenting',
                   },
                 ],
               },
               {
-                text: 'DataProtector Sharing',
-                link: '/documentation/manage-data/dataProtector/dataProtectorSharing',
+                text: 'Selling',
+                link: '/references/dataProtector/dataProtectorSharing/selling',
                 collapsed: true,
                 items: [
                   {
-                    text: 'Collection',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorSharing/collection',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'createCollection',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/collection/createCollection',
-                      },
-                      {
-                        text: 'removeCollection',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/collection/removeCollection',
-                      },
-                      {
-                        text: 'addToCollection',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/collection/addToCollection',
-                      },
-                      {
-                        text: 'removeProtectedDataFromCollection',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/collection/removeProtectedDataFromCollection',
-                      },
-                    ],
+                    text: 'setProtectedDataForSale',
+                    link: '/references/dataProtector/dataProtectorSharing/selling/setProtectedDataForSale',
+                  },
+                  {
+                    text: 'buyProtectedData',
+                    link: '/references/dataProtector/dataProtectorSharing/selling/buyProtectedData',
                   },
                   {
-                    text: 'Renting',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorSharing/renting',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'setProtectedDataToRenting',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/renting/setProtectedDataToRenting',
-                      },
-                      {
-                        text: 'setProtectedDataRentingParams',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/renting/setProtectedDataRentingParams',
-                      },
-                      {
-                        text: 'rentProtectedData',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/renting/rentProtectedData',
-                      },
-                      {
-                        text: 'removeProtectedDataFromRenting',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/renting/removeProtectedDataFromRenting',
-                      },
-                    ],
+                    text: 'removeProtectedDataForSale',
+                    link: '/references/dataProtector/dataProtectorSharing/selling/removeProtectedDataForSale',
                   },
+                ],
+              },
+              {
+                text: 'Subscription',
+                link: '/references/dataProtector/dataProtectorSharing/subscription',
+                collapsed: true,
+                items: [
                   {
-                    text: 'Selling',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorSharing/selling',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'setProtectedDataForSale',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/selling/setProtectedDataForSale',
-                      },
-                      {
-                        text: 'buyProtectedData',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/selling/buyProtectedData',
-                      },
-                      {
-                        text: 'removeProtectedDataForSale',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/selling/removeProtectedDataForSale',
-                      },
-                    ],
+                    text: 'setProtectedDataToSubscription',
+                    link: '/references/dataProtector/dataProtectorSharing/subscription/setProtectedDataToSubscription',
                   },
                   {
-                    text: 'Subscription',
-                    link: '/documentation/manage-data/dataProtector/dataProtectorSharing/subscription',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'setProtectedDataToSubscription',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/setProtectedDataToSubscription',
-                      },
-                      {
-                        text: 'setSubscriptionParams',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/setSubscriptionParams',
-                      },
-                      {
-                        text: 'subscribeToCollection',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/subscribeToCollection',
-                      },
-                      {
-                        text: 'removeProtectedDataFromSubscription',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/removeProtectedDataFromSubscription',
-                      },
-                    ],
+                    text: 'setSubscriptionParams',
+                    link: '/references/dataProtector/dataProtectorSharing/subscription/setSubscriptionParams',
                   },
                   {
-                    text: 'Consume',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'consumeProtectedData',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/consume/consumeProtectedData',
-                      },
-                    ],
+                    text: 'subscribeToCollection',
+                    link: '/references/dataProtector/dataProtectorSharing/subscription/subscribeToCollection',
                   },
                   {
-                    text: 'Read Data',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'getProtectedDataInCollections',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/read/getProtectedDataInCollections',
-                      },
-                      {
-                        text: 'getProtectedDataPricingParams',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/read/getProtectedDataPricingParams',
-                      },
-                      {
-                        text: 'getCollectionOwners',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionOwners',
-                      },
-                      {
-                        text: 'getCollectionsByOwner',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionsByOwner',
-                      },
-                      {
-                        text: 'getCollectionSubscriptions',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionSubscriptions',
-                      },
-                      {
-                        text: 'getRentals',
-                        link: '/documentation/manage-data/dataProtector/dataProtectorSharing/read/getRentals',
-                      },
-                    ],
+                    text: 'removeProtectedDataFromSubscription',
+                    link: '/references/dataProtector/dataProtectorSharing/subscription/removeProtectedDataFromSubscription',
                   },
                 ],
               },
               {
-                text: 'Types',
-                link: '/documentation/manage-data/dataProtector/types',
+                text: 'Consume',
+                collapsed: true,
+                items: [
+                  {
+                    text: 'consumeProtectedData',
+                    link: '/references/dataProtector/dataProtectorSharing/consume/consumeProtectedData',
+                  },
+                ],
               },
               {
-                text: 'Advanced',
+                text: 'Read Data',
                 collapsed: true,
                 items: [
                   {
-                    text: 'Advanced Configuration',
-                    link: '/documentation/manage-data/dataProtector/advanced/advanced-configuration',
+                    text: 'getProtectedDataInCollections',
+                    link: '/references/dataProtector/dataProtectorSharing/read/getProtectedDataInCollections',
                   },
                   {
-                    text: 'Sharing smart contract',
-                    link: '/documentation/manage-data/dataProtector/advanced/dps-smart-contract',
+                    text: 'getProtectedDataPricingParams',
+                    link: '/references/dataProtector/dataProtectorSharing/read/getProtectedDataPricingParams',
                   },
                   {
-                    text: 'Apps whitelist',
-                    link: '/documentation/manage-data/dataProtector/advanced/apps-whitelist',
-                    collapsed: true,
-                    items: [
-                      {
-                        text: 'createAddOnlyAppWhitelist',
-                        link: '/documentation/manage-data/dataProtector/advanced/apps-whitelist/createAddOnlyAppWhitelist',
-                      },
-                      {
-                        text: 'addAppToAddOnlyAppWhitelist',
-                        link: '/documentation/manage-data/dataProtector/advanced/apps-whitelist/addAppToAddOnlyAppWhitelist',
-                      },
-                      {
-                        text: 'getUserAddOnlyAppWhitelist',
-                        link: '/documentation/manage-data/dataProtector/advanced/apps-whitelist/getUserAddOnlyAppWhitelist',
-                      },
-                    ],
+                    text: 'getCollectionOwners',
+                    link: '/references/dataProtector/dataProtectorSharing/read/getCollectionOwners',
+                  },
+                  {
+                    text: 'getCollectionsByOwner',
+                    link: '/references/dataProtector/dataProtectorSharing/read/getCollectionsByOwner',
+                  },
+                  {
+                    text: 'getCollectionSubscriptions',
+                    link: '/references/dataProtector/dataProtectorSharing/read/getCollectionSubscriptions',
+                  },
+                  {
+                    text: 'getRentals',
+                    link: '/references/dataProtector/dataProtectorSharing/read/getRentals',
                   },
                 ],
               },
-              {
-                text: 'Migrate from v1 to v2',
-                link: '/documentation/manage-data/dataProtector/migrate-from-v1',
-              },
             ],
           },
-        ],
-      },
-      {
-        text: 'BUILD YOUR iAPP',
-        items: [
           {
-            text: '❓ What is an iApp ?',
-            link: '/documentation/build-iapp/what-is-iapp',
-          },
-          {
-            text: '📖 Guides',
-            collapsed: true,
-            items: [
-              {
-                text: 'Build and Deploy',
-                link: '/documentation/build-iapp/guides/build-&-deploy',
-              },
-              {
-                text: 'Manage Access',
-                link: '/documentation/build-iapp/guides/manage-access',
-              },
-              {
-                text: 'Inputs and Outputs',
-                link: '/documentation/build-iapp/guides/inputs-and-outputs',
-              },
-              {
-                text: 'Using TDX',
-                link: '/documentation/build-iapp/guides/using-tdx',
-              },
-              {
-                text: 'How to Get and Decrypt Results',
-                link: '/documentation/build-iapp/guides/how-to-get-and-decrypt-results',
-              },
-              {
-                text: 'Debugging',
-                link: '/documentation/build-iapp/guides/debugging',
-              },
-            ],
+            text: 'Types',
+            link: '/references/dataProtector/types',
           },
           {
-            text: '🤖 iApp Generator',
-            link: '/documentation/build-iapp/iapp-generator',
+            text: 'Advanced',
             collapsed: true,
             items: [
               {
-                text: 'Getting Started',
-                link: '/documentation/build-iapp/iapp-generator/getting-started',
+                text: 'Advanced Configuration',
+                link: '/references/dataProtector/advanced/advanced-configuration',
               },
               {
-                text: 'Building your iApp',
-                link: '/documentation/build-iapp/iapp-generator/building-your-iexec-app',
+                text: 'Sharing smart contract',
+                link: '/references/dataProtector/advanced/dps-smart-contract',
               },
               {
-                text: 'Deserialize ProtectedData',
-                link: '/documentation/build-iapp/iapp-generator/deserializer',
+                text: 'Apps whitelist',
+                link: '/references/dataProtector/advanced/apps-whitelist',
                 collapsed: true,
                 items: [
                   {
-                    text: 'getValue',
-                    link: '/documentation/build-iapp/iapp-generator/deserializer/getValue',
+                    text: 'createAddOnlyAppWhitelist',
+                    link: '/references/dataProtector/advanced/apps-whitelist/createAddOnlyAppWhitelist',
+                  },
+                  {
+                    text: 'addAppToAddOnlyAppWhitelist',
+                    link: '/references/dataProtector/advanced/apps-whitelist/addAppToAddOnlyAppWhitelist',
+                  },
+                  {
+                    text: 'getUserAddOnlyAppWhitelist',
+                    link: '/references/dataProtector/advanced/apps-whitelist/getUserAddOnlyAppWhitelist',
                   },
                 ],
               },
             ],
           },
+          {
+            text: 'Migrate from v1 to v2',
+            link: '/references/dataProtector/migrate-from-v1',
+          },
         ],
       },
       {
-        text: 'USE AN iAPP',
+        text: '🤖 iApp Generator',
+        link: '/references/iapp-generator',
         items: [
           {
-            text: '📝 Introduction',
-            link: '/documentation/use-iapp/introduction',
+            text: 'Getting Started',
+            link: '/references/iapp-generator/getting-started',
           },
           {
-            text: '🚀 Getting Started',
-            link: '/documentation/use-iapp/getting-started',
+            text: 'Building your iApp',
+            link: '/references/iapp-generator/building-your-iexec-app',
           },
           {
-            text: '📖 Guides',
+            text: 'Deserialize ProtectedData',
+            link: '/references/iapp-generator/deserializer',
             collapsed: true,
             items: [
               {
-                text: 'Different Ways to Execute an iApp',
-                link: '/documentation/use-iapp/guides/different-ways-to-execute',
-              },
-              {
-                text: 'Add Inputs to the Execution',
-                link: '/documentation/use-iapp/guides/add-inputs-to-execution',
-              },
-              {
-                text: 'Use iApp with Protected Data',
-                link: '/documentation/use-iapp/guides/use-iapp-with-protected-data',
-              },
-              {
-                text: 'Find iApps to Use',
-                link: '/documentation/use-iapp/guides/find-iapps',
-              },
-              {
-                text: 'How to Pay the Executions',
-                link: '/documentation/use-iapp/guides/how-to-pay-executions',
-              },
-            ],
-          },
-          {
-            text: '💰 How to Pay',
-            collapsed: true,
-            items: [
-              {
-                text: 'How to Pay for Web3Mail',
-                link: '/documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail',
-              },
-              {
-                text: 'How to Pay for Web3Telegram',
-                link: '/documentation/use-iapp/how-to-pay/how-to-pay-for-web3telegram',
-              },
-              {
-                text: 'Pricing Considerations',
-                link: '/documentation/use-iapp/how-to-pay/pricing-considerations',
-              },
-              {
-                text: 'Voucher',
-                link: '/documentation/use-iapp/how-to-pay/voucher',
+                text: 'getValue',
+                link: '/references/iapp-generator/deserializer/getValue',
               },
             ],
           },
+        ],
+      },
+      {
+        text: '✉ Web3Mail',
+        link: '/references/web3mail',
+        items: [
           {
-            text: '✉ Web3Mail',
-            link: '/use-iapp/web3mail',
-            collapsed: true,
-            items: [
-              {
-                text: 'Getting Started',
-                link: '/documentation/use-iapp/web3mail/getting-started',
-              },
-              {
-                text: 'Methods',
-                collapsed: true,
-                items: [
-                  {
-                    text: 'fetchMyContacts',
-                    link: '/documentation/use-iapp/web3mail/methods/fetchMyContacts',
-                  },
-                  {
-                    text: 'fetchUserContacts',
-                    link: '/documentation/use-iapp/web3mail/methods/fetchUserContacts',
-                  },
-                  {
-                    text: 'sendEmail',
-                    link: '/documentation/use-iapp/web3mail/methods/sendEmail',
-                  },
-                ],
-              },
-              {
-                text: 'Advanced Configuration',
-                link: '/documentation/use-iapp/web3mail/advanced-configuration',
-              },
-            ],
+            text: 'Getting Started',
+            link: '/references/web3mail/getting-started',
           },
           {
-            text: '💬 Web3Telegram',
-            link: '/documentation/use-iapp/web3telegram',
+            text: 'Methods',
             collapsed: true,
             items: [
               {
-                text: 'Getting Started',
-                link: '/documentation/use-iapp/web3telegram/getting-started',
+                text: 'fetchMyContacts',
+                link: '/references/web3mail/methods/fetchMyContacts',
               },
               {
-                text: 'Methods',
-                collapsed: true,
-                items: [
-                  {
-                    text: 'fetchMyContacts',
-                    link: '/documentation/use-iapp/web3telegram/methods/fetchMyContacts',
-                  },
-                  {
-                    text: 'fetchUserContacts',
-                    link: '/documentation/use-iapp/web3telegram/methods/fetchUserContacts',
-                  },
-                  {
-                    text: 'sendTelegram',
-                    link: '/documentation/use-iapp/web3telegram/methods/sendTelegram',
-                  },
-                ],
+                text: 'fetchUserContacts',
+                link: '/references/web3mail/methods/fetchUserContacts',
               },
               {
-                text: 'Integration Guide',
-                link: '/documentation/use-iapp/web3telegram/integration-guide',
-              },
-              {
-                text: 'Advanced Configuration',
-                link: '/documentation/use-iapp/web3telegram/advanced-configuration',
+                text: 'sendEmail',
+                link: '/references/web3mail/methods/sendEmail',
               },
             ],
           },
-        ],
-      },
-      {
-        text: 'TOOLING & EXPLORERS',
-        items: [
-          {
-            text: 'iExec Explorer',
-            link: '/documentation/tooling-and-explorers/iexec-explorer',
-          },
-          {
-            text: 'Builder Dashboard',
-            link: '/documentation/tooling-and-explorers/builder-dashboard',
-          },
-          {
-            text: 'RLC Bridge',
-            link: '/documentation/tooling-and-explorers/bridge',
-          },
-          {
-            text: 'Subgraph Explorer',
-            link: '/documentation/tooling-and-explorers/subgraph-explorer',
-          },
           {
-            text: 'Blockchain Explorer',
-            link: '/documentation/tooling-and-explorers/blockchain-explorer',
+            text: 'Advanced Configuration',
+            link: '/references/web3mail/advanced-configuration',
           },
         ],
       },
       {
-        text: 'PROTOCOL',
+        text: '💬 Web3Telegram',
+        link: '/references/web3telegram',
         items: [
           {
-            text: '🔧 iExec SDK',
-            link: '/documentation/protocol/sdk',
+            text: 'Getting Started',
+            link: '/references/web3telegram/getting-started',
           },
           {
-            text: '⚙️ Workers & Workerpools',
+            text: 'Methods',
             collapsed: true,
             items: [
               {
-                text: '🚀 Worker Quick Start',
-                link: '/documentation/protocol/worker/quick-start',
+                text: 'fetchMyContacts',
+                link: '/references/web3telegram/methods/fetchMyContacts',
               },
               {
-                text: '🔒 Manage Workerpool Access',
-                link: '/documentation/protocol/worker/manage-access',
-              },
-            ],
-          },
-          {
-            text: '⛓️‍💥 PoCo',
-            collapsed: true,
-            items: [
-              {
-                text: '💸 Pay Per Task Model',
-                link: '/documentation/protocol/poco/pay-per-task',
+                text: 'fetchUserContacts',
+                link: '/references/web3telegram/methods/fetchUserContacts',
               },
               {
-                text: '🛡️ Proof of Contribution',
-                link: '/documentation/protocol/poco/proof-of-contribution',
+                text: 'sendTelegram',
+                link: '/references/web3telegram/methods/sendTelegram',
               },
             ],
           },
           {
-            text: '�📖 Glossary',
-            link: '/documentation/protocol/glossary',
+            text: 'Integration Guide',
+            link: '/references/web3telegram/integration-guide',
+          },
+          {
+            text: 'Advanced Configuration',
+            link: '/references/web3telegram/advanced-configuration',
           },
         ],
       },
+      {
+        text: '🔧 iExec SDK',
+        link: '/references/sdk',
+      },
+      {
+        text: '�📖 Glossary',
+        link: '/references/glossary',
+      },
     ],
-    '/guides/': [],
-    '/references/': [],
   } satisfies DefaultTheme.Sidebar;
 }
diff --git a/README.md b/README.md
index 751fcb44..96b44dc9 100644
--- a/README.md
+++ b/README.md
@@ -169,3 +169,7 @@ Fork this repository and ensure you're working on the `main` branch:
 - Update or add design illustrations based on the new design system
 - Check how to pay guide to update with the launch on Arbitrum (RLC vs xRLC)
 - framework AI supporté TDX vs SGX
+- check glossary
+- migrate github SDK doc here
+- migrate pay-per-task page into a guide
+- check pages (introduction & getting-started) for use-iapp guide
diff --git a/package-lock.json b/package-lock.json
index fabb7040..e84543e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,10 +8,10 @@
       "name": "iexec-documentation",
       "version": "0.0.0",
       "dependencies": {
-        "@iexec/dataprotector": "^2.0.0-beta.17",
+        "@iexec/dataprotector": "^2.0.0-beta.19",
         "@iexec/dataprotector-deserializer": "^0.1.1",
-        "@iexec/web3mail": "^1.2.2",
-        "@iexec/web3telegram": "^0.1.0-alpha.1",
+        "@iexec/web3mail": "^1.5.0",
+        "@iexec/web3telegram": "^0.1.0-alpha.4",
         "@reown/appkit": "^1.7.17",
         "@reown/appkit-adapter-wagmi": "^1.7.17",
         "@tailwindcss/vite": "^4.1.11",
@@ -761,7 +761,9 @@
       }
     },
     "node_modules/@iexec/dataprotector": {
-      "version": "2.0.0-beta.17",
+      "version": "2.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/@iexec/dataprotector/-/dataprotector-2.0.0-beta.19.tgz",
+      "integrity": "sha512-nKfM8H2AGFPmSHt96FhNSOIctqRWyQt34zh9chVeI7PSy6TVFQMnEV4rj1ce+O8yFO9TM/8YXxu+V2izBO00WQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@ethersproject/bytes": "^5.7.0",
@@ -773,7 +775,7 @@
         "debug": "^4.3.4",
         "ethers": "^6.13.2",
         "graphql-request": "^6.0.0",
-        "iexec": "^8.16.0",
+        "iexec": "^8.18.0",
         "jszip": "^3.7.1",
         "kubo-rpc-client": "^4.1.1",
         "magic-bytes.js": "^1.0.15",
@@ -783,6 +785,8 @@
     },
     "node_modules/@iexec/dataprotector-deserializer": {
       "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@iexec/dataprotector-deserializer/-/dataprotector-deserializer-0.1.1.tgz",
+      "integrity": "sha512-CSz1JWnslm2X3gjL1cx/qqovnmvJSFWDyJMw0ZGvqnYnNatgIqHn+Aky2iO4K0HsArfqmgV3ySIpdPfu/N2M0w==",
       "license": "Apache-2.0",
       "dependencies": {
         "borsh": "^2.0.0",
@@ -846,7 +850,9 @@
       }
     },
     "node_modules/@iexec/web3mail": {
-      "version": "1.2.2",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@iexec/web3mail/-/web3mail-1.5.0.tgz",
+      "integrity": "sha512-ohgPocAidWreTOchamwMiuwIt0Nns290vS/KbcLbhOB4ZUDtQGS8V5lES3s9WUZjMvf+bWByN4RQdoaNhgIPAw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@ethersproject/bytes": "^5.7.0",
@@ -854,13 +860,15 @@
         "buffer": "^6.0.3",
         "ethers": "^6.13.2",
         "graphql-request": "^6.1.0",
-        "iexec": "^8.13.1",
+        "iexec": "^8.18.0",
         "kubo-rpc-client": "^4.1.1",
         "yup": "^1.1.1"
       }
     },
     "node_modules/@iexec/web3telegram": {
-      "version": "0.1.0-alpha.1",
+      "version": "0.1.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/@iexec/web3telegram/-/web3telegram-0.1.0-alpha.4.tgz",
+      "integrity": "sha512-JYWjLpV7Ufi8wjlHlwCOYnjHf1oRGh9GycfKuhIq2TZDK4JrEG/tUytMagakn3C9T0UOByrM9DM/hMMoxVcG6A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@ethersproject/bytes": "^5.7.0",
@@ -868,7 +876,7 @@
         "buffer": "^6.0.3",
         "ethers": "^6.8.1",
         "graphql-request": "^6.1.0",
-        "iexec": "^8.13.1",
+        "iexec": "^8.18.0",
         "kubo-rpc-client": "^4.1.3",
         "yup": "^1.1.1"
       }
@@ -7962,7 +7970,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/iexec": {
-      "version": "8.17.0",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/iexec/-/iexec-8.18.0.tgz",
+      "integrity": "sha512-lj2La67p0IKyCHhpV4F2SZD7kmE1AFhGmD26jf8si7/sTelrXun3wNTun6WAOEO9uMi49J0AlA6MxUNBxuCflg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@ensdomains/ens-contracts": "^1.2.5",
diff --git a/package.json b/package.json
index e805e9b9..10d5c266 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
     "format": "prettier --ignore-path .gitignore --write ."
   },
   "dependencies": {
-    "@iexec/dataprotector": "^2.0.0-beta.17",
+    "@iexec/dataprotector": "^2.0.0-beta.19",
     "@iexec/dataprotector-deserializer": "^0.1.1",
-    "@iexec/web3mail": "^1.2.2",
-    "@iexec/web3telegram": "^0.1.0-alpha.1",
+    "@iexec/web3mail": "^1.5.0",
+    "@iexec/web3telegram": "^0.1.0-alpha.4",
     "@reown/appkit": "^1.7.17",
     "@reown/appkit-adapter-wagmi": "^1.7.17",
     "@tailwindcss/vite": "^4.1.11",
diff --git a/src/components/ChainSelector.vue b/src/components/ChainSelector.vue
index fde4a4ea..1a903718 100644
--- a/src/components/ChainSelector.vue
+++ b/src/components/ChainSelector.vue
@@ -68,8 +68,26 @@ const userStore = useUserStore();
 // Data
 const supportedChains = getSupportedChains();
 
+// Default initialization: check first if wallet is connected
+if (!userStore.chainId) {
+  if (chainId.value) {
+    // If wallet is connected, use its chain
+    const walletChain = getChainById(chainId.value);
+    if (walletChain) {
+      userStore.setSelectedChain(walletChain);
+    }
+  } else {
+    // Otherwise, use Bellecour as default
+    const defaultChain = getChainById(0x86); // Bellecour
+    if (defaultChain) {
+      userStore.setSelectedChain(defaultChain);
+    }
+  }
+}
+
 // Computed
 const selectedChain = computed(() => {
+  // Priority: 1. Connected wallet chain, 2. Selected chain in store
   const currentChainId = chainId.value || userStore.chainId;
   return currentChainId ? getChainById(currentChainId) : undefined;
 });
@@ -91,6 +109,7 @@ const selectedChainId = computed({
   },
 });
 
+// Watch to synchronize store with wallet chain
 watch(chainId, (newChainId) => {
   if (newChainId) {
     const chain = getChainById(newChainId);
diff --git a/src/documentation/build-iapp/guides/index.md b/src/documentation/build-iapp/guides/index.md
deleted file mode 100644
index 8fca2266..00000000
--- a/src/documentation/build-iapp/guides/index.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: Build iApp Guides
-description: Complete guide collection for building privacy-first iApps on iExec
----
-
-# 🛠️ Build iApp Guides
-
-Welcome to the complete collection of guides for building privacy-first
-applications on iExec. These guides will walk you through every aspect of
-creating, testing, and deploying confidential iApps.
-
-## 🚀 Getting Started
-
-- **[Build & Deploy](/documentation/build-iapp/guides/build-&-deploy)** - Your
-  first iApp in 15 minutes
-- **[Inputs and Outputs](/documentation/build-iapp/guides/inputs-and-outputs)** -
-  Handle data flow in TEE environment
-- **[Debugging](/documentation/build-iapp/guides/debugging)** - Troubleshoot
-  execution issues
-
-## 🔐 Access Control & Management
-
-- **[Manage Access](/documentation/build-iapp/guides/manage-access)** - Control
-  who can use your iApp
-- **[How to Get and Decrypt Results](/documentation/build-iapp/guides/how-to-get-and-decrypt-results)** -
-  Retrieve and use outputs
-
-## 🧪 Advanced Features
-
-- **[Using TDX (Experimental)](/documentation/build-iapp/guides/using-tdx)** -
-  Next-gen TEE technology
-
-## 📚 What's Next?
-
-After mastering these guides, explore:
-
-- **[iApp Generator](/documentation/build-iapp/iapp-generator)** - Complete
-  development toolkit
-- **[What is an iApp?](/documentation/build-iapp/what-is-iapp)** - Core concepts
-  and TEE overview
-
-Ready to build your first privacy-preserving application? Start with the
-[Build & Deploy](/documentation/build-iapp/guides/build-&-deploy) guide!
diff --git a/src/documentation/use-iapp/guides/index.md b/src/documentation/use-iapp/guides/index.md
deleted file mode 100644
index 8541a822..00000000
--- a/src/documentation/use-iapp/guides/index.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: Use iApp Guides
-description: Complete guide collection for using iApps on the iExec network
----
-
-# 🚀 Use iApp Guides
-
-Welcome to the complete collection of guides for using iApps on the iExec
-network. These guides will help you find, execute, and interact with
-privacy-preserving applications.
-
-## 🔍 Finding & Using iApps
-
-- **[Find iApps](/documentation/use-iapp/guides/find-iapps)** - Discover
-  available applications
-- **[Different Ways to Execute](/documentation/use-iapp/guides/different-ways-to-execute)** -
-  Multiple execution methods
-- **[Use iApp with Protected Data](/documentation/use-iapp/guides/use-iapp-with-protected-data)** -
-  Secure data processing
-
-## 💰 Payment & Execution
-
-- **[How to Pay for Executions](/documentation/use-iapp/guides/how-to-pay-executions)** -
-  Payment methods and costs
-- **[Add Inputs to Execution](/documentation/use-iapp/guides/add-inputs-to-execution)** -
-  Provide data and parameters
-
-## 📧 Communication Apps
-
-- **[Web3Mail](/documentation/use-iapp/web3mail)** - Send encrypted emails
-- **[Web3Telegram](/documentation/use-iapp/web3telegram)** - Send encrypted
-  Telegram messages
-
-## 🆓 Getting Started
-
-- **[Getting Started](/documentation/use-iapp/getting-started)** - Essential
-  steps for beginners
-- **[How to Pay for Web3Mail](/documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail)** -
-  Free email service
-- **[How to Pay for Web3Telegram](/documentation/use-iapp/how-to-pay/how-to-pay-for-web3telegram)** -
-  Free messaging service
-
-## 📚 What's Next?
-
-After mastering these guides, explore:
-
-- **[Data Protector](/documentation/manage-data/dataProtector)** - Protect your
-  own data
-- **[Build iApps](/documentation/build-iapp/what-is-iapp)** - Create your own
-  applications
-
-Ready to start using iApps? Begin with the
-[Getting Started](/documentation/use-iapp/getting-started) guide!
diff --git a/src/documentation/develop-with-ai.md b/src/get-started/develop-with-ai.md
similarity index 100%
rename from src/documentation/develop-with-ai.md
rename to src/get-started/develop-with-ai.md
diff --git a/src/documentation/helloWorld.md b/src/get-started/helloWorld.md
similarity index 94%
rename from src/documentation/helloWorld.md
rename to src/get-started/helloWorld.md
index eb12705c..4b06eb3b 100644
--- a/src/documentation/helloWorld.md
+++ b/src/get-started/helloWorld.md
@@ -7,12 +7,24 @@ description:
 
 <script setup>
 import InfoIcon from '@/components/InfoIcon.vue'
+import ChainSelector from '@/components/ChainSelector.vue'
 </script>
 
 # 👋 Welcome to iExec
 
 > Reading time 🕒 2 mins
 
+<div class="mb-6 p-4 bg-[var(--vp-c-bg-soft)] rounded-lg border border-[var(--vp-c-divider)]">
+  <div class="flex items-center gap-3 mb-3">
+    <span class="text-lg">🌐</span>
+    <h3 class="m-0 text-lg font-medium">Select Your Network</h3>
+  </div>
+  <div class="flex items-center gap-3">
+    <span class="text-sm font-medium">Network:</span>
+    <ChainSelector />
+  </div>
+</div>
+
 <div class="bg-gradient-to-r from-[#fcd15a] to-[#ffad4d] rounded-[6px] px-8 pb-4 text-gray-800 max-w-3xl mx-auto mb-6">
   <h2 class="text-2xl font-bold mt-0 border-none!">Start Your Web3 Privacy Journey</h2>
   <p>And learn how to build Privacy-preserving decentralized applications (dApps) with iExec in this interactive guide.</p>
diff --git a/src/documentation/helloWorld/1-overview.md b/src/get-started/helloWorld/1-overview.md
similarity index 98%
rename from src/documentation/helloWorld/1-overview.md
rename to src/get-started/helloWorld/1-overview.md
index c603ca4d..d416ccc7 100644
--- a/src/documentation/helloWorld/1-overview.md
+++ b/src/get-started/helloWorld/1-overview.md
@@ -85,7 +85,7 @@ Computing</a></span> technologies.
 
 iExec combines three fundamental elements that work together seamlessly:
 
-#### 1. Protect Data with our Devtool [DataProtector](/documentation/manage-data/dataProtector/getting-started)
+#### 1. Protect Data with our Devtool [DataProtector](/references/dataProtector/getting-started)
 
 - Encrypt your sensitive data and store it securely on Arweave or IPFS
 - Only you control who can access it and when
diff --git a/src/documentation/helloWorld/2-protectData.md b/src/get-started/helloWorld/2-protectData.md
similarity index 94%
rename from src/documentation/helloWorld/2-protectData.md
rename to src/get-started/helloWorld/2-protectData.md
index af4b0ae8..b7e7903d 100644
--- a/src/documentation/helloWorld/2-protectData.md
+++ b/src/get-started/helloWorld/2-protectData.md
@@ -45,10 +45,6 @@ their dApps with these key features:
   Features an SDK for easy integration into your DApp, enhancing functionality
   and user experience.
 
-<div class="bg-gradient-to-r from-fuchsia-400/10 to-fuchsia-400/5 rounded-[6px] p-6 border-l-4 border-fuchsia-700 mb-6">
-  <p class="m-0!">DataProtector interacts with iExec's <a href="https://chainlist.org/?search=bellecour" target="_blank">Bellecour sidechain</a>, which is gasless, meaning you can use it completely free without needing any tokens!</p>
-</div>
-
 ## 🧩 Let's Create Protected Data
 
 <ProtectData />
diff --git a/src/documentation/helloWorld/3-buildIApp.md b/src/get-started/helloWorld/3-buildIApp.md
similarity index 53%
rename from src/documentation/helloWorld/3-buildIApp.md
rename to src/get-started/helloWorld/3-buildIApp.md
index 31538fe8..849e9c17 100644
--- a/src/documentation/helloWorld/3-buildIApp.md
+++ b/src/get-started/helloWorld/3-buildIApp.md
@@ -9,13 +9,9 @@ description:
 
 > Reading time 🕒 10 mins
 
-<script setup>
-import InfoIcon from '@/components/InfoIcon.vue'
-</script>
-
 <div class="bg-gradient-to-r from-[#fcd15a] to-[#ffad4d] rounded-[6px] px-8 pb-4 text-gray-800 max-w-3xl mx-auto mb-6">
   <h2 class="text-2xl font-bold mt-0 border-none!">Time to build!</h2>
-  <p>Let's build an iApp that can process protected data in a secure environment using the <a href="/documentation/build-iapp/iapp-generator" target="_blank">iExec iApp generator tool</a>. This tool helps you create, test and deploy iApps with just a few commands.</p>
+  <p>Let's build an iApp that can process protected data in a secure environment using the <a href="/references/iapp-generator" target="_blank" class="!text-gray-900 !font-bold underline hover:!text-black">iExec iApp generator tool</a>. This tool helps you create, test and deploy iApps with just a few commands.</p>
 </div>
 
 If you wanna explore and deep dive in the CLI. You can check the
@@ -63,23 +59,23 @@ Here are some popular use cases:
 Send privacy-preserving emails to registered Ethereum account holders without
 knowing or storing their email addresses.
 [Github](https://github.com/iExecBlockchainComputing/web3mail-sdk/tree/main/dapp)
-| [Documentation](../use-iapp/web3mail)
+| [Documentation](/references/web3mail)
 
 ### 💬 Web3 Telegram
 
 Send privacy-preserving Telegram messages without knowing or storing their
 Telegram handles.
 [Github](https://github.com/iExecBlockchainComputing/web3telegram-sdk/tree/main/dapp)
-| [Documentation](../use-iapp/web3telegram)
+| [Documentation](/references/web3telegram)
 
 ### 🌐 Content Delivery
 
 Transfer, sell or rent protected content to authorized users.
 [Github](https://github.com/iExecBlockchainComputing/dataprotector-sdk/tree/main/packages/protected-data-delivery-dapp)
-| [Documentation](/documentation/manage-data/dataProtector/dataProtectorSharing)
+| [Documentation](/references/dataProtector/dataProtectorSharing)
 
 <div class="bg-gradient-to-r from-fuchsia-400/10 to-fuchsia-400/5 rounded-[6px] p-6 border-l-4 border-fuchsia-700 mb-6">
-  <p class="m-0!">These are just a few examples, the possibilities are endless. Want to explore iApp Generator? Check out our <a href="/documentation/build-iapp/iapp-generator" target="_blank">documentation</a> and see what you can build!</p>
+  <p class="m-0!">These are just a few examples, the possibilities are endless. Want to explore iApp Generator? Check out our <a href="/references/iapp-generator" target="_blank">documentation</a> and see what you can build!</p>
 </div>
 
 ## 💾 Installation (Win / Mac / Linux)
@@ -130,19 +126,53 @@ iapp init
 
 You will be prompted with the following message:
 
-```txt
-  ___    _    ____  ____
- |_ _|  / \  |  _ \|  _ \
-  | |  / _ \ | |_) | |_) |
-  | | / ___ \|  __/|  __/
- |___/_/   \_\_|   |_|
-
-✔ What's your project name? (A folder with this name will be created) … hello-world
-✔ Which language do you want to use? › JavaScript
-? What kind of project do you want to init? › - Use arrow-keys. Return to submit.
-❯   Hello World - iapp quick start
-    advanced
-```
+<CLIDemo
+  initialCommand="iapp init"
+  asciiText="iApp"
+  :steps="[
+    {
+      showAt: 2,
+      completeAt: 4,
+      question: 'What is your project name? (A folder with this name will be created)',
+      answer: 'hello-world',
+      showTyping: true,
+      isComplete: false
+    },
+    {
+      showAt: 4,
+      completeAt: 6,
+      question: 'Which language do you want to use?',
+      answer: 'JavaScript',
+      options: [
+        { label: 'JavaScript', selected: true },
+        { label: 'Python', selected: false }
+      ],
+      highlighted: false,
+      isComplete: false
+    },
+    {
+      showAt: 6,
+      completeAt: 8,
+      question: 'What kind of project do you want to init?',
+      answer: 'Hello World',
+      options: [
+        { label: 'Hello World - iapp quick start', selected: true },
+        { label: 'advanced', selected: false }
+      ],
+      highlighted: false,
+      isComplete: false
+    }
+  ]"
+  :completionStep="8"
+  :completionMessage="'Generating your iApp...'"
+  :completionItems="[
+    '📁 Created hello-world/',
+    '📄 Added package.json',
+    '🐳 Added Dockerfile',
+    '⚙️ Added iExec configuration'
+  ]"
+  :successMessage="'Your iApp is ready!'"
+/>
 
 <div class="flex flex-col gap-2.5 my-6">
   <div class="flex items-center gap-3">
@@ -151,10 +181,6 @@ You will be prompted with the following message:
   </div>
 </div>
 
-```txt
-? What's your project name? (A folder with this name will be created) ...
-```
-
 <div class="flex flex-col gap-2.5 my-6">
   <div class="flex items-center gap-3">
     <span class="bg-gray-950 text-sm text-white w-6 h-6 rounded-full flex items-center justify-center font-medium">2</span>
@@ -162,12 +188,6 @@ You will be prompted with the following message:
   </div>
 </div>
 
-```txt
-? Which language do you want to use? › - Use arrow-keys. Return to submit.
-❯   JavaScript
-    Python
-```
-
 <div class="flex flex-col gap-2.5 my-6">
   <div class="flex items-center gap-3">
     <span class="bg-gray-950 text-sm text-white w-6 h-6 rounded-full flex items-center justify-center font-medium">3</span>
@@ -175,22 +195,10 @@ You will be prompted with the following message:
   </div>
 </div>
 
-```txt
-? What kind of project do you want to init? › - Use arrow-keys. Return to submit.
-❯   Hello World - iapp quick start
-    advanced
-```
-
 <div class="bg-gradient-to-r from-fuchsia-400/10 to-fuchsia-400/5 rounded-[6px] p-6 border-l-4 border-fuchsia-700 mb-6">
   <p class="m-0!">We recommend selecting <span class="text-fuchsia-700 font-semibold">"Hello World"</span> to quickly discover how iApp works! use <span class="text-fuchsia-700 font-semibold">advanced</span> only if you are familiar with iExec.</p>
 </div>
 
-```txt
-✔ [Chosen language] app setup complete.
-✔ Generated ethereum wallet (0xD4A28d.........................)
-
-```
-
 - An iApp project is setup with the selected language
 - An ethereum wallet has been created (we use it to sign the iApp creation
   onchain)
@@ -199,26 +207,87 @@ You will be prompted with the following message:
 
 ## 🧪 Test your iApp
 
-To test your iApp, run `iapp test` command
-
-```sh
-iapp test
-```
-
-It uses your local docker to build and execute the app.
+To test your iApp, run the `iapp test` command. This will build a Docker image
+and run your application locally to simulate the TEE environment. You'll see the
+following steps:
+
+<CLIDemo
+  initialCommand="iapp test"
+  :steps="[
+    {
+      showAt: 2,
+      question: 'No app secret is configured (from iapp.config.json)',
+      answer: '',
+      showTyping: false,
+      isComplete: true
+    },
+    {
+      showAt: 3,
+      question: 'App docker image built (sha256:9cc0de820aaaf8f86700a3ec4082fe69b9e9a48a117ebb0ade0d82d0879cbe41)',
+      answer: '',
+      showTyping: false,
+      isComplete: true
+    },
+    {
+      showAt: 4,
+      question: 'App docker image ran and exited successfully.',
+      answer: '',
+      showTyping: false,
+      isComplete: true
+    },
+    {
+      showAt: 5,
+      completeAt: 6,
+      question: 'Would you like to see the app logs? (12 lines)',
+      answer: 'no',
+      options: [
+        { label: 'yes', selected: false },
+        { label: 'no', selected: true }
+      ],
+      highlighted: false,
+      showTyping: false,
+      isComplete: false
+    },
+    {
+      showAt: 7,
+      question: 'Checked app output',
+      answer: '',
+      showTyping: false,
+      isComplete: true
+    },
+    {
+      showAt: 8,
+      completeAt: 10,
+      question: 'Would you like to see the result? (View ./output/)',
+      answer: 'yes',
+      options: [
+        { label: 'yes', selected: true },
+        { label: 'no', selected: false }
+      ],
+      highlighted: false,
+      showTyping: false,
+      isComplete: false
+    }
+  ]"
+  :completionStep="11"
+  :completionMessage="'📁 output directory content:'"
+  :completionItems="[
+    '└ computed.json',
+    '└ result.txt'
+  ]"
+  :successMessage="'hello world'"
+  :autoRestart="true"
+/>
+
+The `iapp test` command uses your local Docker to build and execute the app,
+simulating how it will run in the iExec network's TEE environment.
 
 <div class="bg-gradient-to-r from-fuchsia-400/10 to-fuchsia-400/5 rounded-[6px] p-6 border-l-4 border-fuchsia-700 mb-6">
-  <p class="m-0!">- If you have <code>Error: Docker daemon is not accessible</code> Make sure Docker is installed and running.</p>
-  <br>
-  <p class="m-0!">- If you have <code>Error: Failed to locate iApp project root</code> error:  Ensure you are in your project folder before proceeding.</p>
+  <p class="m-0!"><strong>Common Issues:</strong></p>
+  <p class="m-0!">- If you get <code>Error: Docker daemon is not accessible</code>: Make sure Docker is installed and running.</p>
+  <p class="m-0!">- If you get <code>Error: Failed to locate iApp project root</code>: Ensure you are in your project folder before proceeding.</p>
 </div>
 
-You can see the output of the computation by saying yes to the question:
-
-```txt
-? Would you like to see the result? (View ./output/) (Y/n)
-```
-
 ### 🧩 Using Arguments
 
 You can pass arguments to your iApp using the `--args` option. This allows you
@@ -272,12 +341,33 @@ Deploy your iApp on the iExec protocol.
   </div>
 </div>
 
-Once you have your token, you can deploy your iApp using the following command:
-
-```sh
-# You need your username and the access token (it can take a few minutes to deploy)
-iapp deploy
-```
+Once you have your token, you can deploy your iApp.
+
+<template v-if="selectedChain === 42161">
+  <CLIDemo
+    initialCommand="iapp deploy --chain arbitrum-mainnet"
+    asciiText="Deploy"
+    :steps="arbitrumSteps"
+    :completionStep="15"
+    :completionMessage="'Deployment of your iApp completed successfully:'"
+    :completionItems="arbitrumCompletionItems"
+    :successMessage="'Run iapp run 0x1f80DCebc2EAAff0Db7156413C43B7e88D189923 to execute your iApp on an iExec TEE worker'"
+    :autoRestart="true"
+  />
+</template>
+
+<template v-else>
+  <CLIDemo
+    initialCommand="iapp deploy"
+    asciiText="Deploy"
+    :steps="bellecourSteps"
+    :completionStep="14"
+    :completionMessage="'Deployment of your iApp completed successfully:'"
+    :completionItems="bellecourCompletionItems"
+    :successMessage="'Run iapp run 0x1f80DCebc2EAAff0Db7156413C43B7e88D189923 to execute your iApp on an iExec TEE worker'"
+    :autoRestart="true"
+  />
+</template>
 
 <div class="bg-gradient-to-r from-fuchsia-400/10 to-fuchsia-400/5 rounded-[6px] p-6 border-l-4 border-fuchsia-700 mb-6">
   <p class="m-0!">📝 Make sure to save your <span class="text-fuchsia-700 font-semibold">iApp address</span> after deployment - you'll need it later!</p>
@@ -322,3 +412,173 @@ protocol documentation [here](https://protocol.docs.iex.ec/).
 <div class="bg-gradient-to-r from-green-400/10 to-green-400/5 rounded-[6px] p-6 border-l-4 border-green-600 mb-6">
   <p class="m-0!">Next up: Alice will learn how to authorize the iApp and Bob to access and use her protected data!  🚀</p>
 </div>
+
+<script setup>
+import InfoIcon from '@/components/InfoIcon.vue'
+import CLIDemo from '@/components/CLIDemo.vue';
+import { computed } from 'vue';
+import useUserStore from '@/stores/useUser.store';
+
+const userStore = useUserStore();
+const selectedChain = computed(() => userStore.getCurrentChainId());
+
+const arbitrumSteps = [
+  {
+    showAt: 2,
+    question: 'Using chain arbitrum-mainnet',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 3,
+    question: 'This method requires sending blockchain transactions, transaction fees will be applied. Would you like to continue?',
+    answer: 'Yes',
+    options: [
+      { label: 'Yes', selected: true },
+      { label: 'no', selected: false }
+    ],
+    highlighted: false,
+    showTyping: false,
+    isComplete: false
+  },
+  {
+    showAt: 4,
+    question: 'Using saved walletPrivateKey (from iapp.config.json)',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 5,
+    completeAt: 7,
+    question: 'What is your username on DockerHub? (It will be used to properly tag the Docker image)',
+    answer: 'bob',
+    showTyping: true,
+    isComplete: false
+  },
+  {
+    showAt: 7,
+    completeAt: 9,
+    question: 'What is your DockerHub access token?',
+    answer: '**********************',
+    showTyping: true,
+    isComplete: false
+  },
+  {
+    showAt: 9,
+    completeAt: 11,
+    question: 'What is the version of your iApp?',
+    answer: '0.0.1',
+    showTyping: true,
+    isComplete: false
+  },
+  {
+    showAt: 11,
+    question: 'Docker image built (sha256:a53fc4c480f482c384a13266ea2cb6cc5572733c866c44a5f604f4bfab3a744a) and tagged bob/hello-world:0.0.1',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 12,
+    question: 'Pushed image bob/hello-world:0.0.1 on dockerhub',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 13,
+    question: 'Pushed TEE image bob/hello-world:0.0.1-tee-scone-5.9.1-v16-debug-ce3a01d9c5d7 on dockerhub',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 14,
+    question: 'TEE app deployed',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  }
+];
+
+const bellecourSteps = [
+  {
+    showAt: 2,
+    question: 'Using chain bellecour',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 3,
+    question: 'Using saved walletPrivateKey (from iapp.config.json)',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 4,
+    completeAt: 6,
+    question: 'What is your username on DockerHub? (It will be used to properly tag the Docker image)',
+    answer: 'bob',
+    showTyping: true,
+    isComplete: false
+  },
+  {
+    showAt: 6,
+    completeAt: 8,
+    question: 'What is your DockerHub access token?',
+    answer: '**********************',
+    showTyping: true,
+    isComplete: false
+  },
+  {
+    showAt: 8,
+    completeAt: 10,
+    question: 'What is the version of your iApp?',
+    answer: '0.0.1',
+    showTyping: true,
+    isComplete: false
+  },
+  {
+    showAt: 10,
+    question: 'Docker image built (sha256:a53fc4c480f482c384a13266ea2cb6cc5572733c866c44a5f604f4bfab3a744a) and tagged bob/hello-world:0.0.1',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 11,
+    question: 'Pushed image bob/hello-world:0.0.1 on dockerhub',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 12,
+    question: 'Pushed TEE image bob/hello-world:0.0.1-tee-scone-5.9.1-v16-debug-ce3a01d9c5d7 on dockerhub',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  },
+  {
+    showAt: 13,
+    question: 'TEE app deployed',
+    answer: '',
+    showTyping: false,
+    isComplete: true
+  }
+];
+
+const arbitrumCompletionItems = [
+  '└ Docker image: bob/hello-world:0.0.1-tee-scone-5.9.1-v16-debug-ce3a01d9c5d7',
+  '└ iApp address: 0x1f80DCebc2EAAff0Db7156413C43B7e88D189923'
+];
+
+const bellecourCompletionItems = [
+  '└ Docker image: bob/hello-world:0.0.1-tee-scone-5.9.1-v16-debug-ce3a01d9c5d7',
+  '└ iApp address: 0x1f80DCebc2EAAff0Db7156413C43B7e88D189923'
+];
+</script>
diff --git a/src/documentation/helloWorld/4-manageDataAccess.md b/src/get-started/helloWorld/4-manageDataAccess.md
similarity index 98%
rename from src/documentation/helloWorld/4-manageDataAccess.md
rename to src/get-started/helloWorld/4-manageDataAccess.md
index 6ec51501..7addca54 100644
--- a/src/documentation/helloWorld/4-manageDataAccess.md
+++ b/src/get-started/helloWorld/4-manageDataAccess.md
@@ -115,7 +115,7 @@ Want to see it in action? Check out our
 - Track your earnings
 
 For more technical details, see the
-[DataProtector Sharing](/documentation/manage-data/dataProtector/dataProtectorSharing)
+[DataProtector Sharing](/references/dataProtector/dataProtectorSharing)
 documentation.
 
 <div class="bg-gradient-to-r from-green-400/10 to-green-400/5 rounded-[6px] p-6 border-l-4 border-green-600 mb-6">
diff --git a/src/documentation/helloWorld/5-bonusChapter.md b/src/get-started/helloWorld/5-bonusChapter.md
similarity index 91%
rename from src/documentation/helloWorld/5-bonusChapter.md
rename to src/get-started/helloWorld/5-bonusChapter.md
index fba85313..1c04bd22 100644
--- a/src/documentation/helloWorld/5-bonusChapter.md
+++ b/src/get-started/helloWorld/5-bonusChapter.md
@@ -5,11 +5,6 @@ description:
   Hello World tutorial series.
 ---
 
-<script setup>
-import CouponCode from '../../modules/helloWorld/CouponCode.vue';
-import Button from '@/components/ui/Button.vue';
-</script>
-
 # 🎉 Bonus Chapter
 
 > Reading time 🕒 4 mins
@@ -37,7 +32,8 @@ import Button from '@/components/ui/Button.vue';
   <p class="m-0!">Need help setting up or got some questions? Join our <a target="_blank" href="https://discord.gg/6yrgRH6ATD" class="text-green-700 underline hover:text-green-900">Discord Community</a> for support!</p>
 </div>
 
-## 🎁 Claim your Voucher
+<template v-if="selectedChain !== 42161">
+<h2>🎁 Claim your Voucher</h2>
 
 <div class="mb-6">
   <h3 class="text-xl font-semibold mb-2">What is a Voucher?</h3>
@@ -59,3 +55,14 @@ import Button from '@/components/ui/Button.vue';
 <div class="bg-gradient-to-r from-green-400/10 to-green-400/5 rounded-[6px] p-6 border-l-4 border-green-600 mt-8 mb-6">
   <p class="m-0!">Thank you for being part of the iExec journey! We can't wait to see what you'll build next! 🚀</p>
 </div>
+</template>
+
+<script setup>
+import CouponCode from '../../modules/helloWorld/CouponCode.vue';
+import Button from '@/components/ui/Button.vue';
+import useUserStore from '@/stores/useUser.store';
+import { computed } from 'vue';
+
+const userStore = useUserStore();
+const selectedChain = computed(() => userStore.getCurrentChainId());
+</script>
diff --git a/src/documentation/build-iapp/what-is-iapp.md b/src/get-started/overview/what-is-iapp.md
similarity index 57%
rename from src/documentation/build-iapp/what-is-iapp.md
rename to src/get-started/overview/what-is-iapp.md
index 25260129..06f051fe 100644
--- a/src/documentation/build-iapp/what-is-iapp.md
+++ b/src/get-started/overview/what-is-iapp.md
@@ -7,8 +7,8 @@ description: Privacy-first applications that run on decentralized infrastructure
 
 An iExec Application (iApp) is your regular application code (Python script, AI
 model, data processor, ...) that can securely process protected data (created by
-[DataProtector](/documentation/manage-data/dataProtector)) inside a confidential
-computing environment called TEE (a Trusted Execution Environment).
+[DataProtector](/references/dataProtector)) inside a confidential computing
+environment called TEE (a Trusted Execution Environment).
 
 ## Why iApps Matter ?
 
@@ -99,105 +99,63 @@ guarantees** that privacy is preserved within the TEE execution environment.
 
 ## Use Cases
 
-<div class="grid grid-cols-1 md:grid-cols-2 gap-6 my-6">
-  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-6 flex flex-col gap-2">
-    <div class="flex items-baseline gap-2 text-lg">
-      <span>📧</span>
-      <h3 class="font-semibold m-0!">Private Communication</h3>
-    </div>
-    <p class="text-sm m-0!">Users send emails, notifications, or messages using their protected contact lists without exposing recipient information.</p>
+<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
+  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-4">
+    <h4 class="text-lg font-semibold mb-2">🏥 Healthcare</h4>
+    <p class="text-sm m-0">Process medical data for AI diagnosis without exposing patient information</p>
   </div>
-
-  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-6 flex flex-col gap-2">
-    <div class="flex items-baseline gap-2 text-lg">
-      <span>🔮</span>
-      <h3 class="font-semibold m-0!">Trustworthy Oracles</h3>
-    </div>
-    <p class="text-sm m-0!">Users contribute real data to oracles while keeping their private information confidential.</p>
+  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-4">
+    <h4 class="text-lg font-semibold mb-2">💰 Finance</h4>
+    <p class="text-sm m-0">Analyze financial data for credit scoring while maintaining privacy</p>
   </div>
-
-  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-6 flex flex-col gap-2">
-    <div class="flex items-baseline gap-2 text-lg">
-      <span>🤖</span>
-      <h3 class="font-semibold m-0!">Personal AI Assistants</h3>
-    </div>
-    <p class="text-sm m-0!">Users let AI models perform actions based on their private data - trading, scheduling, recommendations...</p>
+  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-4">
+    <h4 class="text-lg font-semibold mb-2">🎬 Media</h4>
+    <p class="text-sm m-0">Content recommendation engines that don't track user behavior</p>
   </div>
-
-  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-6 flex flex-col gap-2">
-    <div class="flex items-baseline gap-2 text-lg">
-      <span>⚡</span>
-      <h3 class="font-semibold m-0!">Automated Actions</h3>
-    </div>
-      <p class="text-sm m-0!">Users let AI models perform actions based on their private data - trading, scheduling, recommendations...</p>
+  <div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-4">
+    <h4 class="text-lg font-semibold mb-2">🔬 Research</h4>
+    <p class="text-sm m-0">Collaborative research on sensitive datasets across institutions</p>
   </div>
 </div>
 
-## ❓ Frequently Asked Questions
-
-::: details 📦 What can I build with iApps?
-
-Anything that runs in Docker! AI models, data processing scripts, web scrapers,
-image processing, financial calculations, etc. If it runs in a container, it can
-be an iApp.
-
-:::
-
-::: details ⚡How fast are iApps?
-
-Initial task scheduling takes a few seconds (depending on the resources the
-worker download, congestion etc), then your code runs at normal speed depending
-on complexity.
-
-:::
+## Getting Started
 
-::: details 🛡️ Are iApps really secure?
-
-Yes! Code runs in Intel SGX or TDX secure enclaves. Even the worker running your
-iApp can't see what's happening inside the enclave.
+<div class="bg-gradient-to-r from-[#fcd15a] to-[#ffad4d] rounded-[6px] px-8 pb-4 text-gray-800 max-w-3xl mx-auto mb-6">
+  <h2 class="text-2xl font-bold mt-0 border-none!">Time to build!</h2>
+  <p>Let's build an iApp that can process protected data in a secure environment using the <a href="/references/iapp-generator" target="_blank" class="!text-gray-900 !font-bold underline hover:!text-black">iExec iApp generator tool</a>. This tool helps you create, test and deploy iApps with just a few commands.</p>
+</div>
 
-:::
+### Quick Start Path
 
-::: details 🚀 How do I deploy my first iApp?
+1. **Protect your data** with [DataProtector](/references/dataProtector)
+2. **Build your iApp** using the [iApp Generator](/references/iapp-generator)
+3. **Deploy and test** your application
+4. **Process protected data** securely
 
-Try our [Hello World](/documentation/helloWorld) for a quick start, or check the
-[iApp Generator](/documentation/build-iapp/iapp-generator) section for detailed
-instructions.
+### What You'll Learn
 
-:::
+- How to create a Docker container for your application
+- How to handle inputs and outputs securely
+- How to deploy to the iExec network
+- How to process protected data in TEE environments
 
-::: details 🔧 What programming languages are supported?
+<div class="bg-gradient-to-r from-fuchsia-400/10 to-fuchsia-400/5 rounded-[6px] p-6 border-l-4 border-fuchsia-700 mb-6">
+  <p class="m-0!">These are just a few examples, the possibilities are endless. Want to explore iApp Generator? Check out our <a href="/references/iapp-generator" target="_blank">documentation</a> and see what you can build!</p>
+</div>
 
-iApps can be built in any language that runs in Docker (Python, JavaScript, R,
-Java, Go, etc.). However, **iApp Generator** currently supports only Python and
-Node.js for simplified development.
+## Technical Requirements
 
-:::
+- **Docker**: Your application must be containerized
+- **Input/Output**: Define clear input and output schemas
+- **TEE Compatibility**: Ensure your code runs in secure enclaves
+- **Network Access**: Configure any external API calls or dependencies
 
 ## Next Steps
 
-<div class="bg-[var(--vp-c-bg-soft)] rounded-[6px] p-6 mb-6">
-
-<div class="flex flex-col gap-4">
-  <div class="flex items-start gap-3">
-    <div>📚</div>
-    <div>
-      Learn More - iApp Generator:
-      <a href="/documentation/build-iapp/iapp-generator">Complete DataProtector Documentation</a>
-    </div>
-  </div>
-  <div class="flex items-start gap-3">
-    <div>🚀</div>
-    <div>
-      Getting Started - deploy your first iApp:
-      <a href="/documentation/build-iapp/guides/build-&-deploy">DataProtector Quick Start Guide</a>
-    </div>
-  </div>
-</div>
-
-</div>
-
----
+Ready to build your first privacy-preserving application? Start with our
+[Hello World tutorial](/get-started/helloWorld) or dive into the
+[iApp Generator documentation](/references/iapp-generator).
 
-**TL;DR**: iApps = Your code + Secure execution + User privacy + Verifiable
-results. Cloud computing, but nobody can spy on your stuff. 🔒
+For more technical details, see the
+[DataProtector Sharing](/references/dataProtector/dataProtectorSharing)
+documentation.
diff --git a/src/get-started/overview/what-is-iexec.md b/src/get-started/overview/what-is-iexec.md
new file mode 100644
index 00000000..11f43eb5
--- /dev/null
+++ b/src/get-started/overview/what-is-iexec.md
@@ -0,0 +1,57 @@
+---
+title: What is iExec?
+description:
+  Learn about iExec, the decentralized computing platform that enables
+  privacy-preserving applications
+---
+
+# What is iExec?
+
+iExec is a **decentralized computing platform** that enables developers to build
+and deploy privacy-preserving applications using confidential computing
+technology.
+
+## 🎯 **Mission**
+
+iExec's mission is to democratize access to **confidential computing** by
+providing a decentralized infrastructure that combines:
+
+- **🔐 Privacy Protection** - Data remains encrypted during computation
+- **⚡ Scalable Computing** - Access to distributed computing resources
+- **💰 Monetization** - Fair compensation for computing providers
+- **🌐 Decentralization** - No single point of failure or control
+
+## 🏗️ **Core Architecture**
+
+### **Three Main Components:**
+
+1. **🤖 iApps (iExec Applications)**
+   - Confidential computing applications
+   - Run in secure enclaves (TEEs)
+   - Process encrypted data without exposing it
+
+2. **🔐 DataProtector**
+   - End-to-end encryption solution
+   - Manage data access and sharing
+   - Monetize protected datasets
+
+3. **⚙️ Worker Network**
+   - Distributed computing providers
+   - Execute iApps securely
+   - Earn RLC tokens for contributions
+
+## 🚀 **Key Features**
+
+- **TEE (Trusted Execution Environment)** support
+- **Zero-knowledge computation**
+- **Decentralized marketplace** for computing resources
+- **RLC token** for payments and governance
+- **Cross-chain compatibility**
+
+## 🔗 **Get Started**
+
+Ready to explore iExec? Check out:
+
+- [What is Protected Data?](/get-started/overview/what-is-protected-data)
+- [What is an iApp?](/get-started/overview/what-is-iapp)
+- [Hello World Tutorial](/get-started/helloWorld)
diff --git a/src/documentation/manage-data/what-is-protected-data.md b/src/get-started/overview/what-is-protected-data.md
similarity index 94%
rename from src/documentation/manage-data/what-is-protected-data.md
rename to src/get-started/overview/what-is-protected-data.md
index c768cf78..b77571da 100644
--- a/src/documentation/manage-data/what-is-protected-data.md
+++ b/src/get-started/overview/what-is-protected-data.md
@@ -196,13 +196,13 @@ monetize their data within the Web3 ecosystem.
     <div class="flex items-start gap-3">
       <span class="text-xl">📚</span>
       <div>
-        <strong>Learn More:</strong> <a href="/documentation/manage-data/guides/manage-access" class="text-fuchsia-700 hover:text-fuchsia-600">Complete DataProtector Documentation</a>
+        <strong>Learn More:</strong> <a href="/guides/manage-data/manage-access" class="text-fuchsia-700 hover:text-fuchsia-600">Complete DataProtector Documentation</a>
       </div>
     </div>
     <div class="flex items-start gap-3">
       <span class="text-xl">🚀</span>
       <div>
-        <strong>Getting Started:</strong> <a href="/documentation/manage-data/dataProtector/getting-started" class="text-fuchsia-700 hover:text-fuchsia-600">DataProtector Quick Start Guide</a>
+        <strong>Getting Started:</strong> <a href="/references/dataProtector/getting-started" class="text-fuchsia-700 hover:text-fuchsia-600">DataProtector Quick Start Guide</a>
       </div>
     </div>
   </div>
diff --git a/src/get-started/overview/what-is-workerpool.md b/src/get-started/overview/what-is-workerpool.md
new file mode 100644
index 00000000..3ef69aa9
--- /dev/null
+++ b/src/get-started/overview/what-is-workerpool.md
@@ -0,0 +1,11 @@
+---
+title: What is a Workerpool?
+description:
+  Learn about workerpools in iExec - the computing resources that execute iApps
+---
+
+# What is a Workerpool?
+
+This page is under development.
+
+<!-- TODO: Add comprehensive explanation of workerpools in iExec -->
diff --git a/src/documentation/protocol/poco/pay-per-task.md b/src/get-started/protocol/pay-per-task.md
similarity index 100%
rename from src/documentation/protocol/poco/pay-per-task.md
rename to src/get-started/protocol/pay-per-task.md
diff --git a/src/documentation/protocol/poco/proof-of-contribution.md b/src/get-started/protocol/proof-of-contribution.md
similarity index 99%
rename from src/documentation/protocol/poco/proof-of-contribution.md
rename to src/get-started/protocol/proof-of-contribution.md
index 821073b3..f8a9ca83 100644
--- a/src/documentation/protocol/poco/proof-of-contribution.md
+++ b/src/get-started/protocol/proof-of-contribution.md
@@ -76,7 +76,7 @@ consensus on a given result. Its logic is detailed in two blog articles:
 
 The
 [nominal workflow](https://github.com/iExecBlockchainComputing/iexec-doc/raw/master/techreport/nominalworkflow-ODB.png)
-is also available in the [technical report section](../glossary.md)
+is also available in the [technical report section](/references/glossary)
 
 Below are the details of the implementations:
 
@@ -621,21 +621,21 @@ Orders compatibility required:
 
 **1. The worker pool’s category and the requester’s category must be equal.**
 
-```sol
+```text
 require(_requestorder.category == _workerpoolorder.category);
 ```
 
 **2. The worker pool’s trust must be greater or equal to the requester’s
 trust.**
 
-```sol
+```text
 require(_requestorder.trust == _workerpoolorder.trust);
 ```
 
 **3. The app’s, dataset’s and worker pool’s prices must be less or equal to the
 requester’s appmaxprice, datasetmaxprice and workerpoolmaxprice.**
 
-```sol
+```text
 require(_requestorder.appmaxprice >= _apporder.appprice);
 require(_requestorder.datasetmaxprice >= _datasetorder.datasetprice);
 require(_requestorder.workerpoolmaxprice >= _workerpoolorder.workerpoolprice);
@@ -644,42 +644,42 @@ require(_requestorder.workerpoolmaxprice >= _workerpoolorder.workerpoolprice);
 **4. The worker pool’s tag must enable all the features required by the app’s
 tag, the dataset’s tag and the worker pool’s tag.**
 
-```sol
+```text
 require(tag & ~_workerpoolorder.tag == 0x0);
 require(tag & ~_workerpoolorder.tag == 0x0);
 ```
 
 **5. If TEE tag is required, then application must be TEE compatible.**
 
-```sol
+```text
 require((tag ^ _apporder.tag)[31] & 0x01 == 0x0);
 ```
 
 **6. The app provided by the apporder must match the one required by the
 requester.**
 
-```sol
+```text
 require(_requestorder.app == _apporder.app);
 ```
 
 **7. The dataset provided by the datasetorder must match the one required by the
 requester.**
 
-```sol
+```text
 require(_requestorder.dataset == _datasetorder.dataset);
 ```
 
 **8. If the requester specified a worker pool restriction, the worker pool must
 match this value or be part of the corresponding group.**
 
-```sol
+```text
 require(_checkIdentity(_requestorder.workerpool, _workerpoolorder.workerpool, GROUPMEMBER_PURPOSE));
 ```
 
 **9. The application must fit the dataset’s and the worker pool’s application
 restrictions (if any).**
 
-```sol
+```text
 require(_checkIdentity(_datasetorder.apprestrict, _apporder.app, GROUPMEMBER_PURPOSE));
 require(_checkIdentity(_workerpoolorder.apprestrict, _apporder.app, GROUPMEMBER_PURPOSE));
 ```
@@ -687,7 +687,7 @@ require(_checkIdentity(_workerpoolorder.apprestrict, _apporder.app, GROUPMEMBER_
 **10. The dataset must fit the application’s and the worker pool’s restrictions
 (if any).**
 
-```sol
+```text
 require(_checkIdentity(_apporder.datasetrestrict, _datasetorder.dataset, GROUPMEMBER_PURPOSE));
 require(_checkIdentity(_workerpoolorder.datasetrestrict, _datasetorder.dataset, GROUPMEMBER_PURPOSE));
 ```
@@ -695,7 +695,7 @@ require(_checkIdentity(_workerpoolorder.datasetrestrict, _datasetorder.dataset,
 **11. The worker pool must fit the application’s and the dataset’s restrictions
 (if any).**
 
-```sol
+```text
 require(_checkIdentity(_apporder.workerpoolrestrict, _workerpoolorder.workerpool, GROUPMEMBER_PURPOSE));
 require(_checkIdentity(_datasetorder.workerpoolrestrict, _workerpoolorder.workerpool, GROUPMEMBER_PURPOSE));
 ```
@@ -703,7 +703,7 @@ require(_checkIdentity(_datasetorder.workerpoolrestrict, _workerpoolorder.worker
 **12. The requester must fit the application’s, the dataset’s and the worker
 pool’s restrictions (if any).**
 
-```sol
+```text
 require(_checkIdentity(_apporder.requesterrestrict, _requestorder.requester, GROUPMEMBER_PURPOSE));
 require(_checkIdentity(_datasetorder.requesterrestrict, _requestorder.requester, GROUPMEMBER_PURPOSE));
 require(_checkIdentity(_workerpoolorder.requesterrestrict, _requestorder.requester, GROUPMEMBER_PURPOSE));
@@ -711,7 +711,7 @@ require(_checkIdentity(_workerpoolorder.requesterrestrict, _requestorder.request
 
 **13. All resources must be registered in the corresponding registries.**
 
-```sol
+```text
 require(m_appregistry.isRegistered(_apporder.app));
 require(m_datasetregistry.isRegistered(_datasetorder.dataset));
 require(m_workerpoolregistry.isRegistered(_workerpoolorder.workerpool));
@@ -719,7 +719,7 @@ require(m_workerpoolregistry.isRegistered(_workerpoolorder.workerpool));
 
 **14. All orders must be signed or presigned.**
 
-```sol
+```text
 require(_checkPresignatureOrSignature(App(_apporder.app).m_owner(), _apporder.hash(), _apporder.sign));
 require(_checkPresignatureOrSignature(Dataset(_datasetorder.dataset).m_owner(), _datasetorder.hash(), _datasetorder.sign));
 require(_checkPresignatureOrSignature(Workerpool(_workerpoolorder.workerpool).m_owner(), _workerpoolorder.hash(), _workerpoolorder.sign));
diff --git a/src/documentation/protocol/worker/manage-access.md b/src/get-started/protocol/worker/manage-access.md
similarity index 97%
rename from src/documentation/protocol/worker/manage-access.md
rename to src/get-started/protocol/worker/manage-access.md
index 28b5815c..b3631024 100644
--- a/src/documentation/protocol/worker/manage-access.md
+++ b/src/get-started/protocol/worker/manage-access.md
@@ -68,8 +68,8 @@ The supported tags for workerpool orders are:
 
 1. Do not publish workerpool orders with a tag value out of the specified list.
    Such an order could produce undesirable and unpredictable behaviors. The
-   [iExec SDK](../sdk.md) implements all required preflight checks to avoid
-   erroneous orders publishing.
+   [iExec SDK](/references/sdk) implements all required preflight checks to
+   avoid erroneous orders publishing.
 2. Currently, TEE workflow do not support tasks replication on several workers.
    TEE workerpool orders must be published with `trust` value equal to `1`.
 3. TEE tasks with Gramine TEE framework are not supported yet. Do not publish
diff --git a/src/documentation/protocol/worker/quick-start.md b/src/get-started/protocol/worker/quick-start.md
similarity index 100%
rename from src/documentation/protocol/worker/quick-start.md
rename to src/get-started/protocol/worker/quick-start.md
diff --git a/src/documentation/quick-start.md b/src/get-started/quick-start.md
similarity index 100%
rename from src/documentation/quick-start.md
rename to src/get-started/quick-start.md
diff --git a/src/documentation/rlc.md b/src/get-started/rlc.md
similarity index 97%
rename from src/documentation/rlc.md
rename to src/get-started/rlc.md
index 0de20f57..166063ec 100644
--- a/src/documentation/rlc.md
+++ b/src/get-started/rlc.md
@@ -121,8 +121,8 @@ Ready to dive into the iExec ecosystem? Here are the next steps:
   networks
 - **[Start Using iExec](./quick-start.md)** - Begin your confidential computing
   journey
-- **[Earn RLC](/documentation/manage-data/guides/manage-access)** - Become a
-  provider and monetize your resources
+- **[Earn RLC](/guides/manage-data/manage-access)** - Become a provider and
+  monetize your resources
 
 <script setup>
 import ImageViewer from '@/components/ImageViewer.vue';
diff --git a/src/documentation/tooling-and-explorers/blockchain-explorer.md b/src/get-started/tooling-and-explorers/blockchain-explorer.md
similarity index 100%
rename from src/documentation/tooling-and-explorers/blockchain-explorer.md
rename to src/get-started/tooling-and-explorers/blockchain-explorer.md
diff --git a/src/documentation/tooling-and-explorers/bridge.md b/src/get-started/tooling-and-explorers/bridge.md
similarity index 100%
rename from src/documentation/tooling-and-explorers/bridge.md
rename to src/get-started/tooling-and-explorers/bridge.md
diff --git a/src/documentation/tooling-and-explorers/builder-dashboard.md b/src/get-started/tooling-and-explorers/builder-dashboard.md
similarity index 100%
rename from src/documentation/tooling-and-explorers/builder-dashboard.md
rename to src/get-started/tooling-and-explorers/builder-dashboard.md
diff --git a/src/documentation/tooling-and-explorers/iexec-explorer.md b/src/get-started/tooling-and-explorers/iexec-explorer.md
similarity index 100%
rename from src/documentation/tooling-and-explorers/iexec-explorer.md
rename to src/get-started/tooling-and-explorers/iexec-explorer.md
diff --git a/src/documentation/tooling-and-explorers/subgraph-explorer.md b/src/get-started/tooling-and-explorers/subgraph-explorer.md
similarity index 100%
rename from src/documentation/tooling-and-explorers/subgraph-explorer.md
rename to src/get-started/tooling-and-explorers/subgraph-explorer.md
diff --git a/src/get-started/toolkit.md b/src/get-started/toolkit.md
new file mode 100644
index 00000000..f802948b
--- /dev/null
+++ b/src/get-started/toolkit.md
@@ -0,0 +1,10 @@
+---
+title: iExec Toolkit
+description: Essential tools and resources for building on iExec
+---
+
+# 🛠️ iExec Toolkit
+
+This page is under development.
+
+<!-- TODO: Add comprehensive toolkit overview -->
diff --git a/src/documentation/use-cases.md b/src/get-started/use-cases.md
similarity index 100%
rename from src/documentation/use-cases.md
rename to src/get-started/use-cases.md
diff --git a/src/documentation/welcome.md b/src/get-started/welcome.md
similarity index 94%
rename from src/documentation/welcome.md
rename to src/get-started/welcome.md
index 8b31febc..3011f4cc 100644
--- a/src/documentation/welcome.md
+++ b/src/get-started/welcome.md
@@ -164,13 +164,13 @@ Ready to build privacy-first applications? Choose your path:
     <div class="flex items-start gap-3">
       <span class="text-xl">⚡</span>
       <div>
-        <strong>Quick Start:</strong> Follow our <a href="/documentation/helloWorld" class="text-fuchsia-700 hover:text-fuchsia-600">Hello World guide</a> to build your first confidential app in minutes
+        <strong>Quick Start:</strong> Follow our <a href="/get-started/helloWorld" class="text-fuchsia-700 hover:text-fuchsia-600">Hello World guide</a> to build your first confidential app in minutes
       </div>
     </div>
     <div class="flex items-start gap-3">
       <span class="text-xl">🔍</span>
       <div>
-        <strong>Explore Use Cases:</strong> Browse <a href="/documentation/use-cases" class="text-fuchsia-700 hover:text-fuchsia-600">real-world examples</a> to see what you can build with iExec
+        <strong>Explore Use Cases:</strong> Browse <a href="/get-started/use-cases" class="text-fuchsia-700 hover:text-fuchsia-600">real-world examples</a> to see what you can build with iExec
       </div>
     </div>
     <div class="flex items-start gap-3">
diff --git a/src/documentation/build-iapp/guides/build-&-deploy.md b/src/guides/build-iapp/build-&-deploy.md
similarity index 100%
rename from src/documentation/build-iapp/guides/build-&-deploy.md
rename to src/guides/build-iapp/build-&-deploy.md
diff --git a/src/documentation/build-iapp/guides/debugging.md b/src/guides/build-iapp/debugging.md
similarity index 95%
rename from src/documentation/build-iapp/guides/debugging.md
rename to src/guides/build-iapp/debugging.md
index 6bc6ea84..80172c4a 100644
--- a/src/documentation/build-iapp/guides/debugging.md
+++ b/src/guides/build-iapp/debugging.md
@@ -169,7 +169,7 @@ except Exception as e:
 
 Continue improving your iApps:
 
-- **[Inputs and Outputs](/documentation/build-iapp/guides/inputs-and-outputs)** -
-  Handle data in TEE
-- **[How to Get and Decrypt Results](/documentation/build-iapp/guides/how-to-get-and-decrypt-results)** -
+- **[Inputs and Outputs](/guides/build-iapp/inputs-and-outputs)** - Handle data
+  in TEE
+- **[How to Get and Decrypt Results](/guides/build-iapp/how-to-get-and-decrypt-results)** -
   Retrieve results
diff --git a/src/documentation/build-iapp/guides/how-to-get-and-decrypt-results.md b/src/guides/build-iapp/how-to-get-and-decrypt-results.md
similarity index 93%
rename from src/documentation/build-iapp/guides/how-to-get-and-decrypt-results.md
rename to src/guides/build-iapp/how-to-get-and-decrypt-results.md
index b4f72fbf..cca00b1e 100644
--- a/src/documentation/build-iapp/guides/how-to-get-and-decrypt-results.md
+++ b/src/guides/build-iapp/how-to-get-and-decrypt-results.md
@@ -300,16 +300,15 @@ iexec task show <taskId>
 
 Integrate result handling into your applications:
 
-- **[Inputs and Outputs](/documentation/build-iapp/guides/inputs-and-outputs)** -
-  Understand what your iApp can output
-- **[Debugging Your iApp](/documentation/build-iapp/guides/debugging)** -
-  Troubleshoot execution issues
-- **[App Access Control and Pricing](/documentation/build-iapp/guides/manage-access)** -
+- **[Inputs and Outputs](/guides/build-iapp/inputs-and-outputs)** - Understand
+  what your iApp can output
+- **[Debugging Your iApp](/guides/build-iapp/debugging)** - Troubleshoot
+  execution issues
+- **[App Access Control and Pricing](/guides/build-iapp/manage-access)** -
   Control who can run your iApp
 
 ### Advanced Topics
 
-- **[DataProtector SDK](/documentation/manage-data/dataProtector)** - Complete
-  SDK documentation
-- **[SDK Deep Dive](/documentation/protocol/sdk)** - Advanced result handling
-  techniques
+- **[DataProtector SDK](/references/dataProtector)** - Complete SDK
+  documentation
+- **[SDK Deep Dive](/references/sdk)** - Advanced result handling techniques
diff --git a/src/guides/build-iapp/index.md b/src/guides/build-iapp/index.md
new file mode 100644
index 00000000..b9fc823a
--- /dev/null
+++ b/src/guides/build-iapp/index.md
@@ -0,0 +1,42 @@
+---
+title: Build iApp Guides
+description: Complete guide collection for building privacy-first iApps on iExec
+---
+
+# 🛠️ Build iApp Guides
+
+Welcome to the complete collection of guides for building privacy-first
+applications on iExec. These guides will walk you through every aspect of
+creating, testing, and deploying confidential iApps.
+
+## 🚀 Getting Started
+
+- **[Build & Deploy](/guides/build-iapp/build-&-deploy)** - Your first iApp in
+  15 minutes
+- **[Inputs and Outputs](/guides/build-iapp/inputs-and-outputs)** - Handle data
+  flow in TEE environment
+- **[Debugging](/guides/build-iapp/debugging)** - Troubleshoot execution issues
+
+## 🔐 Access Control & Management
+
+- **[Manage Access](/guides/build-iapp/manage-access)** - Control who can use
+  your iApp
+- **[How to Get and Decrypt Results](/guides/build-iapp/how-to-get-and-decrypt-results)** -
+  Retrieve and use outputs
+
+## 🧪 Advanced Features
+
+- **[Using TDX (Experimental)](/guides/build-iapp/using-tdx)** - Next-gen TEE
+  technology
+
+## 📚 What's Next?
+
+After mastering these guides, explore:
+
+- **[iApp Generator](/references/iapp-generator)** - Complete development
+  toolkit
+- **[What is an iApp?](/get-started/overview/what-is-iapp)** - Core concepts and
+  TEE overview
+
+Ready to build your first privacy-preserving application? Start with the
+[Build & Deploy](/guides/build-iapp/build-&-deploy) guide!
diff --git a/src/documentation/build-iapp/guides/inputs-and-outputs.md b/src/guides/build-iapp/inputs-and-outputs.md
similarity index 97%
rename from src/documentation/build-iapp/guides/inputs-and-outputs.md
rename to src/guides/build-iapp/inputs-and-outputs.md
index 1fb65e15..f2775e46 100644
--- a/src/documentation/build-iapp/guides/inputs-and-outputs.md
+++ b/src/guides/build-iapp/inputs-and-outputs.md
@@ -618,7 +618,7 @@ save_report(report)
 Once your iApp completes execution, users can retrieve and decrypt the results:
 
 → **Learn how users get results**: Check our
-[How to Get and Decrypt Results](/documentation/build-iapp/guides/how-to-get-and-decrypt-results)
+[How to Get and Decrypt Results](/guides/build-iapp/how-to-get-and-decrypt-results)
 guide for the complete user workflow.
 
 ## What's Next?
@@ -627,15 +627,15 @@ guide for the complete user workflow.
 
 Continue building with these guides:
 
-- **[App Access Control and Pricing](/documentation/build-iapp/guides/manage-access)** -
+- **[App Access Control and Pricing](/guides/build-iapp/manage-access)** -
   Control who can use your iApp
-- **[Debugging Your iApp](/documentation/build-iapp/guides/debugging)** -
-  Troubleshoot execution issues
-- **[How to Get and Decrypt Results](/documentation/build-iapp/guides/how-to-get-and-decrypt-results)** -
+- **[Debugging Your iApp](/guides/build-iapp/debugging)** - Troubleshoot
+  execution issues
+- **[How to Get and Decrypt Results](/guides/build-iapp/how-to-get-and-decrypt-results)** -
   User-side result handling
 
 ### Technical Deep Dive
 
-- **[SDK Deep Dive](/documentation/protocol/sdk)** - Advanced SDK concepts
+- **[SDK Deep Dive](/references/sdk)** - Advanced SDK concepts
 - **[Application I/O Protocol Docs](https://protocol.docs.iex.ec/for-developers/application-io)** -
   Low-level protocol details
diff --git a/src/documentation/build-iapp/guides/manage-access.md b/src/guides/build-iapp/manage-access.md
similarity index 100%
rename from src/documentation/build-iapp/guides/manage-access.md
rename to src/guides/build-iapp/manage-access.md
diff --git a/src/documentation/build-iapp/guides/using-tdx.md b/src/guides/build-iapp/using-tdx.md
similarity index 94%
rename from src/documentation/build-iapp/guides/using-tdx.md
rename to src/guides/build-iapp/using-tdx.md
index d5cb9169..642e93c9 100644
--- a/src/documentation/build-iapp/guides/using-tdx.md
+++ b/src/guides/build-iapp/using-tdx.md
@@ -184,9 +184,9 @@ EXPERIMENTAL_TDX_APP=true iapp run <app-address>
 
 **For production applications, use the standard SGX guides**:
 
-- **[Debugging Your iApp](/documentation/build-iapp/guides/debugging)** -
-  Troubleshoot execution issues
-- **[Inputs and Outputs](/documentation/build-iapp/guides/inputs-and-outputs)** -
-  Handle data in TEE environment
-- **[App Access Control and Pricing](/documentation/build-iapp/guides/manage-access)** -
+- **[Debugging Your iApp](/guides/build-iapp/debugging)** - Troubleshoot
+  execution issues
+- **[Inputs and Outputs](/guides/build-iapp/inputs-and-outputs)** - Handle data
+  in TEE environment
+- **[App Access Control and Pricing](/guides/build-iapp/manage-access)** -
   Deploy production-ready iApps
diff --git a/src/documentation/manage-data/guides/handle-schemas-dataset-types.md b/src/guides/manage-data/handle-schemas-dataset-types.md
similarity index 93%
rename from src/documentation/manage-data/guides/handle-schemas-dataset-types.md
rename to src/guides/manage-data/handle-schemas-dataset-types.md
index e67cb050..fce355ce 100644
--- a/src/documentation/manage-data/guides/handle-schemas-dataset-types.md
+++ b/src/guides/manage-data/handle-schemas-dataset-types.md
@@ -253,8 +253,8 @@ don't match, you'll get runtime errors when processing the data.
 :::
 
 → **Ready to build an iApp?** Check out our detailed
-[Inputs and Outputs guide](/documentation/build-iapp/guides/inputs-and-outputs)
-to learn how to access schema fields inside your iApp using the deserializer.
+[Inputs and Outputs guide](/guides/build-iapp/inputs-and-outputs) to learn how
+to access schema fields inside your iApp using the deserializer.
 
 ## Next Steps
 
@@ -262,10 +262,10 @@ to learn how to access schema fields inside your iApp using the deserializer.
 explore next:
 
 - **Build an iApp**: Check out the
-  [iApp Generator guide](/documentation/build-iapp/iapp-generator) to create
-  your first data processor
+  [iApp Generator guide](/references/iapp-generator) to create your first data
+  processor
 - **Process data**: Learn about
-  [processProtectedData](/documentation/manage-data/dataProtector/dataProtectorCore/processProtectedData)
+  [processProtectedData](/references/dataProtector/dataProtectorCore/processProtectedData)
   for running computations
-- **See it in action**: Try our
-  [Hello World tutorial](/documentation/helloWorld) for a complete example
+- **See it in action**: Try our [Hello World tutorial](/get-started/helloWorld)
+  for a complete example
diff --git a/src/documentation/manage-data/guides/manage-access.md b/src/guides/manage-data/manage-access.md
similarity index 88%
rename from src/documentation/manage-data/guides/manage-access.md
rename to src/guides/manage-data/manage-access.md
index ab7438ba..7486e25e 100644
--- a/src/documentation/manage-data/guides/manage-access.md
+++ b/src/guides/manage-data/manage-access.md
@@ -66,8 +66,7 @@ console.log('Protected data address:', protectedData.address);
 computations by authorized users and iApps.
 
 **Supported types**: Common data types like text, numbers, true/false values,
-and files. See the
-[full list here](/documentation/manage-data/dataProtector/types).
+and files. See the [full list here](/references/dataProtector/types).
 
 **Storage**: Store your data on IPFS or Arweave. For larger files, you can use
 your own IPFS node.
@@ -75,7 +74,7 @@ your own IPFS node.
 ::: tip
 
 Need Help ? Check our
-[Schema and Dataset Types guide](/documentation/manage-data/guides/handle-schemas-dataset-types)
+[Schema and Dataset Types guide](/guides/manage-data/handle-schemas-dataset-types)
 for detailed formatting instructions.
 
 :::
@@ -194,7 +193,7 @@ automatically.
 **Example**: `pricePerAccess: 1_000_000_000` = 1 RLC per access
 
 → **Want to learn more monetization capabilities?** See our detailed
-[Monetize Protected Data guide](/documentation/manage-data/guides/monetize-protected-data)
+[Monetize Protected Data guide](/guides/manage-data/monetize-protected-data)
 
 #### numberOfAccess <OptionalBadge />
 
@@ -219,14 +218,13 @@ get a "no dataset orders" error. Set this high enough for your use case.
 steps:
 
 - **Process the data**: Use
-  [processProtectedData](/documentation/manage-data/dataProtector/dataProtectorCore/processProtectedData)
+  [processProtectedData](/references/dataProtector/dataProtectorCore/processProtectedData)
   to run computations
 - **Manage access**:
-  [Revoke](/documentation/manage-data/dataProtector/dataProtectorCore/revokeOneAccess)
-  or
-  [modify permissions](/documentation/manage-data/dataProtector/dataProtectorCore/grantAccess)
+  [Revoke](/references/dataProtector/dataProtectorCore/revokeOneAccess) or
+  [modify permissions](/references/dataProtector/dataProtectorCore/grantAccess)
   anytime
 - **Learn data types**: Deep dive into
-  [schemas and dataset types](/documentation/manage-data/guides/handle-schemas-dataset-types)
+  [schemas and dataset types](/guides/manage-data/handle-schemas-dataset-types)
 - **Monetize data**: Explore
-  [data monetization strategies](/documentation/manage-data/guides/monetize-protected-data)
+  [data monetization strategies](/guides/manage-data/monetize-protected-data)
diff --git a/src/documentation/manage-data/guides/monetize-protected-data.md b/src/guides/manage-data/monetize-protected-data.md
similarity index 93%
rename from src/documentation/manage-data/guides/monetize-protected-data.md
rename to src/guides/manage-data/monetize-protected-data.md
index 50f58314..a544fb0e 100644
--- a/src/documentation/manage-data/guides/monetize-protected-data.md
+++ b/src/guides/manage-data/monetize-protected-data.md
@@ -71,7 +71,7 @@ access time, not individual transactions.
 
 ::: tip See It Live
 
-The [Content Creator demo](/documentation/use-cases) shows DataProtector Sharing
+The [Content Creator demo](/get-started/use-cases) shows DataProtector Sharing
 in action with file monetization. While it uses the content-delivery iApp for
 file streaming, the same patterns work for any iApp - AI models, data
 processing, oracles, etc.
@@ -242,14 +242,14 @@ usage periods, and flexible pricing models.
 
 **Ready to start monetizing your data?** Here are your next steps:
 
-- **See it in action**: Try the [Content Creator demo](/documentation/use-cases)
+- **See it in action**: Try the [Content Creator demo](/get-started/use-cases)
   to understand the full flow
 - **Start simple**: Begin with
-  [pay-per-use via grantAccess](/documentation/manage-data/guides/manage-access)
+  [pay-per-use via grantAccess](/guides/manage-data/manage-access)
 - **Explore sharing**: Try
-  [DataProtector Sharing](/documentation/manage-data/dataProtector/dataProtectorSharing)
-  for automated distribution
+  [DataProtector Sharing](/references/dataProtector/dataProtectorSharing) for
+  automated distribution
 - **Build collections**: Learn about
-  [collection management](/documentation/manage-data/dataProtector/dataProtectorSharing/collection)
+  [collection management](/references/dataProtector/dataProtectorSharing/collection)
 - **Set up subscriptions**: Implement
-  [recurring revenue models](/documentation/manage-data/dataProtector/dataProtectorSharing/subscription)
+  [recurring revenue models](/references/dataProtector/dataProtectorSharing/subscription)
diff --git a/src/documentation/use-iapp/guides/add-inputs-to-execution.md b/src/guides/use-iapp/add-inputs-to-execution.md
similarity index 100%
rename from src/documentation/use-iapp/guides/add-inputs-to-execution.md
rename to src/guides/use-iapp/add-inputs-to-execution.md
diff --git a/src/documentation/use-iapp/guides/different-ways-to-execute.md b/src/guides/use-iapp/different-ways-to-execute.md
similarity index 100%
rename from src/documentation/use-iapp/guides/different-ways-to-execute.md
rename to src/guides/use-iapp/different-ways-to-execute.md
diff --git a/src/documentation/use-iapp/guides/find-iapps.md b/src/guides/use-iapp/find-iapps.md
similarity index 100%
rename from src/documentation/use-iapp/guides/find-iapps.md
rename to src/guides/use-iapp/find-iapps.md
diff --git a/src/documentation/use-iapp/getting-started.md b/src/guides/use-iapp/getting-started.md
similarity index 100%
rename from src/documentation/use-iapp/getting-started.md
rename to src/guides/use-iapp/getting-started.md
diff --git a/src/documentation/use-iapp/guides/how-to-pay-executions.md b/src/guides/use-iapp/how-to-pay-executions.md
similarity index 100%
rename from src/documentation/use-iapp/guides/how-to-pay-executions.md
rename to src/guides/use-iapp/how-to-pay-executions.md
diff --git a/src/documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail.md b/src/guides/use-iapp/how-to-pay/how-to-pay-for-web3mail.md
similarity index 97%
rename from src/documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail.md
rename to src/guides/use-iapp/how-to-pay/how-to-pay-for-web3mail.md
index 087dcb2f..f74b1ee4 100644
--- a/src/documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail.md
+++ b/src/guides/use-iapp/how-to-pay/how-to-pay-for-web3mail.md
@@ -7,8 +7,8 @@ description:
 
 # How to Pay for Web3Mail
 
-[Web3Mail](../web3mail) dev tool offers secure, blockchain-based communication
-by encrypting emails and protecting user privacy.
+[Web3Mail](/references/web3mail) dev tool offers secure, blockchain-based
+communication by encrypting emails and protecting user privacy.
 
 The `sendEmail` function uses confidential computing power to encrypt and send
 messages, ensuring secure and decentralized email exchanges.
diff --git a/src/documentation/use-iapp/how-to-pay/how-to-pay-for-web3telegram.md b/src/guides/use-iapp/how-to-pay/how-to-pay-for-web3telegram.md
similarity index 97%
rename from src/documentation/use-iapp/how-to-pay/how-to-pay-for-web3telegram.md
rename to src/guides/use-iapp/how-to-pay/how-to-pay-for-web3telegram.md
index 2cabea8e..a22702db 100644
--- a/src/documentation/use-iapp/how-to-pay/how-to-pay-for-web3telegram.md
+++ b/src/guides/use-iapp/how-to-pay/how-to-pay-for-web3telegram.md
@@ -8,8 +8,8 @@ description:
 
 # How to Pay for Web3Telegram
 
-[Web3Telegram](../web3telegram) dev tool offers secure, blockchain-based
-communication by encrypting emails and protecting user privacy.
+[Web3Telegram](/references/web3telegram) dev tool offers secure,
+blockchain-based communication by encrypting emails and protecting user privacy.
 
 The `sendTelegram` function uses confidential computing power to encrypt and
 send messages, ensuring secure and decentralized email exchanges.
diff --git a/src/documentation/use-iapp/how-to-pay/pricing-considerations.md b/src/guides/use-iapp/how-to-pay/pricing-considerations.md
similarity index 100%
rename from src/documentation/use-iapp/how-to-pay/pricing-considerations.md
rename to src/guides/use-iapp/how-to-pay/pricing-considerations.md
diff --git a/src/documentation/use-iapp/how-to-pay/voucher.md b/src/guides/use-iapp/how-to-pay/voucher.md
similarity index 100%
rename from src/documentation/use-iapp/how-to-pay/voucher.md
rename to src/guides/use-iapp/how-to-pay/voucher.md
diff --git a/src/documentation/use-iapp/introduction.md b/src/guides/use-iapp/introduction.md
similarity index 100%
rename from src/documentation/use-iapp/introduction.md
rename to src/guides/use-iapp/introduction.md
diff --git a/src/documentation/use-iapp/guides/use-iapp-with-protected-data.md b/src/guides/use-iapp/use-iapp-with-protected-data.md
similarity index 100%
rename from src/documentation/use-iapp/guides/use-iapp-with-protected-data.md
rename to src/guides/use-iapp/use-iapp-with-protected-data.md
diff --git a/src/index.md b/src/index.md
index c6134c94..8d7bf0ac 100644
--- a/src/index.md
+++ b/src/index.md
@@ -10,44 +10,44 @@ hero:
   actions:
     - theme: brand
       text: Get Started
-      link: /documentation/welcome
+      link: /get-started/welcome
     - theme: alt
       text: Hello World Tutorial
-      link: /documentation/helloWorld
+      link: /get-started/helloWorld
 
 features:
   - icon: 🚀
     title: Quick Start
     details: Jump in and start building on iExec in minutes.
-    link: /documentation/helloWorld
+    link: /get-started/helloWorld
   - icon: 🔐
     title: Protect & Manage Data
     details:
       Secure your data with advanced encryption and control access while
       maintaining privacy using DataProtector
-    link: /documentation/manage-data/what-is-protected-data
+    link: /get-started/overview/what-is-protected-data
   - icon: 🤖
     title: Build iApps
     details:
       Create decentralized applications that run on confidential computing
       infrastructure with our iApp Generator
-    link: /documentation/build-iapp/what-is-iapp
+    link: /get-started/overview/what-is-iapp
   - icon: ⚡
     title: Use iApps
     details:
       Execute existing iApps including Web3Mail, Web3Telegram for your
       applications
-    link: /documentation/use-iapp/introduction
+    link: /guides/use-iapp/introduction
   - icon: 💰
     title: Monetize Data
     details:
       Create revenue streams from your data while maintaining full control and
       privacy
-    link: /documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail
+    link: /guides/use-iapp/how-to-pay/how-to-pay-for-web3mail
   - icon: 🧠
     title: Protocols
     details:
       Deep dive into the core concepts of the protocol and understand how iExec
       enables privacy, governance, and monetization
-    link: /documentation/protocol/sdk
+    link: /get-started/protocol/proof-of-contribution
 ---
diff --git a/src/modules/helloWorld/GrantAccess.vue b/src/modules/helloWorld/GrantAccess.vue
index 8305e195..5b7fae16 100644
--- a/src/modules/helloWorld/GrantAccess.vue
+++ b/src/modules/helloWorld/GrantAccess.vue
@@ -104,13 +104,14 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { Icon } from '@iconify/vue';
 import { IExecDataProtectorCore } from '@iexec/dataprotector';
 import Button from '@/components/ui/Button.vue';
 import ReownButton from './ReownButton.vue';
 import { useAccount } from '@wagmi/vue';
 import { useWalletConnection } from '../../hooks/useWalletConnection.vue';
+import useUserStore from '@/stores/useUser.store';
 
 const { connector } = useAccount();
 const {
@@ -119,12 +120,33 @@ const {
   protectedDataAddress,
   onWalletConnected,
 } = useWalletConnection();
+const userStore = useUserStore();
 
 const authorizedApp = ref('');
 const isLoadingGrant = ref(false);
 const grantError = ref(null);
 const grantedAccess = ref(null);
 
+// Watch to clear data when chain changes
+watch(
+  () => userStore.getCurrentChainId(),
+  (newChainId, oldChainId) => {
+    if (oldChainId && newChainId && oldChainId !== newChainId) {
+      console.log(
+        'Chain changed, clearing grant access data:',
+        oldChainId,
+        '->',
+        newChainId
+      );
+      // Clear granted access data
+      grantedAccess.value = null;
+      // Reset form
+      authorizedApp.value = '';
+      grantError.value = null;
+    }
+  }
+);
+
 const grantAccess = async () => {
   try {
     if (!web3Provider.value) {
@@ -141,11 +163,8 @@ const grantAccess = async () => {
     }
     isLoadingGrant.value = true;
     grantError.value = null;
-    const dataProtectorCore = new IExecDataProtectorCore(web3Provider.value, {
-      iexecOptions: {
-        smsURL: 'https://sms.scone-debug.v8-bellecour.iex.ec',
-      },
-    });
+
+    const dataProtectorCore = new IExecDataProtectorCore(web3Provider.value);
 
     const grantedAccessResult = await dataProtectorCore.grantAccess({
       protectedData: protectedDataAddress?.value,
diff --git a/src/modules/helloWorld/ProtectData.vue b/src/modules/helloWorld/ProtectData.vue
index 4bb2fa4e..d57bcc63 100644
--- a/src/modules/helloWorld/ProtectData.vue
+++ b/src/modules/helloWorld/ProtectData.vue
@@ -5,11 +5,12 @@
     >
       Connect Your Wallet
       <a
-        href="https://chainlist.org/?search=bellecour"
+        :href="`https://chainlist.org/chain/${userStore.getCurrentChainId() || 134}`"
         target="_blank"
         class="text-fuchsia-700 underline hover:text-fuchsia-900"
-        >(iExec network)</a
       >
+        ({{ networkName }})
+      </a>
       :
       <ReownButton />
     </div>
@@ -75,12 +76,16 @@
       <p class="mt-4">
         You can check it on
         <a
-          :href="`https://explorer.iex.ec/bellecour/dataset/${protectedDataAddress}`"
+          :href="explorerUrl"
           target="_blank"
           rel="noopener noreferrer"
           class="font-medium text-green-600 underline hover:text-green-800"
         >
-          the iExec explorer
+          {{
+            userStore.getCurrentChainId() === 42161
+              ? 'the Arbitrum explorer'
+              : 'the iExec explorer'
+          }}
         </a>
       </p>
       <p class="mt-2">
@@ -104,13 +109,14 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { Icon } from '@iconify/vue';
 import { IExecDataProtectorCore } from '@iexec/dataprotector';
 import Button from '@/components/ui/Button.vue';
 import ReownButton from './ReownButton.vue';
 import { useAccount } from '@wagmi/vue';
 import { useWalletConnection } from '../../hooks/useWalletConnection.vue';
+import useUserStore from '@/stores/useUser.store';
 
 const { connector } = useAccount();
 const {
@@ -119,11 +125,50 @@ const {
   protectedDataAddress,
   protectedDataIpfsAddress,
 } = useWalletConnection();
+const userStore = useUserStore();
 
 const contentToProtect = ref('');
 const isLoadingProtect = ref(false);
 const protectError = ref(null);
 
+// Computed property for explorer URL based on selected chain
+const explorerUrl = computed(() => {
+  const currentChainId = userStore.getCurrentChainId();
+  const networkPath =
+    currentChainId === 42161 ? 'arbitrum-mainnet' : 'bellecour';
+  return `https://explorer.iex.ec/${networkPath}/dataset/${protectedDataAddress.value}`;
+});
+
+// Computed property for network name
+const networkName = computed(() => {
+  const currentChain = userStore.getCurrentChain();
+  return currentChain?.name || 'Unknown network';
+});
+
+// Watch to clear protected data when chain changes
+watch(
+  () => userStore.getCurrentChainId(),
+  (newChainId, oldChainId) => {
+    if (oldChainId && newChainId && oldChainId !== newChainId) {
+      console.log(
+        'Chain changed, clearing protected data:',
+        oldChainId,
+        '->',
+        newChainId
+      );
+      // Clear protected data
+      protectedDataAddress.value = '';
+      protectedDataIpfsAddress.value = '';
+      // Clear localStorage
+      localStorage.removeItem('protectedDataAddress');
+      localStorage.removeItem('protectedDataIpfsAddress');
+      // Reset form
+      contentToProtect.value = '';
+      protectError.value = null;
+    }
+  }
+);
+
 async function protectData() {
   try {
     if (!web3Provider.value) {
diff --git a/src/documentation/manage-data/dataProtector.md b/src/references/dataProtector.md
similarity index 95%
rename from src/documentation/manage-data/dataProtector.md
rename to src/references/dataProtector.md
index e352f572..d8af04f3 100644
--- a/src/documentation/manage-data/dataProtector.md
+++ b/src/references/dataProtector.md
@@ -6,7 +6,7 @@ description:
   powered by blockchain technology.
 ---
 
-# 🔐 DataProtector <span style="margin-left: 12px; position: absolute; top: -2px;"><Badge type="tip" text="2.0.0" /> <Badge type="warning" text="beta" /></span>
+# 🔐 DataProtector <span style="margin-left: 12px; position: absolute; top: -2px;"><Badge type="tip" text="2.0.0" /></span>
 
 DataProtector **simplifies secure data management**, offering users essential
 tools for protecting, managing, and sharing their data effectively.
diff --git a/src/documentation/manage-data/dataProtector/advanced/advanced-configuration.md b/src/references/dataProtector/advanced/advanced-configuration.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/advanced/advanced-configuration.md
rename to src/references/dataProtector/advanced/advanced-configuration.md
diff --git a/src/documentation/manage-data/dataProtector/advanced/apps-whitelist.md b/src/references/dataProtector/advanced/apps-whitelist.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/advanced/apps-whitelist.md
rename to src/references/dataProtector/advanced/apps-whitelist.md
diff --git a/src/documentation/manage-data/dataProtector/advanced/apps-whitelist/addAppToAddOnlyAppWhitelist.md b/src/references/dataProtector/advanced/apps-whitelist/addAppToAddOnlyAppWhitelist.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/advanced/apps-whitelist/addAppToAddOnlyAppWhitelist.md
rename to src/references/dataProtector/advanced/apps-whitelist/addAppToAddOnlyAppWhitelist.md
diff --git a/src/documentation/manage-data/dataProtector/advanced/apps-whitelist/createAddOnlyAppWhitelist.md b/src/references/dataProtector/advanced/apps-whitelist/createAddOnlyAppWhitelist.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/advanced/apps-whitelist/createAddOnlyAppWhitelist.md
rename to src/references/dataProtector/advanced/apps-whitelist/createAddOnlyAppWhitelist.md
diff --git a/src/documentation/manage-data/dataProtector/advanced/apps-whitelist/getUserAddOnlyAppWhitelist.md b/src/references/dataProtector/advanced/apps-whitelist/getUserAddOnlyAppWhitelist.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/advanced/apps-whitelist/getUserAddOnlyAppWhitelist.md
rename to src/references/dataProtector/advanced/apps-whitelist/getUserAddOnlyAppWhitelist.md
diff --git a/src/documentation/manage-data/dataProtector/advanced/dps-smart-contract.md b/src/references/dataProtector/advanced/dps-smart-contract.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/advanced/dps-smart-contract.md
rename to src/references/dataProtector/advanced/dps-smart-contract.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore.md b/src/references/dataProtector/dataProtectorCore.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore.md
rename to src/references/dataProtector/dataProtectorCore.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/getGrantedAccess.md b/src/references/dataProtector/dataProtectorCore/getGrantedAccess.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/getGrantedAccess.md
rename to src/references/dataProtector/dataProtectorCore/getGrantedAccess.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/getProtectedData.md b/src/references/dataProtector/dataProtectorCore/getProtectedData.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/getProtectedData.md
rename to src/references/dataProtector/dataProtectorCore/getProtectedData.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/getResultFromCompletedTask.md b/src/references/dataProtector/dataProtectorCore/getResultFromCompletedTask.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/getResultFromCompletedTask.md
rename to src/references/dataProtector/dataProtectorCore/getResultFromCompletedTask.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/grantAccess.md b/src/references/dataProtector/dataProtectorCore/grantAccess.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/grantAccess.md
rename to src/references/dataProtector/dataProtectorCore/grantAccess.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/processProtectedData.md b/src/references/dataProtector/dataProtectorCore/processProtectedData.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/processProtectedData.md
rename to src/references/dataProtector/dataProtectorCore/processProtectedData.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/protectData.md b/src/references/dataProtector/dataProtectorCore/protectData.md
similarity index 99%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/protectData.md
rename to src/references/dataProtector/dataProtectorCore/protectData.md
index 36fd05bb..16c798f3 100644
--- a/src/documentation/manage-data/dataProtector/dataProtectorCore/protectData.md
+++ b/src/references/dataProtector/dataProtectorCore/protectData.md
@@ -390,7 +390,7 @@ details on the transaction using the [iExec explorer](https://explorer.iex.ec).
 Under the hood, your protected data will be **compressed as a zip file**. In
 this zip file, you'll find back all of your protected fields, each field being
 serialized with a tool called `borsh`. You can find more details here:
-[deserializer](/documentation/build-iapp/iapp-generator/deserializer).
+[deserializer](/references/iapp-generator/deserializer).
 
 This is mainly returned for debug purpose.
 
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/revokeAllAccess.md b/src/references/dataProtector/dataProtectorCore/revokeAllAccess.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/revokeAllAccess.md
rename to src/references/dataProtector/dataProtectorCore/revokeAllAccess.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/revokeOneAccess.md b/src/references/dataProtector/dataProtectorCore/revokeOneAccess.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/revokeOneAccess.md
rename to src/references/dataProtector/dataProtectorCore/revokeOneAccess.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorCore/transferOwnership.md b/src/references/dataProtector/dataProtectorCore/transferOwnership.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorCore/transferOwnership.md
rename to src/references/dataProtector/dataProtectorCore/transferOwnership.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing.md b/src/references/dataProtector/dataProtectorSharing.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing.md
rename to src/references/dataProtector/dataProtectorSharing.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/collection.md b/src/references/dataProtector/dataProtectorSharing/collection.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/collection.md
rename to src/references/dataProtector/dataProtectorSharing/collection.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/addToCollection.md b/src/references/dataProtector/dataProtectorSharing/collection/addToCollection.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/addToCollection.md
rename to src/references/dataProtector/dataProtectorSharing/collection/addToCollection.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/createCollection.md b/src/references/dataProtector/dataProtectorSharing/collection/createCollection.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/createCollection.md
rename to src/references/dataProtector/dataProtectorSharing/collection/createCollection.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/removeCollection.md b/src/references/dataProtector/dataProtectorSharing/collection/removeCollection.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/removeCollection.md
rename to src/references/dataProtector/dataProtectorSharing/collection/removeCollection.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/removeProtectedDataFromCollection.md b/src/references/dataProtector/dataProtectorSharing/collection/removeProtectedDataFromCollection.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/collection/removeProtectedDataFromCollection.md
rename to src/references/dataProtector/dataProtectorSharing/collection/removeProtectedDataFromCollection.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/consume/consumeProtectedData.md b/src/references/dataProtector/dataProtectorSharing/consume/consumeProtectedData.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/consume/consumeProtectedData.md
rename to src/references/dataProtector/dataProtectorSharing/consume/consumeProtectedData.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/data-sharing-sc.png b/src/references/dataProtector/dataProtectorSharing/data-sharing-sc.png
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/data-sharing-sc.png
rename to src/references/dataProtector/dataProtectorSharing/data-sharing-sc.png
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/inside-a-collection.png b/src/references/dataProtector/dataProtectorSharing/inside-a-collection.png
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/inside-a-collection.png
rename to src/references/dataProtector/dataProtectorSharing/inside-a-collection.png
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionOwners.md b/src/references/dataProtector/dataProtectorSharing/read/getCollectionOwners.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionOwners.md
rename to src/references/dataProtector/dataProtectorSharing/read/getCollectionOwners.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionSubscriptions.md b/src/references/dataProtector/dataProtectorSharing/read/getCollectionSubscriptions.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionSubscriptions.md
rename to src/references/dataProtector/dataProtectorSharing/read/getCollectionSubscriptions.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionsByOwner.md b/src/references/dataProtector/dataProtectorSharing/read/getCollectionsByOwner.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getCollectionsByOwner.md
rename to src/references/dataProtector/dataProtectorSharing/read/getCollectionsByOwner.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getProtectedDataInCollections.md b/src/references/dataProtector/dataProtectorSharing/read/getProtectedDataInCollections.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getProtectedDataInCollections.md
rename to src/references/dataProtector/dataProtectorSharing/read/getProtectedDataInCollections.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getProtectedDataPricingParams.md b/src/references/dataProtector/dataProtectorSharing/read/getProtectedDataPricingParams.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getProtectedDataPricingParams.md
rename to src/references/dataProtector/dataProtectorSharing/read/getProtectedDataPricingParams.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getRentals.md b/src/references/dataProtector/dataProtectorSharing/read/getRentals.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/read/getRentals.md
rename to src/references/dataProtector/dataProtectorSharing/read/getRentals.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/renting.md b/src/references/dataProtector/dataProtectorSharing/renting.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/renting.md
rename to src/references/dataProtector/dataProtectorSharing/renting.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/removeProtectedDataFromRenting.md b/src/references/dataProtector/dataProtectorSharing/renting/removeProtectedDataFromRenting.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/removeProtectedDataFromRenting.md
rename to src/references/dataProtector/dataProtectorSharing/renting/removeProtectedDataFromRenting.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/rentProtectedData.md b/src/references/dataProtector/dataProtectorSharing/renting/rentProtectedData.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/rentProtectedData.md
rename to src/references/dataProtector/dataProtectorSharing/renting/rentProtectedData.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/setProtectedDataRentingParams.md b/src/references/dataProtector/dataProtectorSharing/renting/setProtectedDataRentingParams.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/setProtectedDataRentingParams.md
rename to src/references/dataProtector/dataProtectorSharing/renting/setProtectedDataRentingParams.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/setProtectedDataToRenting.md b/src/references/dataProtector/dataProtectorSharing/renting/setProtectedDataToRenting.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/renting/setProtectedDataToRenting.md
rename to src/references/dataProtector/dataProtectorSharing/renting/setProtectedDataToRenting.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/selling.md b/src/references/dataProtector/dataProtectorSharing/selling.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/selling.md
rename to src/references/dataProtector/dataProtectorSharing/selling.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/selling/buyProtectedData.md b/src/references/dataProtector/dataProtectorSharing/selling/buyProtectedData.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/selling/buyProtectedData.md
rename to src/references/dataProtector/dataProtectorSharing/selling/buyProtectedData.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/selling/removeProtectedDataForSale.md b/src/references/dataProtector/dataProtectorSharing/selling/removeProtectedDataForSale.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/selling/removeProtectedDataForSale.md
rename to src/references/dataProtector/dataProtectorSharing/selling/removeProtectedDataForSale.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/selling/setProtectedDataForSale.md b/src/references/dataProtector/dataProtectorSharing/selling/setProtectedDataForSale.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/selling/setProtectedDataForSale.md
rename to src/references/dataProtector/dataProtectorSharing/selling/setProtectedDataForSale.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription.md b/src/references/dataProtector/dataProtectorSharing/subscription.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription.md
rename to src/references/dataProtector/dataProtectorSharing/subscription.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/removeProtectedDataFromSubscription.md b/src/references/dataProtector/dataProtectorSharing/subscription/removeProtectedDataFromSubscription.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/removeProtectedDataFromSubscription.md
rename to src/references/dataProtector/dataProtectorSharing/subscription/removeProtectedDataFromSubscription.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/setProtectedDataToSubscription.md b/src/references/dataProtector/dataProtectorSharing/subscription/setProtectedDataToSubscription.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/setProtectedDataToSubscription.md
rename to src/references/dataProtector/dataProtectorSharing/subscription/setProtectedDataToSubscription.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/setSubscriptionParams.md b/src/references/dataProtector/dataProtectorSharing/subscription/setSubscriptionParams.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/setSubscriptionParams.md
rename to src/references/dataProtector/dataProtectorSharing/subscription/setSubscriptionParams.md
diff --git a/src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/subscribeToCollection.md b/src/references/dataProtector/dataProtectorSharing/subscription/subscribeToCollection.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/dataProtectorSharing/subscription/subscribeToCollection.md
rename to src/references/dataProtector/dataProtectorSharing/subscription/subscribeToCollection.md
diff --git a/src/documentation/manage-data/dataProtector/getting-started.md b/src/references/dataProtector/getting-started.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/getting-started.md
rename to src/references/dataProtector/getting-started.md
diff --git a/src/documentation/manage-data/dataProtector/migrate-from-v1.md b/src/references/dataProtector/migrate-from-v1.md
similarity index 98%
rename from src/documentation/manage-data/dataProtector/migrate-from-v1.md
rename to src/references/dataProtector/migrate-from-v1.md
index 721fc966..a202d3f1 100644
--- a/src/documentation/manage-data/dataProtector/migrate-from-v1.md
+++ b/src/references/dataProtector/migrate-from-v1.md
@@ -5,7 +5,7 @@ description:
   the latest npm package
 ---
 
-# Migrate from V1 to V2 <span style="margin-left: 12px; position: absolute; top: -2px;"><Badge type="warning" text="beta" /></span>
+# Migrate from V1 to V2 <span style="margin-left: 12px; position: absolute; top: -2px;"></span>
 
 ::: tip
 
diff --git a/src/documentation/manage-data/dataProtector/types.md b/src/references/dataProtector/types.md
similarity index 100%
rename from src/documentation/manage-data/dataProtector/types.md
rename to src/references/dataProtector/types.md
diff --git a/src/documentation/protocol/glossary.md b/src/references/glossary.md
similarity index 100%
rename from src/documentation/protocol/glossary.md
rename to src/references/glossary.md
diff --git a/src/documentation/build-iapp/iapp-generator.md b/src/references/iapp-generator.md
similarity index 66%
rename from src/documentation/build-iapp/iapp-generator.md
rename to src/references/iapp-generator.md
index fc2f54e6..25990a96 100644
--- a/src/documentation/build-iapp/iapp-generator.md
+++ b/src/references/iapp-generator.md
@@ -41,34 +41,34 @@ minutes, not months.
 
 Start here to understand what iApps are and how they work:
 
-- **[What Is an iApp?](/documentation/build-iapp/what-is-iapp)** - Core concepts
-  and TEE overview
-- **[Getting Started](/documentation/build-iapp/iapp-generator/getting-started)** -
-  Your first iApp in 15 minutes
-- **[Building Your iApp](/documentation/build-iapp/iapp-generator/building-your-iexec-app)** -
+- **[What Is an iApp?](/get-started/overview/what-is-iapp)** - Core concepts and
+  TEE overview
+- **[Getting Started](/references/iapp-generator/getting-started)** - Your first
+  iApp in 15 minutes
+- **[Building Your iApp](/references/iapp-generator/building-your-iexec-app)** -
   Complete development guide
 
 ### 2. **Master the Development Workflow**
 
 Once you've built your first iApp, level up with these practical guides:
 
-- **[Inputs and Outputs](/documentation/build-iapp/guides/inputs-and-outputs)** -
-  Handle data flow in TEE environment
-- **[Debugging Your iApp](/documentation/build-iapp/guides/debugging)** -
-  Troubleshoot execution issues
-- **[App Access Control and Pricing](/documentation/build-iapp/guides/manage-access)** -
+- **[Inputs and Outputs](/guides/build-iapp/inputs-and-outputs)** - Handle data
+  flow in TEE environment
+- **[Debugging Your iApp](/guides/build-iapp/debugging)** - Troubleshoot
+  execution issues
+- **[App Access Control and Pricing](/guides/build-iapp/manage-access)** -
   Control who can use your iApp
-- **[How to Get and Decrypt Results](/documentation/build-iapp/guides/how-to-get-and-decrypt-results)** -
+- **[How to Get and Decrypt Results](/guides/build-iapp/how-to-get-and-decrypt-results)** -
   Retrieve and use outputs
 
 ### 3. **Explore Advanced Features**
 
 Ready for production? Dive into specialized topics:
 
-- **[Using TDX (Experimental)](/documentation/build-iapp/guides/using-tdx)** -
-  Next-gen TEE technology
-- **[Complete Guides Overview](/documentation/build-iapp/guides/)** - All
-  development guides in one place
+- **[Using TDX (Experimental)](/guides/build-iapp/using-tdx)** - Next-gen TEE
+  technology
+- **[Complete Guides Overview](/guides/build-iapp/)** - All development guides
+  in one place
 
 ## Why Choose iApp Generator?
 
@@ -99,19 +99,17 @@ applications:
 
 ::: tip Quick Path
 
-1. **[Getting Started](/documentation/build-iapp/iapp-generator/getting-started)** -
-   Build your first iApp (15 minutes)
-2. **[Inputs and Outputs](/documentation/build-iapp/guides/inputs-and-outputs)** -
-   Handle data properly
-3. **[Debugging](/documentation/build-iapp/guides/debugging)** - Fix issues
-   quickly
-4. **[App Access Control](/documentation/build-iapp/guides/manage-access)** - Go
-   to production :::
+1. **[Getting Started](/references/iapp-generator/getting-started)** - Build
+   your first iApp (15 minutes)
+2. **[Inputs and Outputs](/guides/build-iapp/inputs-and-outputs)** - Handle data
+   properly
+3. **[Debugging](/guides/build-iapp/debugging)** - Fix issues quickly
+4. **[App Access Control](/guides/build-iapp/manage-access)** - Go to production
+   :::
 
 ### Need Help?
 
-- **[Complete Guides](/documentation/build-iapp/guides/)** - All development
-  guides
+- **[Complete Guides](/guides/build-iapp/)** - All development guides
 - **[iExec Discord](https://discord.com/invite/pbt9m98wnU)** - Community support
 - **[Protocol Documentation](https://protocol.docs.iex.ec)** - Technical deep
   dive
diff --git a/src/documentation/build-iapp/iapp-generator/building-your-iexec-app.md b/src/references/iapp-generator/building-your-iexec-app.md
similarity index 100%
rename from src/documentation/build-iapp/iapp-generator/building-your-iexec-app.md
rename to src/references/iapp-generator/building-your-iexec-app.md
diff --git a/src/documentation/build-iapp/iapp-generator/deserializer.md b/src/references/iapp-generator/deserializer.md
similarity index 100%
rename from src/documentation/build-iapp/iapp-generator/deserializer.md
rename to src/references/iapp-generator/deserializer.md
diff --git a/src/documentation/build-iapp/iapp-generator/deserializer/getValue.md b/src/references/iapp-generator/deserializer/getValue.md
similarity index 100%
rename from src/documentation/build-iapp/iapp-generator/deserializer/getValue.md
rename to src/references/iapp-generator/deserializer/getValue.md
diff --git a/src/documentation/build-iapp/iapp-generator/getting-started.md b/src/references/iapp-generator/getting-started.md
similarity index 100%
rename from src/documentation/build-iapp/iapp-generator/getting-started.md
rename to src/references/iapp-generator/getting-started.md
diff --git a/src/documentation/protocol/sdk.md b/src/references/sdk.md
similarity index 100%
rename from src/documentation/protocol/sdk.md
rename to src/references/sdk.md
diff --git a/src/documentation/use-iapp/web3mail.md b/src/references/web3mail.md
similarity index 71%
rename from src/documentation/use-iapp/web3mail.md
rename to src/references/web3mail.md
index 77f3d46e..cfff7c07 100644
--- a/src/documentation/use-iapp/web3mail.md
+++ b/src/references/web3mail.md
@@ -17,14 +17,14 @@ via the blockchain. This mechanism helps protect the personal information of the
 email recipients through use of Ethereum addresses.
 
 The email address is stored as a `protectedData` entity using the
-[iExec Data Protector tool](/documentation/manage-data/dataProtector). Through
-this mechanism, users have complete control over which applications may use
-their email address for sending communications. Sending a user a message,
-therefore, requires knowledge of the Ethereum address of their `protectedData`
-as well positive authorization for your account to contact them. Your account
-may be bound to either an application or an individual. At any time a user may
-revoke permissions and this revocation is immediate, giving users complete
-control over the privacy and security of their information.
+[iExec Data Protector tool](/references/dataProtector). Through this mechanism,
+users have complete control over which applications may use their email address
+for sending communications. Sending a user a message, therefore, requires
+knowledge of the Ethereum address of their `protectedData` as well positive
+authorization for your account to contact them. Your account may be bound to
+either an application or an individual. At any time a user may revoke
+permissions and this revocation is immediate, giving users complete control over
+the privacy and security of their information.
 
 Apps using the Web3Mail tool can:
 
diff --git a/src/documentation/use-iapp/web3mail/advanced-configuration.md b/src/references/web3mail/advanced-configuration.md
similarity index 100%
rename from src/documentation/use-iapp/web3mail/advanced-configuration.md
rename to src/references/web3mail/advanced-configuration.md
diff --git a/src/documentation/use-iapp/web3mail/getting-started.md b/src/references/web3mail/getting-started.md
similarity index 100%
rename from src/documentation/use-iapp/web3mail/getting-started.md
rename to src/references/web3mail/getting-started.md
diff --git a/src/documentation/use-iapp/web3mail/methods/fetchMyContacts.md b/src/references/web3mail/methods/fetchMyContacts.md
similarity index 96%
rename from src/documentation/use-iapp/web3mail/methods/fetchMyContacts.md
rename to src/references/web3mail/methods/fetchMyContacts.md
index f4117677..5b90ff02 100644
--- a/src/documentation/use-iapp/web3mail/methods/fetchMyContacts.md
+++ b/src/references/web3mail/methods/fetchMyContacts.md
@@ -64,4 +64,4 @@ messages.
 import { type Contact } from '@iexec/web3mail';
 ```
 
-[`Contact[]`](/documentation/manage-data/dataProtector/types#contact)
+[`Contact[]`](/references/dataProtector/types#contact)
diff --git a/src/documentation/use-iapp/web3mail/methods/fetchUserContacts.md b/src/references/web3mail/methods/fetchUserContacts.md
similarity index 96%
rename from src/documentation/use-iapp/web3mail/methods/fetchUserContacts.md
rename to src/references/web3mail/methods/fetchUserContacts.md
index 9395f6b3..f030a46f 100644
--- a/src/documentation/use-iapp/web3mail/methods/fetchUserContacts.md
+++ b/src/references/web3mail/methods/fetchUserContacts.md
@@ -84,4 +84,4 @@ with `userAddress` to send them messages.
 import { type Contact } from '@iexec/web3mail';
 ```
 
-[`Contract[]`](/documentation/manage-data/dataProtector/types#contact)
+[`Contract[]`](/references/dataProtector/types#contact)
diff --git a/src/documentation/use-iapp/web3mail/methods/sendEmail.md b/src/references/web3mail/methods/sendEmail.md
similarity index 98%
rename from src/documentation/use-iapp/web3mail/methods/sendEmail.md
rename to src/references/web3mail/methods/sendEmail.md
index faba89d4..02cce046 100644
--- a/src/documentation/use-iapp/web3mail/methods/sendEmail.md
+++ b/src/references/web3mail/methods/sendEmail.md
@@ -16,14 +16,14 @@ communications and permission must be granted for the `Web3Mail` tool to use the
 `protectedData` entity containing their email address. This is best done by
 granting authorization to the Web3Mail app whitelist
 `0x781482C39CcE25546583EaC4957Fb7Bf04C277D2` as `authorizedApp`. Refer to the
-[Data Protector `grantAccess`](/documentation/manage-data/dataProtector/dataProtectorCore/grantAccess)
+[Data Protector `grantAccess`](/references/dataProtector/dataProtectorCore/grantAccess)
 documentation for more details.
 
 ::: tip
 
 For executing the `sendEmail` method with a voucher or xRLC, refer to the
 dedicated section in the documentation under
-"[How to Pay for web3mail](/documentation/use-iapp/how-to-pay/how-to-pay-for-web3mail)".
+"[How to Pay for web3mail](/guides/use-iapp/how-to-pay/how-to-pay-for-web3mail)".
 
 :::
 
diff --git a/src/documentation/use-iapp/web3telegram.md b/src/references/web3telegram.md
similarity index 91%
rename from src/documentation/use-iapp/web3telegram.md
rename to src/references/web3telegram.md
index 0454d3c5..10094200 100644
--- a/src/documentation/use-iapp/web3telegram.md
+++ b/src/references/web3telegram.md
@@ -17,8 +17,8 @@ blockchain. This mechanism helps protect the personal information of the
 telegram chat ID recipients through use of Ethereum addresses.
 
 The telegram chat ID address is stored as a `protectedData` entity using
-[iExec Data Protector](/documentation/manage-data/dataProtector). Through this
-mechanism, users have complete control over which applications may use their
+[iExec Data Protector](/references/dataProtector). Through this mechanism, users
+have complete control over which applications may use their
 [chat ID](./web3telegram/integration-guide.md#_1-get-your-users-to-retrieve-their-chat-id)
 for sending communications.
 
diff --git a/src/documentation/use-iapp/web3telegram/advanced-configuration.md b/src/references/web3telegram/advanced-configuration.md
similarity index 100%
rename from src/documentation/use-iapp/web3telegram/advanced-configuration.md
rename to src/references/web3telegram/advanced-configuration.md
diff --git a/src/documentation/use-iapp/web3telegram/getting-started.md b/src/references/web3telegram/getting-started.md
similarity index 100%
rename from src/documentation/use-iapp/web3telegram/getting-started.md
rename to src/references/web3telegram/getting-started.md
diff --git a/src/documentation/use-iapp/web3telegram/integration-guide.md b/src/references/web3telegram/integration-guide.md
similarity index 100%
rename from src/documentation/use-iapp/web3telegram/integration-guide.md
rename to src/references/web3telegram/integration-guide.md
diff --git a/src/documentation/use-iapp/web3telegram/methods/fetchMyContacts.md b/src/references/web3telegram/methods/fetchMyContacts.md
similarity index 96%
rename from src/documentation/use-iapp/web3telegram/methods/fetchMyContacts.md
rename to src/references/web3telegram/methods/fetchMyContacts.md
index 11f98faf..9cfaec5f 100644
--- a/src/documentation/use-iapp/web3telegram/methods/fetchMyContacts.md
+++ b/src/references/web3telegram/methods/fetchMyContacts.md
@@ -64,4 +64,4 @@ messages.
 import { type Contact } from '@iexec/web3telegram';
 ```
 
-[`Contact[]`](/documentation/manage-data/dataProtector/types#contact)
+[`Contact[]`](/references/dataProtector/types#contact)
diff --git a/src/documentation/use-iapp/web3telegram/methods/fetchUserContacts.md b/src/references/web3telegram/methods/fetchUserContacts.md
similarity index 97%
rename from src/documentation/use-iapp/web3telegram/methods/fetchUserContacts.md
rename to src/references/web3telegram/methods/fetchUserContacts.md
index e6c92338..8cf0011d 100644
--- a/src/documentation/use-iapp/web3telegram/methods/fetchUserContacts.md
+++ b/src/references/web3telegram/methods/fetchUserContacts.md
@@ -84,4 +84,4 @@ with `userAddress` to send them messages.
 import { type Contact } from '@iexec/web3telegram';
 ```
 
-[`Contract[]`](/documentation/manage-data/dataProtector/types#contact)
+[`Contract[]`](/references/dataProtector/types#contact)
diff --git a/src/documentation/use-iapp/web3telegram/methods/sendTelegram.md b/src/references/web3telegram/methods/sendTelegram.md
similarity index 97%
rename from src/documentation/use-iapp/web3telegram/methods/sendTelegram.md
rename to src/references/web3telegram/methods/sendTelegram.md
index a159e26f..88f43340 100644
--- a/src/documentation/use-iapp/web3telegram/methods/sendTelegram.md
+++ b/src/references/web3telegram/methods/sendTelegram.md
@@ -16,14 +16,14 @@ permission must be granted for the `Web3Telegram` tool to use the
 `protectedData` entity containing their chat ID. This is best done by granting
 authorization to the Web3Telegram app whitelist
 `0x192C6f5AccE52c81Fcc2670f10611a3665AAA98F` as `authorizedApp`. Refer to the
-[Data Protector `grantAccess`](/documentation/manage-data/dataProtector/dataProtectorCore/grantAccess)
+[Data Protector `grantAccess`](/references/dataProtector/dataProtectorCore/grantAccess)
 documentation for more details.
 
 ::: tip
 
 For executing the `sendTelegram` method with a voucher or xRLC, refer to the
 dedicated section in the documentation under
-"[How to Pay for web3telegram](/documentation/use-iapp/how-to-pay/how-to-pay-for-web3telegram)".
+"[How to Pay for web3telegram](/guides/use-iapp/how-to-pay/how-to-pay-for-web3telegram)".
 
 :::