hopefully fixing conflicts v2

Author: signorecello

docs/docs/developers/guides/smart_contracts/cross_chain_communication.md

@@ -5,7 +5,7 @@ sidebar_position: 7
 description: Learn how to communicate with L1 contracts through portals in your Aztec smart contracts.
 ---
 
-Follow the [token bridge tutorial](../../../../../developers/tutorials/js_tutorials/token_bridge.md) for hands-on experience writing and deploying a Portal contract.
+Follow the [token bridge tutorial](../../tutorials/js_tutorials/token_bridge.md) for hands-on experience writing and deploying a Portal contract.
 
 ## Passing data to the rollup
 

docs/docs/developers/guides/smart_contracts/define_functions.md

@@ -51,7 +51,7 @@ Internal functions are functions that are only callable within the same contract
 
 Mark an internal function with the `#[internal]` attribute.
 
-#include_code add_to_tally_public noir-projects/noir-contracts/contracts/app/easy_private_voting_contract/src/main.nr rust
+#include_code add_to_tally_public noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr rust
 
 ## Initializer Functions
 

docs/docs/developers/guides/smart_contracts/index.md

@@ -27,13 +27,12 @@ help you write Noir programs to deploy on the Aztec network.
 aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
 ```
 
-2.  [Write your contracts](./writing_contracts/index.mdx).
-3.  [Profile](./profiling_transactions.md) the private functions in your contract to get
+2.  [Profile](./advanced/profiling_transactions.md) the private functions in your contract to get
     a sense of how long generating client side proofs will take
-4.  Write unit tests [directly in Noir](testing.md) and end-to-end
+3.  Write unit tests [directly in Noir](testing.md) and end-to-end
     tests [with TypeScript](../js_apps/test.md)
-5.  [Compile](how_to_compile_contract.md) your contract
-6.  [Deploy](../js_apps/deploy_contract.md) your contract with Aztec.js
+4.  [Compile](how_to_compile_contract.md) your contract
+5.  [Deploy](../js_apps/deploy_contract.md) your contract with Aztec.js
 
 ## Section Contents
 

docs/docs/developers/guides/smart_contracts/structure_project.md

@@ -9,7 +9,7 @@ This guide explains how to set up and structure your project for Aztec smart con
 
 ## Before you start
 
-You should have installed the sandbox, which includes local development tools, as described in [the getting started guide](../../getting_started.md).
+You should have installed the sandbox, which includes local development tools, as described in [the getting started guide](../../getting_started/getting_started.md).
 
 ## Setup