diff --git a/pages/builders/app-developers/bridging/messaging.mdx b/pages/builders/app-developers/bridging/messaging.mdx
index 07fe0b1b3..79b83d3a3 100644
--- a/pages/builders/app-developers/bridging/messaging.mdx
+++ b/pages/builders/app-developers/bridging/messaging.mdx
@@ -215,7 +215,7 @@ The L1 proof and finalization transactions are typically significantly more expe
One of the most important things to understand about L1 ⇔ L2 interaction is that **mainnet messages sent from Layer 2 to Layer 1 cannot be relayed for at least 7 days**.
This means that any messages you send from Layer 2 will only be received on Layer 1 after this one week period has elapsed.
-We call this period of time the "challenge period" because it is the time during which a transaction can be challenged with a [fault proof](/stack/protocol/overview#fault-proofs).
+We call this period of time the "challenge period" because it is the time during which a transaction can be challenged with a [fault proof](/stack/protocol/rollup/overview#fault-proofs).
Optimistic Rollups are "optimistic" because they're based around the idea of publishing the *result* of a transaction to Ethereum without actually executing the transaction on Ethereum.
In the "optimistic" case, this transaction result is correct and one can completely avoid the need to perform complicated (and expensive) logic on Ethereum.
diff --git a/pages/builders/chain-operators/self-hosted.mdx b/pages/builders/chain-operators/self-hosted.mdx
index 13f12c4a4..328a6fd0f 100644
--- a/pages/builders/chain-operators/self-hosted.mdx
+++ b/pages/builders/chain-operators/self-hosted.mdx
@@ -20,7 +20,7 @@ There are two main steps to get started building your own self-hosted OP Chain:
To work with OP Chains, you'll need to understand the fundamental components of OP Chains.
* **Chain Architecture**: OP Chains use execution and consensus clients as well as the OP Stack's privileged roles. For more details, see the [Chain Architecture](/builders/chain-operators/architecture) guide.
- * **Smart Contracts**: OP Chains use several smart contracts on the L1 blockchain to manage aspects of the Rollup. Each OP Stack chain has its own set of [L1 smart contracts](/stack/protocol/smart-contracts#l1-contracts) and [L2 contracts or predeploys](/stack/protocol/smart-contracts#l2-contracts-predeploys) that are deployed when the chain is created.
+ * **Smart Contracts**: OP Chains use several smart contracts on the L1 blockchain to manage aspects of the Rollup. Each OP Stack chain has its own set of [L1 smart contracts](/stack/protocol/rollup/smart-contracts#l1-contracts) and [L2 contracts or predeploys](/stack/protocol/rollup/smart-contracts#l2-contracts-predeploys) that are deployed when the chain is created.
* **Preinstalls**: OP Chains come with [preinstalled core contracts](/builders/chain-operators/features/preinstalls), making them usable as soon as a chain is initialized on the OP Stack.
diff --git a/pages/builders/chain-operators/tutorials/create-l2-rollup.mdx b/pages/builders/chain-operators/tutorials/create-l2-rollup.mdx
index bb92b469b..58be50ce0 100644
--- a/pages/builders/chain-operators/tutorials/create-l2-rollup.mdx
+++ b/pages/builders/chain-operators/tutorials/create-l2-rollup.mdx
@@ -46,7 +46,7 @@ You'll be using the L1 Bedrock smart contracts found in the [`contracts-bedrock`
You should only use governance approved and audited smart contracts.
The monorepo has them tagged with the following pattern `op-contracts/vX.X.X`
and you can review the release notes for details on the changes. Read more
- about the details on our [Smart Contract Overview](/stack/protocol/smart-contracts).
+ about the details on our [Smart Contract Overview](/stack/protocol/rollup/smart-contracts).
### Sequencer Node
diff --git a/pages/chain/addresses.mdx b/pages/chain/addresses.mdx
index 629cf0717..e0142fce3 100644
--- a/pages/chain/addresses.mdx
+++ b/pages/chain/addresses.mdx
@@ -11,7 +11,7 @@ import { L2ContractTable } from '@/components/L2ContractTable'
# Contract Addresses
This reference guide lists all the contract addresses for Mainnet and Testnet, as found on the [superchain-registry](https://github.com/ethereum-optimism/superchain-registry/tree/main).
-See the [Smart Contracts Overview](/stack/protocol/smart-contracts) for high-level details and access to the source code.
+See the [Smart Contracts Overview](/stack/protocol/rollup/smart-contracts) for high-level details and access to the source code.
This page is automatically generated from packages in the [superchain-registry](https://github.com/ethereum-optimism/superchain-registry/tree/main) which keeps the content synched and up-to-date.
diff --git a/pages/connect/contribute/stack-contribute.mdx b/pages/connect/contribute/stack-contribute.mdx
index 584de36d0..319686c69 100644
--- a/pages/connect/contribute/stack-contribute.mdx
+++ b/pages/connect/contribute/stack-contribute.mdx
@@ -8,7 +8,7 @@ import { Callout } from 'nextra/components'
# Contribute to the OP Stack
-The OP Stack is a collaborative, decentralized development stack that only gets more powerful as more people contribute. Code for the OP Stack should follow the stack's [design principles](/stack/protocol/design-principles), which means it should be entirely open source and accessible for people to hack on, contribute to, and extend.
+The OP Stack is a collaborative, decentralized development stack that only gets more powerful as more people contribute. Code for the OP Stack should follow the stack's [design principles](/stack/design-principles), which means it should be entirely open source and accessible for people to hack on, contribute to, and extend.
The Optimism Collective wins when it works together. ♥️✨
Whether you're a budding chain operator, app developer, node operator, bounty hunter, content creator, or anything in between, the OP Stack always has something for you to contribute to.
@@ -16,7 +16,7 @@ Every contribution makes a difference — no contribution is too small. If you'r
## Component Contributions
-The OP Stack is a decentralized development stack and is constantly evolving as new layers and modules are developed. Anyone can contribute components that can be considered part of the OP Stack as long as those components fit the stack's [design principles and goals](/stack/protocol/design-principles).
+The OP Stack is a decentralized development stack and is constantly evolving as new layers and modules are developed. Anyone can contribute components that can be considered part of the OP Stack as long as those components fit the stack's [design principles and goals](/stack/design-principles).
To start contributing components to the stack, check out some of these [useful ideas](https://github.com/ethereum-optimism/ecosystem-contributions) and get to building! And don't forget that projects can also receive grants from the Collective via [RetroPGF](https://community.optimism.io/docs/governance/citizens-house/#how-retropgf-works).
## Codebase Contributions
diff --git a/pages/stack/_meta.json b/pages/stack/_meta.json
index bcc44e4d5..98eefb94c 100644
--- a/pages/stack/_meta.json
+++ b/pages/stack/_meta.json
@@ -1,8 +1,9 @@
{
"getting-started": "Getting Started: OP Stack",
"differences": "Differences Between Ethereum and OP Stack Chains",
- "explainer": "Superchain Explainer",
"components": "OP Stack Components",
+ "explainer": "Superchain Explainer",
+ "design-principles": "Design Philosophy & Principles",
"protocol": "Protocol",
"transactions": "Transactions",
"security": "Security"
diff --git a/pages/stack/protocol/design-principles.mdx b/pages/stack/design-principles.mdx
similarity index 100%
rename from pages/stack/protocol/design-principles.mdx
rename to pages/stack/design-principles.mdx
diff --git a/pages/stack/getting-started.mdx b/pages/stack/getting-started.mdx
index ba0c16992..554a247c7 100644
--- a/pages/stack/getting-started.mdx
+++ b/pages/stack/getting-started.mdx
@@ -66,7 +66,7 @@ At the end of the day, the OP Stack becomes what Optimism needs.
Ready to dive into the world of the OP Stack?
* If you're interested in learning more about the current release of the OP Stack, check out the Bedrock Release page.
-* If you're interested in understanding the OP Stack in more depth, start with the [Design Principles](protocol/design-principles) and [Components Overview](components).
+* If you're interested in understanding the OP Stack in more depth, start with the [Design Principles](design-principles) and [Components Overview](components).
* If you're excited to join the Superchain, launch your first Superchain-ready L2 with our [Getting Started guide](explainer) or dive directly into the OP Stack codebase to learn more.
The OP Stack is the next frontier for Ethereum. You're already here, so what are you waiting for?
diff --git a/pages/stack/protocol/_meta.json b/pages/stack/protocol/_meta.json
index dab7503ea..a2ce154b7 100644
--- a/pages/stack/protocol/_meta.json
+++ b/pages/stack/protocol/_meta.json
@@ -1,10 +1,5 @@
{
- "overview": "Rollup Protocol Overview",
- "design-principles": "Design Philosophy & Principles",
- "smart-contracts": "Smart Contract Overview",
- "deposit-flow": "Deposit Flow",
- "transaction-flow": "Transaction Flow",
- "withdrawal-flow": "Withdrawal Flow",
+ "rollup": "Rollup",
"fault-proofs": "Fault Proofs",
"outages": "Sequencer Outages"
}
\ No newline at end of file
diff --git a/pages/stack/protocol/rollup/_meta.json b/pages/stack/protocol/rollup/_meta.json
new file mode 100644
index 000000000..fef6a1bd1
--- /dev/null
+++ b/pages/stack/protocol/rollup/_meta.json
@@ -0,0 +1,7 @@
+{
+ "overview": "Rollup Overview",
+ "smart-contracts": "Smart Contracts",
+ "deposit-flow": "Deposit Flow",
+ "transaction-flow": "Transaction Flow",
+ "withdrawal-flow": "Withdrawal Flow"
+}
\ No newline at end of file
diff --git a/pages/stack/protocol/deposit-flow.mdx b/pages/stack/protocol/rollup/deposit-flow.mdx
similarity index 100%
rename from pages/stack/protocol/deposit-flow.mdx
rename to pages/stack/protocol/rollup/deposit-flow.mdx
diff --git a/pages/stack/protocol/overview.mdx b/pages/stack/protocol/rollup/overview.mdx
similarity index 100%
rename from pages/stack/protocol/overview.mdx
rename to pages/stack/protocol/rollup/overview.mdx
diff --git a/pages/stack/protocol/smart-contracts.mdx b/pages/stack/protocol/rollup/smart-contracts.mdx
similarity index 100%
rename from pages/stack/protocol/smart-contracts.mdx
rename to pages/stack/protocol/rollup/smart-contracts.mdx
diff --git a/pages/stack/protocol/transaction-flow.mdx b/pages/stack/protocol/rollup/transaction-flow.mdx
similarity index 100%
rename from pages/stack/protocol/transaction-flow.mdx
rename to pages/stack/protocol/rollup/transaction-flow.mdx
diff --git a/pages/stack/protocol/withdrawal-flow.mdx b/pages/stack/protocol/rollup/withdrawal-flow.mdx
similarity index 100%
rename from pages/stack/protocol/withdrawal-flow.mdx
rename to pages/stack/protocol/rollup/withdrawal-flow.mdx
diff --git a/pages/stack/security/faq.mdx b/pages/stack/security/faq.mdx
index ad980b1fe..2df0f86cd 100644
--- a/pages/stack/security/faq.mdx
+++ b/pages/stack/security/faq.mdx
@@ -40,7 +40,7 @@ Fault proofs are a key milestone and top priority for the OP Stack. In the meant
One of the easiest ways to help secure the OP Stack is to look for bugs and vulnerabilities. [OP Mainnet, a user of the OP Stack, has one of the biggest bug bounties (ever)](https://immunefi.com/bounty/optimism/). You can earn up to $2,000,042 by finding critical bugs in the OP Mainnet codebase (and by extension the OP Stack).
-Don't forget that the OP Stack is a decentralized development stack. Anyone can start to contribute to the OP Stack by building software that follows [the stack's design principles](/stack/protocol/design-principles). You can always help make the OP Stack more secure by building components, like alternative client or proof implementations, that users of the OP Stack can take advantage of.
+Don't forget that the OP Stack is a decentralized development stack. Anyone can start to contribute to the OP Stack by building software that follows [the stack's design principles](/stack/design-principles). You can always help make the OP Stack more secure by building components, like alternative client or proof implementations, that users of the OP Stack can take advantage of.
### Where do I report bugs?
diff --git a/public/_redirects b/public/_redirects
index f350dc468..9748cea66 100644
--- a/public/_redirects
+++ b/public/_redirects
@@ -62,8 +62,14 @@
/transaction-fees/overview /builders/app-developers/transactions/fees
/dapp-developers/contracts/meta-tx /builders/app-developers/contracts/optimization
/builders/tools/build/overview /builders/tools/overview
-/protocol-specifications/optimistic-rollup/block-production /stack/protocol/overview#block-production
+/protocol-specifications/optimistic-rollup/block-production /stack/protocol/rollup/overview#block-production
/builders/node-operators/metrics /builders/node-operators/management/metrics
/stack /stack/getting-started
/chain/sec /chain/security/faq
/builders/chain-operators/management/tools/explorer /builders/chain-operators/tools/explorer
+/stack/protocol/deposit-flow /stack/protocol/rollup/deposit-flow
+/stack/protocol/transaction-flow /stack/protocol/rollup/transaction-flow
+/stack/protocol/withdrawal-flow /stack/protocol/rollup/withdrawal-flow
+/stack/protocol/smart-contracts /stack/protocol/rollup/smart-contracts
+/stack/protocol/overview /stack/protocol/rollup/overview
+/stack/protocol/design-principles /stack/design-principles
diff --git a/words.txt b/words.txt
index 8b5489d35..59c65b924 100644
--- a/words.txt
+++ b/words.txt
@@ -11,7 +11,6 @@ Apeworx
Arweave
authrpc
Badgeholders
-badgeholders
BGEZ
BGTZ
Biconomy
@@ -129,7 +128,6 @@ ipcfile
IPCPATH
ipcpath
IPFS
-ipfs
JALR
JOURNALREMOTES
journalremotes
@@ -255,7 +253,6 @@ remotedb
replayability
REQUIREDBLOCKS
requiredblocks
-requisites
Rollups
rpckind
RPCPREFIX