diff --git a/docs/dapp-development/convert_eos.md b/docs/dapp-development/convert_eos.md
index 49c7299f..8db5d7fd 100644
--- a/docs/dapp-development/convert_eos.md
+++ b/docs/dapp-development/convert_eos.md
@@ -29,16 +29,16 @@ WAX is fully compatible with EOS smart contracts and offers free blockchain acco
If you'd like to test your smart contracts on WAX, you can:
-* Complete our [Docker Quickstart](/wax-developer/docs/docker_qstart) (recommended) or use the [WAX Blockchain Setup](/wax-developer/docs/blockchain_setup) to build from source.
-* Build your contracts using the [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/cdt).
-* [Set Up a Local dApp Environment](/wax-developer/docs/local_dapp_dev).
-* Deploy to the [WAX Testnet](/wax-developer/docs/testnet_depoy).
+* Complete our [Docker Quickstart](/wax-developer/docs/dapp-development/docker-setup) (recommended) or use the [WAX Blockchain Setup](/wax-developer/docs/dapp-development/wax-blockchain-setup) to build from source.
+* Build your contracts using the [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/dapp-development/wax-cdt).
+* [Set Up a Local dApp Environment](/wax-developer/docs/dapp-development/setup-local-dapp-environment).
+* Deploy to the [WAX Testnet](/wax-developer/docs/dapp-development/testnet-quickstart).
Warning: Setting up WAX source code in your local development environment will overwrite a current EOS installation. If you'd like to keep your EOS environment, it's recommended that you use Docker, a virtual machine, or a separate development environment.
{: .label .label-yellow }
## Deploy Your Smart Contracts
-You must compile your smart contracts using the [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/cdt).
+You must compile your smart contracts using the [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/dapp-development/wax-cdt).
-If you don't want to install the WAX source code, you can use our [Docker Quickstart](/wax-developer/docs/docker_qstart) or custom scripts to deploy your smart contracts. Refer to [Deploy Your dApp on WAX](/wax-developer/docs/dapp_deploy) for more information.
\ No newline at end of file
+If you don't want to install the WAX source code, you can use our [Docker Quickstart](/wax-developer/docs/dapp-development/docker-setup) or custom scripts to deploy your smart contracts. Refer to [Deploy Your dApp on WAX](/wax-developer/docs/dapp-development/deploy-dapp-on-wax) for more information.
diff --git a/docs/dapp-development/dapp_environments.md b/docs/dapp-development/dapp_environments.md
index 853ffbc0..66df3f00 100644
--- a/docs/dapp-development/dapp_environments.md
+++ b/docs/dapp-development/dapp_environments.md
@@ -154,9 +154,9 @@ When you [Set Up a Local dApp Environment](/wax-developer/docs/local_dapp_dev),
You can write WAX smart contracts using the C++ programming language. No custom language is required, although you'll need to familiarize yourself with the WAX C/C++ API library. This library contains the core files required to communicate with the WAX Blockchain. When you're ready to get started, refer to:
-* [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/cdt)
-* [WAX-CDT API](/wax-developer/docs/cdt_api)
-* [Smart Contract Basics](/wax-developer/docs/smart_contract_basics)
+* [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/dapp-development/wax-cdt)
+* [WAX-CDT API](/wax-developer/docs/api-reference/cdt_api)
+* [Smart Contract Quickstart](/wax-developer/docs/dapp-development/smart-contract-quickstart)
@@ -166,8 +166,6 @@ You can use any third party C++ editor or IDE to write your smart contracts, suc
EOS Studio is a graphic IDE built for EOSIO dApp development, available on Linux, Mac OS, and Windows. This tool features a code editor, contract inspector, and a network manager. To integrate WAX with EOS Studio, refer to How to use EOS Studio with WAX. Our script provides a minimal integration, developed and tested with Ubuntu 18.04.
-eosjs is a javascript API SDK you can use to easily communicate with the WAX Blockchain API. Refer to [WAX RPC API](/wax-developer/docs/blockchain_api) for more information.
-
-dfuse is a powerful suite of APIs that allow you to query the WAX Blockchain and stream real-time data. Refer to [dfuse for WAX dApps](/wax-developer/docs/dfuse_overview) for more information.
-
+eosjs is a javascript API SDK you can use to easily communicate with the WAX Blockchain API. Refer to [WAX RPC API](/wax-developer/docs/api-reference/rpc_api) for more information.
+dfuse is a powerful suite of APIs that allow you to query the WAX Blockchain and stream real-time data. Refer to [dfuse for WAX dApps](/wax-developer/docs/api-reference/dfuse) for more information.
diff --git a/docs/dapp-development/index.md b/docs/dapp-development/index.md
index 7a35d98e..57b36a80 100644
--- a/docs/dapp-development/index.md
+++ b/docs/dapp-development/index.md
@@ -11,7 +11,7 @@ The Worldwide Asset eXchangeâ„¢ (WAX) is a purpose-built blockchain and protocol
You can use the following guides to set up your WAX dApp development environment:
* Complete our [Docker Quickstart](/wax-developer/docs/dapp-development/docker-setup)
- * Download WAX Blockchain source code and samples using the [WAX Blockchain Setup](/wax-developer/docs/dapp-development/blockchain_setup) guide
+ * Download WAX Blockchain source code and samples using the [WAX Blockchain Setup](/wax-developer/docs/dapp-development/wax-blockchain-setup) guide
* Learn about the [WAX Contract Development Toolkit (WAX-CDT)](/wax-developer/docs/dapp-development/wax-cdt)
* [Set Up a Local dApp Environment](/wax-developer/docs/dapp-development/setup-local-dapp-environment)