diff --git a/components/Starknet/modules/architecture_and_concepts/nav.adoc b/components/Starknet/modules/architecture_and_concepts/nav.adoc
index 206080eec0..a643442e25 100644
--- a/components/Starknet/modules/architecture_and_concepts/nav.adoc
+++ b/components/Starknet/modules/architecture_and_concepts/nav.adoc
@@ -3,18 +3,18 @@
 ** Blockchain architecture
 
 *** Blocks and transactions
-**** xref:Network_Architecture/Blocks/header.adoc[Block structure]
-**** xref:Network_Architecture/Blocks/transaction-life-cycle.adoc[Transaction lifecycle]
-**** xref:Network_Architecture/Blocks/transactions.adoc[Transaction types]
-**** xref:Network_Architecture/Fees/fee-mechanism.adoc[Gas and transaction fees]
+**** xref:Network_Architecture/header.adoc[Block structure]
+**** xref:Network_Architecture/transaction-life-cycle.adoc[Transaction lifecycle]
+**** xref:Network_Architecture/transactions.adoc[Transaction types]
+**** xref:Network_Architecture/fee-mechanism.adoc[Gas and transaction fees]
 
 *** State
-**** xref:Network_Architecture/State/starknet-state.adoc[Starknet state]
-**** xref:Network_Architecture/Data_Availability/on-chain-data.adoc[Data availability]
+**** xref:Network_Architecture/starknet-state.adoc[Starknet state]
+**** xref:Network_Architecture/on-chain-data.adoc[Data availability]
 
 *** L1-L2 messaging
-**** xref:Network_Architecture/L1-L2_Communication/messaging-mechanism.adoc[L1-L2 messaging]
-**** xref:Network_Architecture/L1-L2_Communication/token-bridge.adoc[Starkgate bridge]
+**** xref:Network_Architecture/messaging-mechanism.adoc[L1-L2 messaging]
+**** xref:Network_Architecture/token-bridge.adoc[Starkgate bridge]
 
 ** Accounts
 *** xref:Accounts/introduction.adoc[What is an account?]
@@ -29,7 +29,7 @@
 *** xref:Smart_Contracts/contract-address.adoc[Contract address]
 *** xref:Smart_Contracts/contract-storage.adoc[Contract storage]
 *** xref:Smart_Contracts/contract-abi.adoc[Contract ABI]
-*** xref:Smart_Contracts/Events/starknet-events.adoc[Events]
+*** xref:Smart_Contracts/starknet-events.adoc[Events]
 *** xref:Smart_Contracts/contract-syntax.adoc[Contract migration guide]
 *** xref:Smart_Contracts/cairo-and-sierra.adoc[Cairo and Sierra]
 *** xref:Smart_Contracts/system-calls-cairo1.adoc[System calls]
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Fees/fee-mechanism.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/fee-mechanism.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Fees/fee-mechanism.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/fee-mechanism.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Blocks/header.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/header.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Blocks/header.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/header.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/L1-L2_Communication/messaging-mechanism.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/messaging-mechanism.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/L1-L2_Communication/messaging-mechanism.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/messaging-mechanism.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Data_Availability/on-chain-data.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/on-chain-data.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Data_Availability/on-chain-data.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/on-chain-data.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/State/starknet-state.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/starknet-state.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/State/starknet-state.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/starknet-state.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/L1-L2_Communication/token-bridge.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/token-bridge.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/L1-L2_Communication/token-bridge.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/token-bridge.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Blocks/transaction-life-cycle.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/transaction-life-cycle.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Blocks/transaction-life-cycle.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/transaction-life-cycle.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Blocks/transactions.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/transactions.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/Blocks/transactions.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Network_Architecture/transactions.adoc
diff --git a/components/Starknet/modules/architecture_and_concepts/pages/Smart_Contracts/Events/starknet-events.adoc b/components/Starknet/modules/architecture_and_concepts/pages/Smart_Contracts/starknet-events.adoc
similarity index 100%
rename from components/Starknet/modules/architecture_and_concepts/pages/Smart_Contracts/Events/starknet-events.adoc
rename to components/Starknet/modules/architecture_and_concepts/pages/Smart_Contracts/starknet-events.adoc