diff --git a/documentation/docs/next.config.js b/documentation/docs/next.config.js
index b3c23966a7..080d0afadf 100644
--- a/documentation/docs/next.config.js
+++ b/documentation/docs/next.config.js
@@ -43,445 +43,543 @@ const config = {
   async redirects() {
     return [
       // network docs
+      // {
+      //   source: "/",
+      //   destination: "/docs",
+      //   basePath: false,
+      //   permanent: true,
+      // },
       {
-        source: "/",
-        destination: "/docs",
-        basePath: false,
+        source: "/operators",
+        destination: "docs/operators/introduction",
         permanent: true,
+        basePath : false,
+      },
+      {
+        source: "/docs/operators",
+        destination: "docs/operators/introduction",
+        permanent: true,
+        basePath : false,
+      },
+
+      {
+        source: "/developers",
+        destination: "/docs/developers",
+        permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/architecture/nym-vs-others.html",
-        destination: "/network/architecture/nym-vs-others",
+        destination: "/docs/network/architecture/nym-vs-others",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/architecture/traffic-flow.html",
-        destination: "/network/traffic",
+        destination: "/docs/network/traffic", // testing difference
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/architecture/addressing-system.html",
-        destination: "/network/traffic/addressing-system",
+        destination: "/docs/network/traffic/addressing-system",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/binaries/pre-built-binaries.html",
-        destination: "/developers/binaries#building-from-source",
+        destination: "/docs/developers/binaries#building-from-source",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/binaries/init-and-config.html",
-        destination: "/developers/binaries#building-from-source",
+        destination: "/docs/developers/binaries#building-from-source",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/binaries/building-nym.html",
-        destination: "/developers/binaries#building-from-source",
+        destination: "/docs/developers/binaries#building-from-source",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nodes/overview.html ",
-        destination: "/network/architecture/mixnet/nodes",
+        destination: "/docs/network/architecture/mixnet/nodes",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/wallet/desktop-wallet.html",
         destination:
           "https://github.com/nymtech/nym/tree/master/nym-wallet#installation-prerequisites---linux--mac",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/wallet/cli-wallet.html",
-        destination: "/developers/chain/cli-wallet",
+        destination: "/docs/developers/chain/cli-wallet",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/explorers/mixnet-explorer.html",
         destination:
           "https://github.com/nymtech/nym/tree/master/explorer#nym-network-explorer",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/interacting-with-chain.html",
-        destination: "/developers/chain",
+        destination: "/docs/developers/chain",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/smart-contracts.html",
-        destination: "/network/architecture/nyx/smart-contracts",
+        destination: "/docs/network/architecture/nyx/smart-contracts",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/mixnet-contract.html",
         destination:
-          "/network/architecture/nyx/smart-contracts/mixnet-contract",
+          "/docs/network/architecture/nyx/smart-contracts/mixnet-contract",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/vesting-contract.html",
         destination:
-          "/network/architecture/nyx/smart-contracts/vesting-contract",
+          "/docs/network/architecture/nyx/smart-contracts/vesting-contract",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/rpc-node.html",
-        destination: "/developers/chain/rpc-node",
+        destination: "/docs/developers/chain/rpc-node",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/ledger-live.html",
-        destination: "/developers/chain/ledger-live",
+        destination: "/docs/developers/chain/ledger-live",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/coconut.html",
-        destination: "/network/cryptography/zk-nym",
+        destination: "/docs/network/cryptography/zk-nym",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/nyx/bandwidth-credentials.html",
-        destination: "/network/cryptography/zk-nym",
+        destination: "/docs/network/cryptography/zk-nym",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/tools/nym-cli.html",
-        destination: "/developers/tools/nym-cli",
+        destination: "/docs/developers/tools/nym-cli",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/coc.html",
-        destination: "/network/coc",
+        destination: "/docs/network/coc",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/docs/licensing.html",
-        destination: "/network/licensing",
+        destination: "/docs/network/licensing",
         permanent: true,
+        basePath : false,
       },
       // dev docs
       {
         source: "/developers/clients-overview.html",
-        destination: "/developers/clients",
+        destination: "/docs/developers/clients",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/rust.html",
-        destination: "/developers/rust",
+        destination: "/docs/developers/rust",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/message-types.html",
-        destination: "/developers/rust/mixnet/message-types",
+        destination: "/docs/developers/rust/mixnet/message-types",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/message-helpers.html",
-        destination: "/developers/rust/mixnet/message-helpers",
+        destination: "/docs/developers/rust/mixnet/message-helpers",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/troubleshooting.html",
-        destination: "/developers/rust/mixnet/troubleshooting",
+        destination: "/docs/developers/rust/mixnet/troubleshooting",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples.html",
-        destination: "/developers/rust/mixnet/examples",
+        destination: "/docs/developers/rust/mixnet/examples",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/simple.html",
-        destination: "/developers/rust/mixnet/examples/simple",
+        destination: "/docs/developers/rust/mixnet/examples/simple",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/keys.html",
-        destination: "/developers/sdk/rust/examples/keys.html",
+        destination: "/docs/developers/sdk/rust/examples/keys.html",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/storage.html",
         destination:
-          "/developers/rust/mixnet/examples/builders/builder-with-storage",
+          "/docs/developers/rust/mixnet/examples/builders/builder-with-storage",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/surbs.html",
-        destination: "/developers/rust/mixnet/examples/surbs",
+        destination: "/docs/developers/rust/mixnet/examples/surbs",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/custom-network.html",
-        destination: "/developers/rust/mixnet/examples/custom-topology",
+        destination: "/docs/developers/rust/mixnet/examples/custom-topology",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/socks.html",
-        destination: "/developers/rust/mixnet/examples/socks",
+        destination: "/docs/developers/rust/mixnet/examples/socks",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/split-send.html",
-        destination: "/developers/rust/mixnet/examples/split-send",
+        destination: "/docs/developers/rust/mixnet/examples/split-send",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/credential.html",
-        destination: "/developers/rust/mixnet",
+        destination: "/docs/developers/rust/mixnet",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/rust/examples/cargo.html",
-        destination: "/developers/rust/importing",
+        destination: "/docs/developers/rust/importing",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/sdk/typescript.html",
-        destination: "/developers/typescript",
+        destination: "/docs/developers/typescript",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/binaries/pre-built-binaries.html",
-        destination: "/developers/binaries#pre-built-binaries",
+        destination: "/docs/developers/binaries#pre-built-binaries",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/binaries/building-nym.html",
-        destination: "/developers/binaries",
+        destination: "/docs/developers/binaries",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/websocket-client.html",
-        destination: "/developers/clients/websocket",
+        destination: "/docs/developers/clients/websocket",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/websocket/setup.html",
-        destination: "/developers/clients/websocket/setup",
+        destination: "/docs/developers/clients/websocket/setup",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/websocket/config.html",
-        destination: "/developers/clients/websocket/config",
+        destination: "/docs/developers/clients/websocket/config",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/websocket/usage.html",
-        destination: "/developers/clients/websocket/usage",
+        destination: "/docs/developers/clients/websocket/usage",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/websocket/examples.html",
-        destination: "/developers/clients/websocket/examples",
+        destination: "/docs/developers/clients/websocket/examples",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/socks5-client.html",
-        destination: "/developers/clients/socks5",
+        destination: "/docs/developers/clients/socks5",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/socks5/setup.html",
-        destination: "/developers/clients/socks5#client-setup",
+        destination: "/docs/developers/clients/socks5#client-setup",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/socks5/usage.html",
-        destination: "/developers/clients/socks5#using-your-socks5-client",
+        destination: "/docs/developers/clients/socks5#using-your-socks5-client",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/clients/webassembly-client.html",
-        destination: "/developers/clients/webassembly-client",
+        destination: "/docs/developers/clients/webassembly-client",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/tutorials/coming-soon.html",
-        destination: "/developers/rust#",
+        destination: "/docs/developers/rust#",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/integrations/integration-options.html",
-        destination: "/developers/integrations",
+        destination: "/docs/developers/integrations",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/faq/integrations-faq.html",
-        destination: "/developers/integrations",
+        destination: "/docs/developers/integrations",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/coc.html",
-        destination: "/developers/coc",
+        destination: "/docs/developers/coc",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/licensing.html",
-        destination: "/developers/licensing",
+        destination: "/docs/developers/licensing",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/nymvpn/intro.html",
-        destination: "/developers/archive/nymvpn",
+        destination: "/docs/developers/archive/nymvpn",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/nymvpn/cli.html",
-        destination: "/developers/nymvpn/cli",
+        destination: "/docs/developers/nymvpn/cli",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/archive/nym-connect.html",
-        destination: "/developers/archive/nym-connect",
+        destination: "/docs/developers/archive/nym-connect",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/examples/custom-services.html",
-        destination: "/developers/rust/mixnet/other-examples#services",
+        destination: "/docs/developers/rust/mixnet/other-examples#services",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/examples/browser-only.html",
-        destination: "/developers/rust/mixnet/other-examples#browser-only",
+        destination: "/docs/developers/rust/mixnet/other-examples#browser-only",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/examples/using-nrs.html",
-        destination: "/developers/rust/mixnet/other-examples",
+        destination: "/docs/developers/rust/mixnet/other-examples",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/examples/monorepo-examples.html",
-        destination: "/developers/rust/mixnet/other-examples",
+        destination: "/docs/developers/rust/mixnet/other-examples",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/developers/integrations",
-        destination: "/developers/integrations/payment-integration.html",
+        destination: "/docs/developers/integrations/payment-integration.html",
         permanent: true,
+        basePath : false,
       },
-      // {
-      //   source: "",
-      //   destination: "",
-      //   permanent: true,
-      // },
+
       // operators:
       // specific urls that have changed
       {
         source: "/operators/nodes/wallet-preparation.html",
-        destination: "/operators/nodes/preliminary-steps/wallet-preparation",
+        destination: "/docs/operators/nodes/preliminary-steps/wallet-preparation",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/vps-setup.html",
-        destination: "/operators/nodes/preliminary-steps/vps-setup",
+        destination: "/docs/operators/nodes/preliminary-steps/vps-setup",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/proxy-configuration.html",
         destination:
-          "/operators/nodes/nym-node/configuration/proxy-configuration",
+          "/docs/operators/nodes/nym-node/configuration/proxy-configuration",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/bonding.html",
-        destination: "/operators/nodes/nym-node/bonding",
+        destination: "/docs/operators/nodes/nym-node/bonding",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/nym-api.html",
-        destination: "/operators/nodes/validator-setup/nym-api",
+        destination: "/docs/operators/nodes/validator-setup/nym-api",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/nyx-configuration.html",
-        destination: "/operators/nodes/validator-setup/nyx-configuration",
+        destination: "/docs/operators/nodes/validator-setup/nyx-configuration",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/manual-upgrade.html",
-        destination: "/operators/nodes/maintenance/manual-upgrade",
+        destination: "/docs/operators/nodes/maintenance/manual-upgrade",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/nodes/nymvisor-upgrade.html",
-        destination: "/operators/nodes/maintenance/nymvisor-upgrade",
+        destination: "/docs/operators/nodes/maintenance/nymvisor-upgrade",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/testing/performance.html",
-        destination: "/operators/nodes/performance-and-testing",
+        destination: "/docs/operators/nodes/performance-and-testing",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/testing/gateway-probe.html",
-        destination: "/operators/nodes/performance-and-testing/gateway-probe",
+        destination: "/docs/operators/nodes/performance-and-testing/gateway-probe",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/testing/node-api-check.html",
-        destination: "/operators/nodes/performance-and-testing/node-api-check",
+        destination: "/docs/operators/nodes/performance-and-testing/node-api-check",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/testing/prometheus-grafana.html",
         destination:
-          "/operators/nodes/performance-and-testing/prometheus-grafana",
+          "/docs/operators/nodes/performance-and-testing/prometheus-grafana",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/testing/explorenym-scripts.html",
         destination:
-          "/operators/nodes/performance-and-testing/prometheus-grafana/explorenym-scripts",
+          "/docs/operators/nodes/performance-and-testing/prometheus-grafana/explorenym-scripts",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/community-counsel.html",
-        destination: "/operators/community-counsel",
+        destination: "/docs/operators/community-counsel",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/exit-gateway.html",
-        destination: "/operators/community-counsel/exit-gateway",
+        destination: "/docs/operators/community-counsel/exit-gateway",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/isp-list.html",
-        destination: "/operators/community-counsel/isp-list",
+        destination: "/docs/operators/community-counsel/isp-list",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/jurisdictions.html",
-        destination: "/operators/community-counsel/jurisdictions",
+        destination: "/docs/operators/community-counsel/jurisdictions",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/swiss.html",
-        destination: "/operators/community-counsel/jurisdictions/swiss",
+        destination: "/docs/operators/community-counsel/jurisdictions/swiss",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/united-states.html",
-        destination: "/operators/community-counsel/jurisdictions/united-states",
+        destination: "/docs/operators/community-counsel/jurisdictions/united-states",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/landing-pages.html",
-        destination: "/operators/community-counsel/landing-pages",
+        destination: "/docs/operators/community-counsel/landing-pages",
         permanent: true,
+        basePath : false,
       },
       {
         source: "/operators/legal/add-content.html",
-        destination: "/operators/community-counsel/add-content",
+        destination: "/docs/operators/community-counsel/add-content",
         permanent: true,
-      },
-      // since the filepaths are mostly the same, we otherwise just match on old URLs that end with .html
-      {
-        source: "/:path*.html",
-        destination: "/:path*",
-        permanent: false,
+        basePath : false,
       },
 
+      // Change the basePath to /docs
+      {
+        source: "/",
+        destination: "/docs",
+        basePath: false,
+        permanent: true,
+      },
       // TODO these need to go in the config of the existing deployed ts sdk docs to redirect from there
       //      these assume source basePath = sdk.nymtech.net
       // {