diff --git a/SUMMARY.md b/SUMMARY.md
index 9a6d8a2..5947224 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -3,38 +3,37 @@
 ## General
 
 * [Introduction to Tornado Cash](README.md)
-* [How does Tornado Cash work?](general/how-does-tornado.cash-work.md)
-* [Tips to remain anonymous](general/tips-to-remain-anonymous.md)
-* [How to use Tornado Cash with TOR](general/how-to-use-tornado-cash-with-tor.md)
-* [TORN](general/torn.md)
-* [Governance](general/governance.md)
-* [Staking](general/staking/README.md)
-  * [Tornado Cash](general/staking/tornado-cash.md)
-* [How to become a relayer?](general/how-to-become-a-relayer.md)
-* [Community involvement](general/community-involvement.md)
-* [Tornado Cash smart contracts](general/tornado-cash-smart-contracts.md)
-* [Minified UI hosted locally](general/minified-ui-hosted-locally.md)
+* [How does it work?](general/how-does-it-work.md)
+* [TORN](general/token/index.md)
+* [Governance](general/community/governance.md)
+* [Staking](general/token/staking.md)
+* [Contributing](general/community/contributing.md)
+
+## Guides
+
+* [How to become a relayer?](general/guides/relayer.md)
+* [Local UI deployment](general/guides/local-ui.md)
+* [Tips to remain anonymous](general/guides/opsec.md)
+* [TOR network](general/guides/tor.md)
 
 ## Tornado Cash Classic
 
-* [How to connect your wallet](tornado-cash-classic/how-to-connect-your-wallet.md)
-* [Deposit & Withdraw](tornado-cash-classic/deposit-withdraw.md)
-* [Anonymity Mining](tornado-cash-classic/anonymity-mining.md)
-* [Compliance Tool](tornado-cash-classic/compliance-tool.md)
+* [How to connect your wallet](tornado-cash-classic/connect-wallet.md)
+* [Deposit / Withdraw](tornado-cash-classic/deposit-withdraw.md)
 * [Circuits](circuits/README.md)
-  * [Core Deposit Circuit](circuits/core-deposit-circuit.md)
+  * [Core](circuits/core-deposit-circuit.md)
   * [Anonymity Mining](circuits/anonymity-mining/README.md)
     * [Tornado Trees](circuits/anonymity-mining/tornado-trees.md)
-    * [Reward Claim](circuits/anonymity-mining/mining-rewards.md)
+    * [Reward Swap](circuits/anonymity-mining/mining-rewards.md)
 
 ## Tornado Cash Nova
 
-* [Logging in Tornado Cash Nova](tornado-cash-nova/logging-in-tornado-cash-nova.md)
-* [Fund & withdraw on Nova](tornado-cash-nova/fund-and-withdraw-on-nova.md)
-* [Shielded transfers on Nova](tornado-cash-nova/shielded-transfers-on-nova.md)
-* [More anonymity tips](tornado-cash-nova/more-anonymity-tips.md)
+* [How to connect your wallet](tornado-cash-nova/connect-wallet.md)
+* [Deposit / Withdraw](tornado-cash-nova/deposit-withdraw.md)
+* [Shielded transfers](tornado-cash-nova/shielded-transfers.md)
+* [Anonymity tips](tornado-cash-nova/anonymity-tips.md)
 
-## They talk about us
+## Resources
 
-* [Articles](medias/articles.md)
-* [Videos](medias/videos.md)
+* [Compliance tool](general/resources/compliance-tool.md)
+* [Analytics](general/resources/analytics.md)
\ No newline at end of file
diff --git a/general/tutorial/local-ui.md b/general/guides/local-ui.md
similarity index 98%
rename from general/tutorial/local-ui.md
rename to general/guides/local-ui.md
index 697d225..b7cd7b3 100644
--- a/general/tutorial/local-ui.md
+++ b/general/guides/local-ui.md
@@ -1,4 +1,4 @@
-# Minified UI Hosted Locally
+# Local UI deployment
 
 Tornado Cash protocol can be launched locally on your computer through a minified User Interface version made available by the core developers team.
 
diff --git a/general/tutorial/opsec.md b/general/guides/opsec.md
similarity index 100%
rename from general/tutorial/opsec.md
rename to general/guides/opsec.md
diff --git a/general/tutorial/relayer.md b/general/guides/relayer.md
similarity index 100%
rename from general/tutorial/relayer.md
rename to general/guides/relayer.md
diff --git a/general/tutorial/tor.md b/general/guides/tor.md
similarity index 100%
rename from general/tutorial/tor.md
rename to general/guides/tor.md
diff --git a/general/tooling/analytics.md b/general/resources/analytics.md
similarity index 100%
rename from general/tooling/analytics.md
rename to general/resources/analytics.md
diff --git a/general/tooling/compliance.md b/general/resources/compliance-tool.md
similarity index 99%
rename from general/tooling/compliance.md
rename to general/resources/compliance-tool.md
index d80234a..fed4f3c 100644
--- a/general/tooling/compliance.md
+++ b/general/resources/compliance-tool.md
@@ -1,4 +1,4 @@
-# Compliance Tool
+# Compliance tool
 
 By design, everything is public on the blockchain, which can deprive users from their right to privacy. Anyone can have access to everyone’s whole transaction history. In response to this core problem,Tornado.Cash protocol allows cryptocurrency holders to earn back their privacy and gain anonymity. Indeed, it enables users to break the on-chain link between a source and a destination address.