diff --git a/Makefile b/Makefile
index 0e28d12..a9531aa 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,8 @@ clean:
 
 genesis:
 	@echo "Generating genesis file..."
-	./scripts/generate-genesis.sh
+	./scripts/generate-genesis-proper.sh 4
+	./scripts/validation/validate-genesis.sh
 
 keys:
 	@echo "Generating keys..."
diff --git a/README.md b/README.md
index 6a900d3..2c7d0c8 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 <div align="center">
 
 # 🌐 DeFi Oracle Meta Mainnet
-## ChainID 138 | Production-Ready Blockchain Network
+## ChainID 138 | Operator-Focused Blockchain Workspace
 
-[![Status](https://img.shields.io/badge/Status-Production--Ready-brightgreen)](https://github.com/Defi-Oracle-Tooling/smom-dbis-138)
+[![Status](https://img.shields.io/badge/Status-Active-blue)](https://github.com/Defi-Oracle-Tooling/smom-dbis-138)
 [![ChainID](https://img.shields.io/badge/ChainID-138-blue)](https://explorer.d-bis.org)
 [![Consensus](https://img.shields.io/badge/Consensus-QBFT-orange)](docs/architecture/ARCHITECTURE.md)
 [![License](https://img.shields.io/badge/License-MIT-yellow)](LICENSE)
 [![Documentation](https://img.shields.io/badge/Documentation-Complete-success)](docs/)
 
-**Production-ready** Hyperledger Besu network with QBFT consensus, deployed on Azure Kubernetes Service (AKS). Complete with CCIP cross-chain oracle support, comprehensive security scanning, full observability, MetaMask integration, and extensive testing infrastructure.
+Hyperledger Besu workspace for ChainID 138 with QBFT consensus, deployment automation, CCIP and tokenization integrations, security tooling, and a cleaned active-vs-historical documentation surface.
 
 [🚀 Quick Start](#-quick-start) • [📚 Documentation](#-documentation) • [🏗️ Architecture](#️-architecture) • [🔒 Security](#-security) • [📊 Features](#-features) • [🤝 Contributing](#-contributing)
 
@@ -32,7 +32,7 @@
 | **WETH9/WETH10 with CCIP** | ✅ Complete | Cross-chain ready |
 | **OpenZeppelin Dependencies** | ✅ Hybrid Approach | OpenZeppelin v4.9.6 installed |
 
-**🎉 Status**: ✅ **PRODUCTION-READY WITH ALL ENHANCEMENTS**
+**Status**: ✅ Core implementation complete, with ongoing operator cleanup and deployment-hygiene work.
 
 > **Note**: 30 deployment and integration tasks remain (operational procedures, external submissions). All code tasks are 100% complete. See [Next Steps](docs/operations/tasks/NEXT_STEPS_LIST.md) for deployment tasks.
 > 
@@ -358,7 +358,7 @@ curl -X POST https://rpc.d-bis.org \
 
 ### 📋 Deployment Checklist
 
-See [Deployment Checklist](docs/DEPLOYMENT_CHECKLIST.md) for complete step-by-step instructions.
+See [Deployment Checklist](docs/deployment/DEPLOYMENT_CHECKLIST.md) for complete step-by-step instructions.
 
 ---
 
@@ -387,9 +387,9 @@ See [Deployment Checklist](docs/DEPLOYMENT_CHECKLIST.md) for complete step-by-st
 
 ### Security Documentation
 
-- [Security Guide](docs/SECURITY.md) - Comprehensive security documentation
+- [Security Guide](docs/security/SECURITY.md) - Comprehensive security documentation
 - [Security Scanning Guide](docs/security/SECURITY_SCANNING_GUIDE.md) - Security scanning process
-- [Security Compliance](docs/SECURITY_COMPLIANCE.md) - Compliance documentation
+- [Security Compliance](docs/security/SECURITY_COMPLIANCE.md) - Compliance documentation
 - [Security Scores](docs/security/SECURITY_SCORES.md) - Interpreting security scores
 
 ---
@@ -509,7 +509,7 @@ await addOrSwitchNetwork();
 2. Go to Settings → Networks → Add Network
 3. Enter the network details from above
 
-See [MetaMask Integration Guide](docs/METAMASK_INTEGRATION.md) for complete instructions.
+See [MetaMask Integration Guide](docs/operations/integrations/METAMASK_INTEGRATION.md) for complete instructions.
 
 ---
 
@@ -551,31 +551,31 @@ See [ALL Mainnet Master Documentation](../docs/MASTER_INDEX.md) for complete int
 
 - [Quick Start Guide](docs/guides/QUICKSTART.md) - Get started in 5 minutes
 - [Deployment Guide](docs/deployment/DEPLOYMENT.md) - Complete deployment instructions
-- [Next Steps List](docs/NEXT_STEPS_LIST.md) - **Complete checklist of all next steps (30 tasks)**
-- [Deployment Checklist](docs/DEPLOYMENT_CHECKLIST.md) - Step-by-step deployment checklist
+- [Next Steps List](docs/operations/tasks/NEXT_STEPS_LIST.md) - **Complete checklist of all next steps (30 tasks)**
+- [Deployment Checklist](docs/deployment/DEPLOYMENT_CHECKLIST.md) - Step-by-step deployment checklist
 - [Deployment Scripts](scripts/deployment/README.md) - Deployment automation scripts
 
 ### 🏗️ Architecture & Design
 
 - [Architecture Documentation](docs/architecture/ARCHITECTURE.md) - Complete architecture overview
-- [Network Configuration](docs/NETWORK.md) - Network setup and configuration
-- [Azure Well-Architected Framework](docs/AZURE_WELL_ARCHITECTED_IMPLEMENTATION.md) - Best practices implementation
-- [Deployment Comparison](docs/DEPLOYMENT_COMPARISON.md) - AKS vs VM deployment
+- [Network Configuration](docs/architecture/NETWORK.md) - Network setup and configuration
+- [Azure Well-Architected Framework](docs/azure/AZURE_WELL_ARCHITECTED_IMPLEMENTATION.md) - Best practices implementation
+- [Deployment Comparison](docs/deployment/DEPLOYMENT_COMPARISON.md) - AKS vs VM deployment
 
 ### 🔒 Security & Compliance
 
-- [Security Guide](docs/SECURITY.md) - Comprehensive security documentation
+- [Security Guide](docs/security/SECURITY.md) - Comprehensive security documentation
 - [Security Scanning Guide](docs/security/SECURITY_SCANNING_GUIDE.md) - Security scanning process
-- [Security Compliance](docs/SECURITY_COMPLIANCE.md) - Compliance documentation
-- [Governance Framework](docs/GOVERNANCE.md) - Governance and proposal process
+- [Security Compliance](docs/security/SECURITY_COMPLIANCE.md) - Compliance documentation
+- [Governance Framework](docs/governance/GOVERNANCE.md) - Governance and proposal process
 
 ### 🔗 Integration Guides
 
-- [MetaMask Integration](docs/METAMASK_INTEGRATION.md) - Complete MetaMask integration guide
-- [MetaMask Developer Guide](docs/METAMASK_DEVELOPER_GUIDE.md) - Developer integration guide
-- [CCIP Integration Guide](docs/CCIP_INTEGRATION.md) - CCIP setup and usage
-- [Tatum SDK Integration](docs/TATUM_SDK.md) - SDK integration guide
-- [Financial Tokenization](docs/FINANCIAL_TOKENIZATION.md) - ISO-20022 and SWIFT FIN tokenization
+- [MetaMask Integration](docs/operations/integrations/METAMASK_INTEGRATION.md) - Complete MetaMask integration guide
+- [MetaMask Developer Guide](docs/operations/integrations/METAMASK_DEVELOPER_GUIDE.md) - Developer integration guide
+- [CCIP Integration Guide](docs/operations/integrations/CCIP_INTEGRATION.md) - CCIP setup and usage
+- [Tatum SDK Integration](docs/api/TATUM_SDK.md) - SDK integration guide
+- [Financial Tokenization (Archived)](docs/archive/status-reports/operations-legacy/FINANCIAL_TOKENIZATION.md) - Historical ISO-20022 and SWIFT FIN tokenization notes
 - [ALL Mainnet Integration](../docs/MASTER_INDEX.md) - Complete ALL Mainnet (651940) integration guide
 - [Multi-Chain Deployment](docs/deployment/MULTI_CHAIN_DEPLOYMENT_GUIDE.md) - Multi-chain deployment guide
 
@@ -584,7 +584,7 @@ See [ALL Mainnet Master Documentation](../docs/MASTER_INDEX.md) for complete int
 - [Operations Runbooks](runbooks/) - Complete operations runbooks
 - [Troubleshooting Guide](docs/guides/TROUBLESHOOTING.md) - Common issues and solutions
 - [Validation Guide](docs/guides/VALIDATION_GUIDE.md) - Deployment validation
-- [API Documentation](docs/API.md) - JSON-RPC API reference
+- [API Documentation](docs/api/API.md) - JSON-RPC API reference
 
 ### 📈 Monitoring & Observability
 
@@ -595,10 +595,10 @@ See [ALL Mainnet Master Documentation](../docs/MASTER_INDEX.md) for complete int
 
 ### 🎯 Project Management
 
-- [Project Review](docs/COMPLETE_PROJECT_REVIEW.md) - Comprehensive project review
-- [Recommendations](docs/RECOMMENDATIONS.md) - Next steps and enhancements
-- [TODO List](docs/TODO.md) - Complete task tracking
-- [Completion Report](docs/COMPLETION_REPORT_FINAL.md) - Final completion status
+- [Project Review (Archived)](docs/archive/status-reports/docs-root-legacy/COMPLETE_PROJECT_REVIEW.md) - Historical comprehensive project review
+- [Documentation Recommendations](docs/DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md) - Documentation review and next-step recommendations
+- [TODO List](docs/operations/tasks/TODO.md) - Active task tracking
+- [Current Deployment Status](docs/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md) - Active deployment and follow-up status
 
 ---
 
@@ -858,7 +858,7 @@ terraform apply -var-file=terraform.tfvars.vm -var="vm_deployment_enabled=true"
 - ✅ Simpler setup
 - ✅ Cost-effective
 
-See [VM Deployment Guide](docs/VM_DEPLOYMENT.md) for detailed instructions.
+See [VM Deployment Guide](docs/deployment/VM_DEPLOYMENT.md) for detailed instructions.
 
 ---
 
@@ -903,7 +903,7 @@ See [Configuration Guide](docs/configuration/AZURE_CLOUDFLARE_ENV_SETUP.md) for
 
 ## 🤝 Contributing
 
-We welcome contributions! Please see our [Contributing Guide](docs/CONTRIBUTING.md) for details.
+We welcome contributions! Please see our [Contributing Guide](docs/governance/CONTRIBUTING.md) for details.
 
 ### Contribution Process
 
@@ -918,7 +918,7 @@ We welcome contributions! Please see our [Contributing Guide](docs/CONTRIBUTING.
 
 ### Development Guidelines
 
-- ✅ Follow [Security Guidelines](docs/SECURITY.md)
+- ✅ Follow [Security Guidelines](docs/security/SECURITY.md)
 - ✅ Run security scans before submitting PRs
 - ✅ Follow [Code Style Guide](docs/configuration/AZURE_CLOUDFLARE_ENV_SETUP.md)
 - ✅ Add tests for new features
@@ -928,7 +928,7 @@ We welcome contributions! Please see our [Contributing Guide](docs/CONTRIBUTING.
 
 ## 📄 License
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+Licensing details are not currently published in a top-level `LICENSE` file in this repository. Confirm redistribution terms with the maintainers before reuse.
 
 ---
 
@@ -957,7 +957,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 - [Quick Start Guide](docs/guides/QUICKSTART.md) - Get started quickly
 - [Troubleshooting Guide](docs/guides/TROUBLESHOOTING.md) - Common issues and solutions
-- [API Documentation](docs/API.md) - API reference
+- [API Documentation](docs/api/API.md) - API reference
 - [Runbooks](runbooks/) - Operations runbooks
 
 ---
@@ -1020,7 +1020,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ### 📊 Complete Checklist
 
-See [Next Steps List](docs/NEXT_STEPS_LIST.md) for complete checklist of all 30 tasks:
+See [Next Steps List](docs/operations/tasks/NEXT_STEPS_LIST.md) for complete checklist of all 30 tasks:
 - ✅ 15 Deployment tasks
 - ✅ 10 Integration tasks
 - ✅ 5 Pre-production tasks
diff --git a/docs/COMPREHENSIVE_DOCUMENTATION_REVIEW.md b/docs/COMPREHENSIVE_DOCUMENTATION_REVIEW.md
index 6516d22..aeaf14b 100644
--- a/docs/COMPREHENSIVE_DOCUMENTATION_REVIEW.md
+++ b/docs/COMPREHENSIVE_DOCUMENTATION_REVIEW.md
@@ -1,11 +1,11 @@
 # Comprehensive Documentation Review - Final Report
 
 **Date**: 2025-01-27  
-**Status**: ✅ Complete - All Gaps Identified and Addressed
+**Status**: Historical review snapshot
 
 ## Executive Summary
 
-A comprehensive review of the entire `docs/` directory has been completed. All identified gaps have been addressed, broken links fixed, and missing documentation created. The documentation is now complete, well-organized, and production-ready.
+A comprehensive review of the `docs/` directory was completed at the time of writing. Use this report as a historical checkpoint; the documentation set has continued to evolve through archive moves, link cleanup, and active-vs-historical separation.
 
 ---
 
@@ -259,9 +259,9 @@ The documentation is now:
 - ✅ **Comprehensive** - Guides for all major operations
 - ✅ **Maintainable** - Review schedule and processes established
 - ✅ **User-friendly** - Easy to navigate and find information
-- ✅ **Production-ready** - Ready for ongoing use
+- ✅ **Operationally usable** - Ready for ongoing maintenance and iteration
 
-The documentation system is comprehensive, well-organized, and production-ready.
+The documentation system is comprehensive, well-organized, and suitable for ongoing operational use.
 
 ---
 
@@ -277,4 +277,3 @@ The documentation system is comprehensive, well-organized, and production-ready.
 **Review Date**: 2025-01-27  
 **Status**: ✅ **COMPREHENSIVE REVIEW COMPLETE**  
 **All Gaps**: Identified and Addressed
-
diff --git a/docs/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md b/docs/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md
index 7c54389..0537c29 100644
--- a/docs/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md
+++ b/docs/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md
@@ -1,13 +1,17 @@
 # Deployment Status and Next Steps
 
-**Last Updated:** $(date +"%Y-%m-%d %H:%M:%S UTC")  
-**Network:** ChainID 138 - DeFi Oracle Meta Mainnet
+**Last Reviewed:** 2026-04-13  
+**Status:** Historical deployment snapshot  
+**Network:** ChainID 138 - DeFi Oracle Meta Mainnet  
+**Use for current operations:** `docs/deployment/MASTER_INDEX.md`, `docs/PROJECT_OPTIMIZATION_STATUS.md`, and `docs/operations/tasks/NEXT_STEPS_LIST.md`
+
+This document preserves an earlier deployment checkpoint with environment-specific details. Keep it for context, but prefer the current deployment indexes and runbooks above for live operations.
 
 ## ✅ Completed Tasks
 
 ### Phase 1: Infrastructure Setup
 - ✅ Genesis.json updated with WETH9/WETH10 bytecode (31,213 bytes)
-- ✅ IBFT extraData generated and deployed (RLP-encoded, 300 chars)
+- ✅ QBFT extraData generated and deployed (RLP-encoded, 300 chars)
 - ✅ Data directories emptied on all 5 nodes
 - ✅ Besu containers restarted with new genesis
 - ✅ All 5 nodes verified running (ChainID 138)
@@ -32,7 +36,7 @@
 ## ⏳ Current Status
 
 ### Block Production
-- **Status**: Nodes at block 0 (IBFT validators initializing)
+- **Status**: Nodes at block 0 (QBFT validators initializing)
 - **Chain ID**: 138 ✅
 - **extraData**: Valid RLP-encoded (300 chars) ✅
 - **Next**: Wait for validators to initialize and start producing blocks
@@ -54,7 +58,7 @@
 1. **Verify Block Production**
    ```bash
    cast block-number --rpc-url http://localhost:8545
-   # Should return > 0 once IBFT is producing blocks
+   # Should return > 0 once QBFT is producing blocks
    ```
 
 2. **Establish RPC Tunnel**
@@ -120,7 +124,7 @@
 - Verify extraData in genesis.json is valid (300+ chars)
 - Check Besu logs for validator errors
 - Ensure validator keys are configured on nodes
-- Verify IBFT validators match extraData addresses
+- Verify QBFT validators match extraData addresses
 
 ### RPC Connection Issues
 - Check SSH tunnel is active: `ps aux | grep ssh.*8545`
@@ -136,7 +140,7 @@
 ## 📊 Network Configuration
 
 - **Chain ID**: 138
-- **Consensus**: IBFT 2.0
+- **Consensus**: QBFT
 - **Block Period**: 2 seconds
 - **Epoch Length**: 30,000 blocks
 - **Gas Limit**: 30,000,000 (0x1c9c380)
@@ -162,4 +166,4 @@ forge script script/DeployCCIPRouter.s.sol:DeployCCIPRouter --rpc-url http://loc
 ```
 
 ---
-**Note**: Block production initialization may take several minutes. Monitor Besu logs for validator initialization progress.
+**Note**: Block production initialization may take several minutes. Monitor Besu logs for validator initialization progress, and use the current deployment indexes above for active operational guidance.
diff --git a/docs/DOCS_CLEANUP_LOG.md b/docs/DOCS_CLEANUP_LOG.md
index 31da0ab..443928d 100644
--- a/docs/DOCS_CLEANUP_LOG.md
+++ b/docs/DOCS_CLEANUP_LOG.md
@@ -3,6 +3,8 @@
 **Date**: 2025-11-17  
 **Purpose**: Organize 466+ markdown files in `docs/` directory into logical subdirectories
 
+**Current Note (2026-04-12)**: This log captures the 2025-11-17 reorganization pass. The large status-report grouping mentioned below was later archived; use `docs/operations/status-reports/STATUS_REPORTS_INDEX.md` for active status navigation and `docs/archive/status-reports/` for historical report collections.
+
 ## Actions Taken
 
 ### 1. Created Directory Structure
@@ -10,7 +12,7 @@ Created the following organized subdirectories:
 - `architecture/` - Architecture and design documentation
 - `deployment/` - Deployment guides and procedures
 - `operations/integrations/` - Integration guides (CCIP, MetaMask, Firefly, Cacti)
-- `operations/status-reports/` - Status reports and completion summaries
+- `operations/status-reports/` - Active status navigation (legacy report piles were later archived)
 - `operations/tasks/` - Task management and next steps
 - `azure/` - Azure-specific documentation
 - `security/` - Security documentation
@@ -51,7 +53,7 @@ Created the following organized subdirectories:
 - `WETH_*.md` files
 - `BLOCKSCOUT_METAMASK.md`
 
-#### Operations - Status Reports (90+ files)
+#### Operations - Status Reports (historical pre-archive grouping)
 - All `*COMPLETE*.md` files
 - All `*COMPLETION*.md` files
 - All `*STATUS*.md` files
@@ -158,7 +160,7 @@ Created `README.md` in `docs/` directory with:
 - `architecture/`: 6 files
 - `deployment/`: 40 files
 - `operations/integrations/`: 20 files
-- `operations/status-reports/`: 90+ files
+- `operations/status-reports/`: Active index and routing docs only; historical files now live in `docs/archive/status-reports/`
 - `operations/tasks/`: 8 files
 - `azure/`: 22 files
 - `security/`: 7 files
@@ -188,4 +190,3 @@ Created `README.md` in `docs/` directory with:
 - No files were deleted during organization
 - Documentation index (`README.md`) provides quick access to all categories
 - Existing subdirectories (`ccip-integration/`, `project-reviews/`, etc.) were preserved
-
diff --git a/docs/DOCUMENTATION_GAP_ANALYSIS.md b/docs/DOCUMENTATION_GAP_ANALYSIS.md
index 8e7e4c8..97e1eb7 100644
--- a/docs/DOCUMENTATION_GAP_ANALYSIS.md
+++ b/docs/DOCUMENTATION_GAP_ANALYSIS.md
@@ -446,10 +446,9 @@ This document provides a comprehensive gap analysis of the documentation, identi
 
 - [Documentation Review & Recommendations](DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md)
 - [Master Documentation Index](MASTER_DOCUMENTATION_INDEX.md)
-- [Final Completion Report](FINAL_COMPLETION_REPORT.md)
+- [Final Completion Report (Archived)](archive/status-reports/docs-root-legacy/FINAL_COMPLETION_REPORT.md)
 
 ---
 
 **Last Updated**: 2025-01-27  
 **Next Review**: After fixes applied
-
diff --git a/docs/DOCUMENTATION_INDEX.md b/docs/DOCUMENTATION_INDEX.md
index 44ab991..9e74e28 100644
--- a/docs/DOCUMENTATION_INDEX.md
+++ b/docs/DOCUMENTATION_INDEX.md
@@ -5,7 +5,7 @@
 - [DEPLOYMENT_QUICK_START.md](DEPLOYMENT_QUICK_START.md) - Fast deployment guide
 
 ## Architecture & Design
-- [ARCHITECTURE.md](ARCHITECTURE.md) - System architecture
+- [ARCHITECTURE.md](architecture/ARCHITECTURE.md) - System architecture
 - [DOCKER_COMPOSE_GUIDE.md](DOCKER_COMPOSE_GUIDE.md) - Docker Compose structure and usage
 
 ## Configuration
@@ -15,8 +15,7 @@
 - [Contract Deployment Environment Setup](configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md) - Contract deployment environment variables
 - [CLEANUP_PLAN.md](CLEANUP_PLAN.md) - Cleanup and optimization plan
 - [PROJECT_OPTIMIZATION_STATUS.md](PROJECT_OPTIMIZATION_STATUS.md) - Current optimization status
-- [CLEANUP_DEDUPLICATION_REPORT.md](CLEANUP_DEDUPLICATION_REPORT.md) - Script and documentation deduplication analysis
-- [CLEANUP_SUMMARY_2025_11_18.md](CLEANUP_SUMMARY_2025_11_18.md) - Cleanup summary and statistics
+- [Archived Cleanup Reports](archive/status-reports/docs-root-legacy/) - Historical cleanup and completion reports
 
 ## Deployment
 - [DEPLOYMENT_CHECKLIST.md](deployment/DEPLOYMENT_CHECKLIST.md) - Deployment checklist
@@ -24,10 +23,11 @@
 
 ## Operations
 - [Runbooks](../runbooks/) - Operational procedures
-- [Status Reports](operations/status-reports/) - Current status reports
+- [Status Reports Index](operations/status-reports/STATUS_REPORTS_INDEX.md) - Active-vs-archive status navigation
 
 ## Archive
 - [Archive README](archive/README.md) - Archived files documentation
+- [Archived Status Reports](archive/status-reports/README.md) - Historical status-report collections
 - [Cleanup Summary](archive/CLEANUP_SUMMARY.md) - Cleanup actions summary
 
 ## Consensus Migration
diff --git a/docs/DOCUMENTATION_QUICK_FIXES.md b/docs/DOCUMENTATION_QUICK_FIXES.md
index 6b254ac..ad47455 100644
--- a/docs/DOCUMENTATION_QUICK_FIXES.md
+++ b/docs/DOCUMENTATION_QUICK_FIXES.md
@@ -3,6 +3,8 @@
 **Created**: 2025-01-27  
 **Priority**: Critical and High Priority Issues Only
 
+**Current Note (2026-04-12)**: Several of the structural fixes below have since been completed. The active docs now route status and historical material separately via `docs/operations/status-reports/STATUS_REPORTS_INDEX.md` and `docs/archive/status-reports/`.
+
 This document provides a quick reference for the most critical documentation issues that should be addressed immediately.
 
 ---
@@ -11,11 +13,10 @@ This document provides a quick reference for the most critical documentation iss
 
 ### 1. Fix IBFT Reference in Architecture Doc
 **File**: `docs/architecture/ARCHITECTURE.md`  
-**Issue**: Still references IBFT 2.0 instead of QBFT  
-**Fix**: 
-- Line 5: Change "IBFT 2.0 consensus" → "QBFT consensus"
-- Line 33: Update protocol name
-- Line 45: Update consensus reference
+**Current Status**: Completed  
+**Result**:
+- Active architecture and network entry points now describe Chain 138 as QBFT-based
+- Remaining IBFT wording is limited to a shrinking set of legacy milestone or audit-style docs that still need review
 
 ### 2. Consolidate Index Files
 **Files**: 
@@ -58,13 +59,12 @@ This document provides a quick reference for the most critical documentation iss
 ## 🟠 High Priority Fixes (Do Next)
 
 ### 5. Archive Old Status Reports
-**Location**: `docs/operations/status-reports/` (90+ files)
+**Current Status**: Completed on 2026-04-12
 
-**Action**:
-- Identify reports older than 6 months
-- Move to `docs/archive/status-reports/`
-- Create `STATUS_REPORTS_INDEX.md` categorizing remaining reports
-- Consolidate similar reports (multiple "COMPLETE", "FINAL", "TODO" reports)
+**Result**:
+- Legacy status-report piles were moved into `docs/archive/status-reports/operations-legacy/`, `docs/archive/status-reports/docs-root-legacy/`, and `docs/archive/status-reports/repo-root-legacy/`
+- `docs/operations/status-reports/STATUS_REPORTS_INDEX.md` now routes readers to current status docs versus historical archives
+- The active documentation surface no longer depends on the older 90+ file report pile
 
 ### 6. Consolidate Deployment Guides
 **Location**: `docs/deployment/` (40+ files)
@@ -94,11 +94,11 @@ This document provides a quick reference for the most critical documentation iss
 
 ## 📋 Quick Checklist
 
-- [ ] Fix IBFT → QBFT in ARCHITECTURE.md
-- [ ] Consolidate 3 index files into 1 master index
-- [ ] Rename 3 configuration guides for clarity
+- [x] Fix IBFT → QBFT in active architecture docs
+- [x] Consolidate 3 index files into 1 master-led navigation surface
+- [x] Rename 3 configuration guides for clarity
 - [ ] Fix duplicate naming convention files
-- [ ] Archive status reports >6 months old
+- [x] Archive legacy status-report piles and separate active vs. historical routing
 - [ ] Consolidate deployment guides
 - [ ] Add cross-references to key docs
 - [ ] Add metadata headers to all docs
@@ -112,5 +112,4 @@ For complete details and all recommendations, see:
 
 ---
 
-**Last Updated**: 2025-01-27
-
+**Last Updated**: 2026-04-12
diff --git a/docs/DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md b/docs/DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md
index cf5b6fd..68cfe3a 100644
--- a/docs/DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md
+++ b/docs/DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md
@@ -4,6 +4,8 @@
 **Reviewer**: Auto (AI Assistant)  
 **Scope**: Complete review of `/docs/` directory (621+ files)
 
+**Current Note (2026-04-12)**: This file is retained as the original audit baseline. The largest structural issue it identified, the oversized status-report surface, has since been cleaned up: active navigation now goes through `docs/operations/status-reports/STATUS_REPORTS_INDEX.md`, and historical reports live under `docs/archive/status-reports/`.
+
 ---
 
 ## Executive Summary
@@ -13,11 +15,11 @@ This document provides a comprehensive review of all documentation in the `docs/
 ### Key Findings
 
 - **Total Documentation Files**: 621+ markdown files
-- **Status Reports**: 90+ files in `operations/status-reports/` (many may be outdated)
-- **Index Files**: 3 different index files with overlapping content
-- **Configuration Guides**: 3 similar guides that could be consolidated
+- **Status Reports**: The legacy 90+ file pile from `operations/status-reports/` has been archived; active status navigation now uses `operations/status-reports/STATUS_REPORTS_INDEX.md`
+- **Index Files**: `MASTER_DOCUMENTATION_INDEX.md` is now the primary index, with `README.md` and `DOCUMENTATION_INDEX.md` acting as entry points
+- **Configuration Guides**: The similarly named setup guides were renamed and clarified
 - **Deployment Guides**: 40+ deployment-related files with significant overlap
-- **Architecture Docs**: 1 file still references IBFT 2.0 instead of QBFT
+- **Architecture Docs**: The active architecture guide now uses QBFT wording instead of the older IBFT 2.0 phrasing found during the original audit
 
 ---
 
@@ -27,17 +29,19 @@ This document provides a comprehensive review of all documentation in the `docs/
 
 **Location**: `docs/architecture/ARCHITECTURE.md`
 
-**Issue**: Line 5 states "built on Hyperledger Besu with IBFT 2.0 consensus" but the project has migrated to QBFT.
+**Current Status**: Resolved in the active architecture guide.
 
-**Impact**: High - Misleading information for new users and developers
+**Historical Issue**: The original review found IBFT 2.0 wording in the architecture overview before the project documentation was updated to QBFT terminology.
+
+**Impact**: Was high because it could mislead new users and developers.
 
 **Recommendation**: 
-- Update line 5 to reference QBFT instead of IBFT 2.0
-- Update line 33-34 to reflect QBFT protocol details
-- Verify all consensus-related references in this file
+- Keep the active architecture guide on QBFT wording
+- Treat any remaining IBFT references in historical docs as archive-only context
+- Verify consensus wording when promoting archived content back into the active surface
 
 **Files to Update**:
-- `docs/architecture/ARCHITECTURE.md` (lines 5, 33-34, 45)
+- Active file already updated: `docs/architecture/ARCHITECTURE.md`
 
 ### 2. Multiple Conflicting Index Files
 
@@ -46,16 +50,17 @@ This document provides a comprehensive review of all documentation in the `docs/
 - `docs/DOCUMENTATION_INDEX.md`
 - `docs/MASTER_DOCUMENTATION_INDEX.md`
 
-**Issue**: Three different index files with overlapping but not identical content. This creates confusion about which is the "source of truth."
+**Current Status**: Mostly resolved.
+
+**Issue**: The review found three different index files with overlapping but not identical content, which created confusion about the "source of truth."
 
 **Impact**: High - Users don't know which index to use
 
 **Recommendation**:
-- **Consolidate into single master index**: Keep `MASTER_DOCUMENTATION_INDEX.md` as the primary index
-- **Update README.md**: Make it a simple entry point that links to the master index
-- **Archive or merge DOCUMENTATION_INDEX.md**: Either merge its unique content into the master index or archive it
-- **Add "Last Updated" dates** to all index files
-- **Cross-reference** between files if keeping multiple
+- Keep `MASTER_DOCUMENTATION_INDEX.md` as the primary index
+- Keep `README.md` and `DOCUMENTATION_INDEX.md` as lightweight entry points that route readers to the master index
+- Maintain "Last Updated" dates on the index files
+- Repoint links promptly when archive moves happen
 
 ### 3. Duplicate Configuration Guides
 
@@ -64,18 +69,19 @@ This document provides a comprehensive review of all documentation in the `docs/
 - `ENV_SETUP.md` - Environment variables setup (Azure/Cloudflare focused)
 - `ENVIRONMENT_SETUP.md` - Contract deployment environment setup
 
-**Issue**: Three guides with overlapping but distinct purposes. Names are confusingly similar.
+**Current Status**: Resolved in the active docs.
+
+**Issue**: The original guide names were confusingly similar even though the files served different purposes.
 
 **Impact**: Medium-High - Users may not know which guide to follow
 
 **Recommendation**:
-- **Rename for clarity**:
+- Keep the clearer filenames in place:
   - `CONFIGURATION_GUIDE.md` → `NETWORK_CONFIGURATION_GUIDE.md`
   - `ENV_SETUP.md` → `AZURE_CLOUDFLARE_ENV_SETUP.md`
   - `ENVIRONMENT_SETUP.md` → `CONTRACT_DEPLOYMENT_ENV_SETUP.md`
-- **Add clear purpose statements** at the top of each file
-- **Cross-reference** between related guides
-- **Create a configuration index** that explains when to use each guide
+- Keep purpose statements and cross-references near the top of each file
+- Use `configuration/CONFIGURATION_INDEX.md` as the routing entry point
 
 ### 4. Duplicate Naming Convention Files
 
@@ -83,39 +89,42 @@ This document provides a comprehensive review of all documentation in the `docs/
 - `NAMING_CONVENTION.md`
 - `NAMING_CONVENTIONS.md`
 
-**Issue**: Two files with nearly identical names - likely duplicates or one is outdated.
+**Current Status**: Resolved in the active docs.
+
+**Issue**: Two files with nearly identical names created uncertainty about which convention was authoritative.
 
 **Impact**: Medium - Confusion about which file to reference
 
 **Recommendation**:
-- **Compare both files** to identify differences
-- **Consolidate** if duplicates, or **rename** if they serve different purposes
-- **Update all references** to use the correct filename
+- Keep the explicit split between:
+  - `AZURE_NAMING_CONVENTION_2CHAR.md`
+  - `AZURE_NAMING_CONVENTION_3CHAR.md`
+- Preserve cross-references between the two conventions
+- Update links if additional naming docs are introduced
 
 ---
 
 ## 🟠 High Priority Issues (Should Fix Soon)
 
-### 5. Excessive Status Reports (90+ Files)
+### 5. Excessive Status Reports (Resolved 2026-04-12)
 
-**Location**: `docs/operations/status-reports/`
+**Current Location**:
+- Active navigation: `docs/operations/status-reports/STATUS_REPORTS_INDEX.md`
+- Historical collections: `docs/archive/status-reports/`
 
-**Issue**: 90+ status report files, many likely outdated or redundant. Examples:
-- Multiple "COMPLETE" reports: `COMPLETE_ALL_TASKS_SUMMARY.md`, `COMPLETE_DEPLOYMENT_STATUS.md`, `COMPLETE_ENTERPRISE_TASK_SUMMARY.md`, `COMPLETE_NEXT_STEPS_REPORT.md`, `COMPLETE_TASK_SUMMARY.md`
-- Multiple "FINAL" reports: `FINAL_COMPLETE_REPORT.md`, `FINAL_COMPLETE_STATUS.md`, `FINAL_COMPLETION_REPORT.md`, `FINAL_COMPLETION_STATUS.md`, `FINAL_DEPLOYMENT_STATUS.md`, `FINAL_PROJECT_STATUS.md`, `FINAL_SUMMARY.md`
-- Multiple "TODO" reports: `TODO_COMPLETE_SUMMARY.md`, `TODO_COMPLETION_SUMMARY.md`, `TODO_STATUS_REPORT.md`
+**Historical Issue**: The review originally found 90+ status report files in `docs/operations/status-reports/`, including multiple overlapping "COMPLETE", "FINAL", and "TODO" summaries.
 
-**Impact**: High - Difficult to find current status, many outdated reports
+**Impact**: High at the time because it was difficult to find the current status among redundant historical reports.
 
-**Recommendation**:
-- **Create status report retention policy**: Archive reports older than 6 months
-- **Consolidate similar reports**: Merge multiple "COMPLETE" or "FINAL" reports into single documents
-- **Create a status report index**: `STATUS_REPORTS_INDEX.md` that categorizes reports by:
-  - Date range
-  - Topic (deployment, infrastructure, tasks, etc.)
-  - Status (current vs. historical)
-- **Archive old reports**: Move reports older than 6 months to `docs/archive/status-reports/`
-- **Create a "Current Status" document**: Single source of truth for current project status
+**Current Outcome**:
+- Legacy report piles from `docs/operations/status-reports/`, `docs/`, and the repository root were archived into dedicated collections under `docs/archive/status-reports/`
+- `STATUS_REPORTS_INDEX.md` now routes readers to current status docs versus historical archives
+- Current status tracking now points to active deployment, routing, compile, and task documents instead of the older report pile
+
+**Maintenance Guidance**:
+- Keep `docs/operations/status-reports/` limited to active routing/index content
+- Move narrative completion snapshots and superseded reports into `docs/archive/status-reports/`
+- Update central indexes whenever new archival moves happen
 
 ### 6. Deployment Guide Proliferation (40+ Files)
 
@@ -465,8 +474,8 @@ This document provides a comprehensive review of all documentation in the `docs/
 
 - [Documentation Index](DOCUMENTATION_INDEX.md)
 - [Master Documentation Index](MASTER_DOCUMENTATION_INDEX.md)
-- [Cleanup Complete Summary](CLEANUP_COMPLETE_SUMMARY.md)
-- [All Recommendations and Suggestions](ALL_RECOMMENDATIONS_AND_SUGGESTIONS.md)
+- [Cleanup Complete Summary (Archived)](archive/status-reports/docs-root-legacy/CLEANUP_COMPLETE_SUMMARY.md)
+- [All Recommendations and Suggestions (Archived)](archive/status-reports/docs-root-legacy/ALL_RECOMMENDATIONS_AND_SUGGESTIONS.md)
 
 ---
 
@@ -482,4 +491,3 @@ This document provides a comprehensive review of all documentation in the `docs/
 **Last Updated**: 2025-01-27  
 **Next Review**: Quarterly or as needed  
 **Status**: Active Review
-
diff --git a/docs/FINAL_GAP_ANALYSIS_AND_FIXES.md b/docs/FINAL_GAP_ANALYSIS_AND_FIXES.md
index 2875672..ff9028f 100644
--- a/docs/FINAL_GAP_ANALYSIS_AND_FIXES.md
+++ b/docs/FINAL_GAP_ANALYSIS_AND_FIXES.md
@@ -1,7 +1,9 @@
 # Final Gap Analysis and Fixes - Complete Summary
 
 **Date**: 2025-01-27  
-**Status**: ✅ All Gaps Identified and Fixed
+**Status**: Historical documentation-review snapshot
+
+This document captures an earlier documentation review milestone. The docs set has continued to evolve through archive moves, index cleanup, and terminology updates.
 
 ## Executive Summary
 
@@ -256,11 +258,10 @@ The documentation is now:
 - ✅ **Maintainable** - Processes and schedules established
 - ✅ **User-friendly** - Easy to navigate and find information
 
-The documentation system is production-ready and comprehensive.
+The documentation system had reached a strong milestone at the time of this review and was comprehensive for its then-current scope.
 
 ---
 
 **Completion Date**: 2025-01-27  
 **Status**: ✅ **ALL GAPS ADDRESSED**  
 **Total Issues Fixed**: 8 critical + 8 high priority = 16 issues resolved
-
diff --git a/docs/GLOSSARY.md b/docs/GLOSSARY.md
index b16b650..d430098 100644
--- a/docs/GLOSSARY.md
+++ b/docs/GLOSSARY.md
@@ -58,7 +58,7 @@ A package manager for Kubernetes that simplifies deployment and management of ap
 ## I
 
 ### IBFT 2.0
-**Istanbul Byzantine Fault Tolerance 2.0** - A previous consensus mechanism (deprecated, replaced by QBFT).
+**Istanbul Byzantine Fault Tolerance 2.0** - A legacy consensus mechanism retained in historical documentation. ChainID 138 uses QBFT in the current active configuration.
 
 ## K
 
@@ -153,4 +153,3 @@ An improved version of WETH with additional features.
 ---
 
 **Last Updated**: 2025-01-27
-
diff --git a/docs/IMPLEMENTATION_SUMMARY.md b/docs/IMPLEMENTATION_SUMMARY.md
index d650641..4981ba1 100644
--- a/docs/IMPLEMENTATION_SUMMARY.md
+++ b/docs/IMPLEMENTATION_SUMMARY.md
@@ -3,6 +3,8 @@
 **Date**: 2025-01-27  
 **Status**: ✅ Complete
 
+**Current Note (2026-04-12)**: This summary captures the original implementation pass. Since then, the documentation surface has been cleaned up further by archiving the large legacy status-report piles and keeping `docs/operations/status-reports/STATUS_REPORTS_INDEX.md` as the active router.
+
 ## Summary
 
 All critical and high-priority documentation fixes have been implemented. The documentation is now better organized, more accurate, and easier to navigate.
@@ -38,10 +40,10 @@ All critical and high-priority documentation fixes have been implemented. The do
 ### High Priority Fixes
 
 5. **✅ Created Status Reports Index**
-   - Created `STATUS_REPORTS_INDEX.md` categorizing all 90+ status reports
-   - Organized by category (Project Status, Deployment, Completion, etc.)
-   - Added archive policy (reports >6 months should be archived)
-   - Added to master index
+   - Created `STATUS_REPORTS_INDEX.md` as the active status router
+   - Later archival work moved the legacy 90+ file report piles into `docs/archive/status-reports/`
+   - Current status navigation now distinguishes active docs from historical archives
+   - Added to the master index and archive guidance
 
 6. **✅ Created Deployment Guide Index**
    - Created `DEPLOYMENT_INDEX.md` categorizing all deployment guides
@@ -158,4 +160,3 @@ The following recommendations from the review are still pending (lower priority)
 
 **Last Updated**: 2025-01-27  
 **Status**: ✅ All Critical and High Priority Fixes Complete
-
diff --git a/docs/MASTER_DOCUMENTATION_INDEX.md b/docs/MASTER_DOCUMENTATION_INDEX.md
index 079443f..c14a7d7 100644
--- a/docs/MASTER_DOCUMENTATION_INDEX.md
+++ b/docs/MASTER_DOCUMENTATION_INDEX.md
@@ -1,6 +1,6 @@
 # Master Documentation Index
 
-**Last Updated**: 2026-01-31  
+**Last Updated**: 2026-04-12  
 **Project**: DeFi Oracle Meta Mainnet (ChainID 138)  
 **Status**: Active - Primary Documentation Index
 
@@ -15,7 +15,7 @@ This is the **master index** of all project documentation. Use this as your star
 - **[README.md](../README.md)** - Project overview, features, and quick start guide
 - **[Getting Started](guides/GETTING_STARTED.md)** - Getting started guide for different user types
 - **[DEPLOYMENT_QUICK_START.md](DEPLOYMENT_QUICK_START.md)** - Fast deployment guide
-- **[PARALLEL_COMPLETION_TASK_LIST.md](PARALLEL_COMPLETION_TASK_LIST.md)** - Complete task list for deployment
+- **[MASTER_TASK_LIST.md](operations/tasks/MASTER_TASK_LIST.md)** - Active master task list
 - **[Documentation Review](DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md)** - Comprehensive documentation review and recommendations
 - **[Quick Fixes](DOCUMENTATION_QUICK_FIXES.md)** - Critical fixes checklist
 
@@ -61,7 +61,7 @@ This is the **master index** of all project documentation. Use this as your star
 ### Deployment Guides
 - **[Deployment Index](deployment/DEPLOYMENT_INDEX.md)** - Which deployment guide to use
 - **[DEPLOYMENT_CHECKLIST.md](deployment/DEPLOYMENT_CHECKLIST.md)** - Deployment checklist
-- **[DEPLOYMENT_STATUS_AND_NEXT_STEPS.md](deployment/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md)** - Current deployment status
+- **[DEPLOYMENT_STATUS_AND_NEXT_STEPS.md](DEPLOYMENT_STATUS_AND_NEXT_STEPS.md)** - Current deployment status
 - **[VM_DEPLOYMENT.md](deployment/VM_DEPLOYMENT.md)** - VM deployment guide
 - **[36-REGION-BLUEPRINT.md](deployment/36-REGION-BLUEPRINT.md)** - 36-region deployment blueprint
 - **[DEPLOYMENT_CONFIGURATION_AUDIT.md](deployment/DEPLOYMENT_CONFIGURATION_AUDIT.md)** - Configuration audit
@@ -75,12 +75,9 @@ This is the **master index** of all project documentation. Use this as your star
 - **[Runbooks](../runbooks/)** - Operational procedures and runbooks
 
 ### Status Reports
-- **[Status Reports Index](operations/status-reports/STATUS_REPORTS_INDEX.md)** - Index of all status reports
-- **[Status Reports](operations/status-reports/)** - Current operational status reports
-  - [COMMANDS_INDEX.md](operations/status-reports/COMMANDS_INDEX.md)
-  - [SCRIPTS_INDEX.md](operations/status-reports/SCRIPTS_INDEX.md)
-  - [PROJECT_REVIEW.md](operations/status-reports/PROJECT_REVIEW.md)
-  - [REVIEW_AND_RECOMMENDATIONS.md](operations/status-reports/REVIEW_AND_RECOMMENDATIONS.md)
+- **[Status Reports Index](operations/status-reports/STATUS_REPORTS_INDEX.md)** - Active-vs-archive status navigation
+- **[Current Deployment Status](DEPLOYMENT_STATUS_AND_NEXT_STEPS.md)** - Current deployment posture
+- **[Current Routing & Service Status](STATUS_AND_TOKEN_ROUTING.md)** - Current routing, API, and service state
 
 ### Monitoring
 - **[Monitoring Setup Guide](operations/MONITORING_SETUP_GUIDE.md)** - Monitoring stack setup and configuration
@@ -128,9 +125,9 @@ This is the **master index** of all project documentation. Use this as your star
 
 ## 🧪 Testing & Quality
 
-- **[E2E_TESTING_REPORT.md](E2E_TESTING_REPORT.md)** - End-to-end testing report
-- **[E2E_TESTING_AND_DEPLOYMENT_STATUS.md](E2E_TESTING_AND_DEPLOYMENT_STATUS.md)** - E2E testing status
-- **[FINAL_E2E_REPORT_AND_RECOMMENDATIONS.md](FINAL_E2E_REPORT_AND_RECOMMENDATIONS.md)** - Final E2E report
+- **[TESTING_GUIDE.md](TESTING_GUIDE.md)** - Active testing guidance
+- **[COMPILATION_STATUS.md](deployment/COMPILATION_STATUS.md)** - Current compile and test caveats
+- **[Archived Status Reports](archive/status-reports/README.md)** - Historical testing and rollout reports
 
 ---
 
@@ -148,9 +145,7 @@ This is the **master index** of all project documentation. Use this as your star
 ### Cleanup & Deduplication
 - **[PROJECT_OPTIMIZATION_STATUS.md](PROJECT_OPTIMIZATION_STATUS.md)** - Current optimization status
 - **[CLEANUP_PLAN.md](CLEANUP_PLAN.md)** - Cleanup and optimization plan
-- **[CLEANUP_DEDUPLICATION_REPORT.md](CLEANUP_DEDUPLICATION_REPORT.md)** - Script and documentation deduplication analysis
-- **[CLEANUP_SUMMARY_2025_11_18.md](CLEANUP_SUMMARY_2025_11_18.md)** - Cleanup summary and statistics
-- **[CLEANUP_COMPLETE.md](CLEANUP_COMPLETE.md)** - Cleanup completion report
+- **[Archived Cleanup Reports](archive/status-reports/docs-root-legacy/)** - Historical cleanup, completion, and deduplication reports
 - **[CLEANUP_STATS.md](CLEANUP_STATS.md)** - Cleanup statistics
 
 ---
@@ -159,7 +154,7 @@ This is the **master index** of all project documentation. Use this as your star
 
 - **[Archive README](archive/README.md)** - Archived files documentation
 - **[Archive Policy](archive/ARCHIVE_POLICY.md)** - Archive retention policy and process
-- **[Archive Status Reports](archive/status-reports/)** - Historical status reports
+- **[Archive Status Reports](archive/status-reports/README.md)** - Historical status-report collections
 - **[Archive Old Configs](archive/old-configs/)** - Previous configuration structures
 
 ---
@@ -167,11 +162,12 @@ This is the **master index** of all project documentation. Use this as your star
 ## 📊 Status & Reports
 
 ### Current Status
-- **[COMPLETE_STATUS_REPORT.md](COMPLETE_STATUS_REPORT.md)** - Complete status report
+- **[STATUS_AND_TOKEN_ROUTING.md](STATUS_AND_TOKEN_ROUTING.md)** - Current service and routing status
 - **[DEPLOYMENT_STATUS_AND_NEXT_STEPS.md](DEPLOYMENT_STATUS_AND_NEXT_STEPS.md)** - Deployment status
+- **[COMPILATION_STATUS.md](deployment/COMPILATION_STATUS.md)** - Current compilation status
 
 ### Task Lists
-- **[PARALLEL_COMPLETION_TASK_LIST.md](PARALLEL_COMPLETION_TASK_LIST.md)** - Full parallel completion task list
+- **[MASTER_TASK_LIST.md](operations/tasks/MASTER_TASK_LIST.md)** - Active master task list
 - **[TODO.md](operations/tasks/TODO.md)** - Current TODO list
 
 ---
@@ -198,7 +194,7 @@ This is the **master index** of all project documentation. Use this as your star
 
 **Operations**
 - Runbooks: [../runbooks/](../runbooks/)
-- Status Reports: [operations/status-reports/](operations/status-reports/)
+- Status Reports: [operations/status-reports/STATUS_REPORTS_INDEX.md](operations/status-reports/STATUS_REPORTS_INDEX.md)
 
 **Troubleshooting**
 - Guide: [TROUBLESHOOTING.md](guides/TROUBLESHOOTING.md)
@@ -208,9 +204,9 @@ This is the **master index** of all project documentation. Use this as your star
 
 **Markdown Files**: All documentation is in Markdown format (.md)
 
-**Scripts**: See [SCRIPTS_INDEX.md](operations/status-reports/SCRIPTS_INDEX.md)
+**Scripts**: See [docs/scripts/](scripts/)
 
-**Commands**: See [COMMANDS_INDEX.md](operations/status-reports/COMMANDS_INDEX.md)
+**Commands**: See deployment/runbook command examples and active task docs
 
 ---
 
@@ -218,7 +214,7 @@ This is the **master index** of all project documentation. Use this as your star
 
 - All documentation is in Markdown format
 - Documentation is organized by topic in subdirectories
-- Status reports are in `docs/operations/status-reports/`
+- Current status navigation lives in `docs/operations/status-reports/STATUS_REPORTS_INDEX.md`; historical status reports live in `docs/archive/status-reports/`
 - Archived documentation is in `docs/archive/`
 - Guides are in `docs/guides/`
 
@@ -241,12 +237,10 @@ This is the **master index** of all project documentation. Use this as your star
 - Established review schedule and archive policy
 - All critical, high, medium, and low priority items complete
 
-**2025-11-18**:
-- Created master documentation index
-- Updated IBFT references to QBFT
-- Consolidated deployment scripts
-- Archived 52+ status reports
-- Created unified deployment scripts
+**2026-04-12**:
+- Archived legacy status-report piles from `docs/operations/status-reports/`, `docs/`, and the repository root
+- Reduced active status navigation to current runbooks, deployment docs, and reference pages
+- Added archive collection indexes for legacy report sets
 
 ---
 
@@ -260,7 +254,7 @@ This is the **master index** of all project documentation. Use this as your star
 
 ---
 
-**Last Updated**: 2025-01-27  
+**Last Updated**: 2026-04-12  
 **Maintained By**: Project Team  
 **Version**: 1.1
 
@@ -271,11 +265,8 @@ This is the **master index** of all project documentation. Use this as your star
 - **[Documentation Gap Analysis](DOCUMENTATION_GAP_ANALYSIS.md)** - Gap analysis and recommendations
 - **[Final Gap Analysis and Fixes](FINAL_GAP_ANALYSIS_AND_FIXES.md)** - Final gap analysis summary
 - **[Comprehensive Documentation Review](COMPREHENSIVE_DOCUMENTATION_REVIEW.md)** - Complete review report
-- **[All Additional Suggestions Complete](ALL_ADDITIONAL_SUGGESTIONS_COMPLETE.md)** - Additional suggestions completion
-- **[Remaining TODO Items](REMAINING_TODO_ITEMS.md)** - Remaining TODO items
+- **[Archived Documentation Review Reports](archive/status-reports/docs-root-legacy/)** - Historical completion and follow-up reports
 - **[Implementation Summary](IMPLEMENTATION_SUMMARY.md)** - Implementation summary
-- **[All TODO Items Complete](ALL_TODO_ITEMS_COMPLETE.md)** - Completion summary
-- **[Final Completion Report](FINAL_COMPLETION_REPORT.md)** - Final completion report
 
 ## 📖 Reference
 
@@ -289,4 +280,3 @@ This is the **master index** of all project documentation. Use this as your star
 
 ### SDK
 - **[SDK README](../sdk/README.md)** - Tatum SDK integration documentation
-
diff --git a/docs/OPERATIONS_RUNBOOK.md b/docs/OPERATIONS_RUNBOOK.md
index 746a32d..64a4b97 100644
--- a/docs/OPERATIONS_RUNBOOK.md
+++ b/docs/OPERATIONS_RUNBOOK.md
@@ -104,7 +104,7 @@ cast call $USDW_ADDRESS "totalSupply()" --rpc-url $RPC_URL
 
 ### 1.4 Reserve and Stabilization Policies (VAULT_SYSTEM_MASTER_TECHNICAL_PLAN)
 
-The following formulas and checklists are from [VAULT_SYSTEM_MASTER_TECHNICAL_PLAN](../../../docs/VAULT_SYSTEM_MASTER_TECHNICAL_PLAN.md). Use them for sizing and operational verification.
+The following formulas and checklists are from [VAULT_SYSTEM_MASTER_TECHNICAL_PLAN](../../docs/VAULT_SYSTEM_MASTER_TECHNICAL_PLAN.md). Use them for sizing and operational verification.
 
 #### Reserve Sizing Model
 
@@ -126,12 +126,12 @@ The following formulas and checklists are from [VAULT_SYSTEM_MASTER_TECHNICAL_PL
 
 #### Cross-chain parity and bridge buffer
 
-- **Objective:** Maintain |Price138 − Price651940| &lt; ArbitrageThreshold (see [CROSS_CHAIN_ARBITRAGE_DESIGN](../../../docs/07-ccip/CROSS_CHAIN_ARBITRAGE_DESIGN.md)). Cross-chain private arbitrage bots execute when deviation exceeds threshold; bridge reserve must be sized so outflows do not exhaust reserves during settlement.
+- **Objective:** Maintain |Price138 − Price651940| &lt; ArbitrageThreshold (see [CROSS_CHAIN_ARBITRAGE_DESIGN](../../docs/07-ccip/CROSS_CHAIN_ARBITRAGE_DESIGN.md)). Cross-chain private arbitrage bots execute when deviation exceeds threshold; bridge reserve must be sized so outflows do not exhaust reserves during settlement.
 - **Bridge buffer formula:** BridgeReserve ≥ PeakBridgeOutflow × Latency.
   - **PeakBridgeOutflow:** Measure from bridge events (e.g. lock/release or TransferInitiated volume) over a rolling window (e.g. peak hourly or daily outflow in USD or token units).
   - **Latency:** Bridge settlement time (e.g. typical time from lock on source chain to release on destination, in minutes or blocks). Use historical median or P95.
 - **Sizing steps:** (1) Query bridge contract events for initiated/released amounts per time window; (2) compute peak outflow; (3) measure typical settlement latency; (4) set minimum reserve = Peak × Latency; (5) add safety factor (e.g. 1.5–2×) and document in runbook.
-- **Alert when reserve below:** If BridgeReserve &lt; PeakBridgeOutflow × Latency (or below safety threshold), trigger **Warning** alert. If reserve is falling and may breach within one settlement window, escalate to **Critical**. Integrate with existing monitoring (e.g. Prometheus + PagerDuty when monitoring stack is deployed). See [VAULT_SYSTEM_MASTER_TECHNICAL_PLAN](../../../docs/VAULT_SYSTEM_MASTER_TECHNICAL_PLAN.md) §9.
+- **Alert when reserve below:** If BridgeReserve &lt; PeakBridgeOutflow × Latency (or below safety threshold), trigger **Warning** alert. If reserve is falling and may breach within one settlement window, escalate to **Critical**. Integrate with existing monitoring (e.g. Prometheus + PagerDuty when monitoring stack is deployed). See [VAULT_SYSTEM_MASTER_TECHNICAL_PLAN](../../docs/VAULT_SYSTEM_MASTER_TECHNICAL_PLAN.md) §9.
 
 #### Flash Loan Containment Checklist
 
@@ -140,7 +140,7 @@ The following formulas and checklists are from [VAULT_SYSTEM_MASTER_TECHNICAL_PL
 - Require **sustained deviation for N blocks** before rebalancing.
 - **Cap per-block stabilization volume** to limit flash-driven execution.
 - **Target:** Flash drain recovery &lt;3 blocks (per Master Plan §16).
-- **On-chain:** The [Stabilizer](../../contracts/bridge/trustless/integration/Stabilizer.sol) (Phase 3 + 6) implements block delay, sustained-deviation buffer, per-block volume cap, and slippage/gas checks; deploy and configure per [CONTRACT_DEPLOYMENT_RUNBOOK](../../../docs/03-deployment/CONTRACT_DEPLOYMENT_RUNBOOK.md) § Stabilizer.
+- **On-chain:** The [Stabilizer](../contracts/bridge/trustless/integration/Stabilizer.sol) (Phase 3 + 6) implements block delay, sustained-deviation buffer, per-block volume cap, and slippage/gas checks; deploy and configure per [CONTRACT_DEPLOYMENT_RUNBOOK](../../docs/03-deployment/CONTRACT_DEPLOYMENT_RUNBOOK.md) § Stabilizer.
 
 ---
 
diff --git a/docs/PROJECT_OPTIMIZATION_STATUS.md b/docs/PROJECT_OPTIMIZATION_STATUS.md
index e106c56..672fd87 100644
--- a/docs/PROJECT_OPTIMIZATION_STATUS.md
+++ b/docs/PROJECT_OPTIMIZATION_STATUS.md
@@ -1,7 +1,7 @@
 # Project Optimization Status
 
-**Last Updated**: 2025-11-18  
-**Status**: In Progress
+**Last Updated**: 2026-04-13  
+**Status**: Active
 
 ## Summary
 
@@ -12,8 +12,15 @@ This document tracks the ongoing optimization and cleanup of the smom-dbis-138 p
 ### ✅ Documentation Cleanup
 - **Archived 30+ status reports** from `terraform/phases/phase1/` to `docs/archive/status-reports/phase1/`
 - **Removed 4 genesis.json backup files** (moved to archive)
-- **Updated README.md**: All IBFT 2.0 references changed to QBFT
+- **Updated active entry points**: High-traffic README and operator docs now point at QBFT/current workflows
 - **Created archive structure** with proper organization
+- **Archived legacy status-report piles** from the active docs surface:
+  - `docs/operations/status-reports/` → `docs/archive/status-reports/operations-legacy/`
+  - report-style files from `docs/` → `docs/archive/status-reports/docs-root-legacy/`
+  - report-style files from the repository root → `docs/archive/status-reports/repo-root-legacy/`
+- **Repointed active indexes and runbooks** to current docs or archive collections
+- **Archived trustless bridge milestone stack** from `docs/bridge/trustless/` into `docs/archive/bridge-trustless-milestones/`
+- **Added active trustless bridge overview** at `docs/bridge/trustless/README.md`
 
 ### ✅ Configuration Consolidation
 - **Archived old IBFT2 config structure**: `config/validators/`, `config/sentries/`, `config/rpc/` → `docs/archive/old-configs/ibft2/`
@@ -29,6 +36,12 @@ This document tracks the ongoing optimization and cleanup of the smom-dbis-138 p
 - **Legacy**: `docker/besu-*/docker-compose.yml` (per-node-type, may still be used for reference)
 - **Phase2**: `docker/phase2/docker-compose.*.yml` (regional deployments)
 
+### ✅ Canonical Operator Paths
+- **Genesis generation**: `scripts/generate-genesis-proper.sh`
+- **Genesis validation**: `scripts/validation/validate-genesis.sh`
+- **Compatibility wrapper**: `scripts/generate-genesis.sh` now forwards to the canonical QBFT generator
+- **Docker Compose**: `docker-compose/docker-compose.template.yml` is the active template; older per-node compose files remain reference material
+
 ## Current Project Structure
 
 ### Active Configuration Files
@@ -56,13 +69,19 @@ docker-compose/
     └── vm5.env                     # VM5 configuration
 ```
 
-## Recent Cleanup Actions (2025-11-18)
+## Recent Cleanup Actions (2026-04-12)
+
+### Documentation Surface Cleanup
+- **Status Reports Archived**:
+  - `94` historical files moved to `docs/archive/status-reports/operations-legacy/`
+  - `33` report-style docs moved to `docs/archive/status-reports/docs-root-legacy/`
+  - `13` report-style root docs moved to `docs/archive/status-reports/repo-root-legacy/`
+- **Active status navigation slimmed down**: `docs/operations/status-reports/` now routes through `STATUS_REPORTS_INDEX.md`
+- **Deduplication Report**: Archived at `docs/archive/status-reports/docs-root-legacy/CLEANUP_DEDUPLICATION_REPORT.md`
 
 ### Script Deduplication
-- **Status Reports Archived**: 52 files total (22 new + 30 previous) moved to `docs/archive/status-reports/`
 - **Duplicate CCIP Scripts**: Archived 3 duplicate CCIP scripts from `terraform/phases/phase1/scripts/ccip/` to `scripts/archive/duplicate-ccip/`
 - **Unified WETH Script**: Created `scripts/deployment/deploy-weth-unified.sh` to consolidate WETH deployment methods
-- **Deduplication Report**: Created `docs/CLEANUP_DEDUPLICATION_REPORT.md` documenting cleanup efforts
 
 ### Script Analysis
 - **Total Shell Scripts**: 260
@@ -75,35 +94,37 @@ docker-compose/
 
 ### 🔄 In Progress
 - [ ] Continue script deduplication (82 deployment scripts to review)
-- [ ] Update remaining IBFT references in documentation (10+ files)
-- [ ] Create consolidated documentation index
+- [ ] Review remaining milestone-style docs that should be archived or explicitly marked historical
+- [ ] Keep archive indexes and active links aligned as legacy docs move
 
 ### ⏳ Pending
-- [ ] Document docker-compose file usage and migration path
 - [ ] Consolidate duplicate genesis generation scripts
 - [ ] Review and optimize script organization
+- [ ] Prune or archive remaining completion-style bridge and deployment reports outside `docs/archive/`
 
 ## Files Requiring IBFT → QBFT Updates
 
 The following files still contain IBFT references:
-- `scripts/configure-network-decision-tree.md`
-- `runbooks/parameter-change.md`
+- `docs/azure/QUOTA_ISSUE_RESOLUTION.md`
+- `docs/configuration/CONFIGURATION_FIXES_APPLIED.md`
+- `docs/governance/CHANGELOG.md`
 - `terraform/phases/phase1/CONTAINERS_AND_SERVICES_REPORT.md`
 - `terraform/phases/phase1/HIGH_PRIORITY_TASKS_COMPLETE.md`
-- `docs/guides/INTEGRATION_GUIDE.md`
-- `docs/operations/status-reports/*.md` (multiple files)
+- Historical files under `docs/archive/status-reports/` may still contain legacy IBFT-era wording and should stay archived unless refreshed
 
 ## Archive Location
 
 All archived files are in `docs/archive/`:
 - `status-reports/phase1/` - Historical status reports
+- `status-reports/operations-legacy/` - Historical files formerly in `docs/operations/status-reports/`
+- `status-reports/docs-root-legacy/` - Historical report-style docs formerly in `docs/`
+- `status-reports/repo-root-legacy/` - Historical report-style docs formerly in the repository root
 - `old-configs/ibft2/` - Previous IBFT2 configuration structure
 - `old-scripts/deprecated/` - Obsolete scripts (to be populated)
 
 ## Next Steps
 
 1. Complete script review and deduplication
-2. Update remaining IBFT references
-3. Create master documentation index
-4. Document migration paths for old configurations
-
+2. Finish the last active terminology cleanups and historical-status banners
+3. Keep archive routing and active index links synchronized
+4. Consolidate transitional genesis helpers around the canonical QBFT path
diff --git a/docs/README.md b/docs/README.md
index b99eb4f..afdd80a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # Documentation Index
 
-**Last Updated**: 2025-01-27  
+**Last Updated**: 2026-04-12  
 **Status**: Active
 
 This is the entry point for all project documentation. For the complete documentation index, see [MASTER_DOCUMENTATION_INDEX.md](MASTER_DOCUMENTATION_INDEX.md).
@@ -42,12 +42,10 @@ Integration guides:
 - WETH deployment
 
 #### [operations/status-reports/](operations/status-reports/)
-Status reports, completion summaries, and analysis documents:
-- Deployment status reports
-- Completion summaries
-- Final reports
-- Task completion reports
-- Project reviews
+Status-report navigation:
+- Active-vs-archive index
+- Pointers to current deployment and routing status docs
+- Links into archived historical report collections
 
 #### [operations/tasks/](operations/tasks/)
 Task management and next steps:
@@ -151,6 +149,7 @@ Documentation tags and metadata
 - [Troubleshooting](guides/TROUBLESHOOTING.md)
 - [Next Steps](operations/tasks/NEXT_STEPS.md)
 - [Task List](operations/tasks/TODO.md)
+- [Status Reports Index](operations/status-reports/STATUS_REPORTS_INDEX.md)
 
 ### Azure Resources
 - [Azure Setup](azure/AZURE_REGION_SETUP.md)
@@ -167,4 +166,3 @@ Documentation tags and metadata
 ## 🔄 Maintenance
 
 This documentation structure is maintained as part of the project cleanup process. For questions or suggestions about documentation organization, please refer to the [Contributing Guidelines](governance/CONTRIBUTING.md).
-
diff --git a/docs/architecture/ARCHITECTURE.md b/docs/architecture/ARCHITECTURE.md
index e300bc5..2ebe86d 100644
--- a/docs/architecture/ARCHITECTURE.md
+++ b/docs/architecture/ARCHITECTURE.md
@@ -49,7 +49,7 @@
 
 ## Overview
 
-The DeFi Oracle Meta Mainnet (ChainID 138) is a production-ready blockchain network built on Hyperledger Besu with QBFT (Quorum Byzantine Fault Tolerance) consensus. The network is designed as a read network with public RPC endpoints and internal oracle publishers.
+The DeFi Oracle Meta Mainnet (ChainID 138) is an operator-focused blockchain network built on Hyperledger Besu with QBFT (Quorum Byzantine Fault Tolerance) consensus. The network is designed as a read network with public RPC endpoints and internal oracle publishers.
 
 ## Network Architecture
 
@@ -276,4 +276,3 @@ The network is organized into three tiers:
 - DeFi protocol integrations
 - Layer 2 solutions
 - Privacy features (Tessera)
-
diff --git a/docs/architecture/ARCHITECTURE_DIAGRAMS.md b/docs/architecture/ARCHITECTURE_DIAGRAMS.md
index 21a9e3e..0b04765 100644
--- a/docs/architecture/ARCHITECTURE_DIAGRAMS.md
+++ b/docs/architecture/ARCHITECTURE_DIAGRAMS.md
@@ -236,7 +236,7 @@ Diagrams are tracked in Git:
 
 ## References
 
-- [Assets Guide](ASSETS_GUIDE.md)
+- [Assets Guide](../guides/ASSETS_GUIDE.md)
 - [Azure Architecture Center](https://docs.microsoft.com/azure/architecture/)
 - [Azure Architecture Icons](https://docs.microsoft.com/azure/architecture/icons/)
 - [Azure Architecture Patterns](https://docs.microsoft.com/azure/architecture/patterns/)
@@ -267,4 +267,3 @@ make -f Makefile.assets download-icons
 - Network: `assets/diagrams/network/`
 - Deployment: `assets/diagrams/deployment/`
 - Templates: `assets/diagrams/templates/`
-
diff --git a/docs/architecture/DIRECTORY_STRUCTURE.md b/docs/architecture/DIRECTORY_STRUCTURE.md
index 236748c..525782d 100644
--- a/docs/architecture/DIRECTORY_STRUCTURE.md
+++ b/docs/architecture/DIRECTORY_STRUCTURE.md
@@ -38,9 +38,10 @@ This document explains the directory structure of the project, particularly the
 #### `scripts/` - Shell Scripts
 - **Purpose**: Contains utility shell scripts for deployment, key management, etc.
 - **File Pattern**: `*.sh`
-- **Usage**: `./scripts/generate-genesis.sh`
+- **Usage**: `./scripts/generate-genesis-proper.sh 4`
 - **Contents**:
-  - `generate-genesis.sh` - Genesis file generation script
+  - `generate-genesis-proper.sh` - Canonical QBFT genesis file generation script
+  - `generate-genesis.sh` - Compatibility wrapper for the canonical generator
   - `deployment/` - Deployment scripts
     - `deploy-weth.sh` - WETH deployment script
     - `deploy-multicall.sh` - Multicall deployment script
@@ -104,7 +105,7 @@ RPC_URL=https://rpc.d-bis.org ./tests/health-check.sh
 ### Running Shell Scripts
 ```bash
 # Generate genesis
-./scripts/generate-genesis.sh
+./scripts/generate-genesis-proper.sh 4
 
 # Generate validator keys
 ./scripts/key-management/generate-validator-keys.sh 4
diff --git a/docs/architecture/NETWORK.md b/docs/architecture/NETWORK.md
index e5cff76..3cff7b3 100644
--- a/docs/architecture/NETWORK.md
+++ b/docs/architecture/NETWORK.md
@@ -9,7 +9,7 @@ The DeFi Oracle Meta Mainnet uses a tiered architecture with validators, sentrie
 - **Count**: 4+ validators
 - **Location**: Private subnets, no public IPs
 - **Peering**: Only to sentries (via static-nodes.json)
-- **Consensus**: IBFT 2.0
+- **Consensus**: QBFT
 - **RPC**: Disabled for security
 
 ### Sentries
@@ -86,7 +86,7 @@ accounts-allowlist=[
 ]
 ```
 
-## IBFT 2.0 Configuration
+## QBFT Configuration
 
 ### Genesis Parameters
 
@@ -98,7 +98,7 @@ accounts-allowlist=[
 
 ### Validator Set
 
-Validators are specified in the genesis `extraData` field. The validator set can be updated via IBFT transitions.
+Validators are specified in the genesis `extraData` field. The validator set can be updated via QBFT transitions.
 
 ### Consensus Parameters
 
@@ -170,7 +170,7 @@ Monitor network topology to ensure proper peering:
 
 ### Updating Consensus Parameters
 
-1. Create IBFT transition block
+1. Create QBFT transition block
 2. Update block period, epoch length, or request timeout
 3. All validators must accept the transition
 
@@ -189,4 +189,3 @@ Monitor network topology to ensure proper peering:
 - Validator failure: Remove failed validator
 - Chain stall: Restart validators
 - Security incident: Isolate affected nodes
-
diff --git a/docs/archive/ARCHIVE_POLICY.md b/docs/archive/ARCHIVE_POLICY.md
index c0ad4b9..1a1bdcb 100644
--- a/docs/archive/ARCHIVE_POLICY.md
+++ b/docs/archive/ARCHIVE_POLICY.md
@@ -99,6 +99,7 @@ Maintain an archive index at `docs/archive/README.md` that lists:
 ## Related Documentation
 
 - [Archive README](README.md)
+- [Archived Status Reports](status-reports/README.md)
 - [Master Documentation Index](../MASTER_DOCUMENTATION_INDEX.md)
 - [Status Reports Index](../operations/status-reports/STATUS_REPORTS_INDEX.md)
 
@@ -106,4 +107,3 @@ Maintain an archive index at `docs/archive/README.md` that lists:
 
 **Last Updated**: 2025-01-27  
 **Next Review**: 2025-04-27
-
diff --git a/docs/archive/README.md b/docs/archive/README.md
index 94109a5..e1b3d5e 100644
--- a/docs/archive/README.md
+++ b/docs/archive/README.md
@@ -6,6 +6,10 @@ This directory contains archived files that are no longer actively used but are
 
 - `status-reports/phase1/` - Archived status reports from Phase 1 deployment
 - `status-reports/phase1-old/` - Additional historical status reports
+- `status-reports/operations-legacy/` - Former contents of `docs/operations/status-reports/`
+- `status-reports/docs-root-legacy/` - Historical report-style files formerly in `docs/`
+- `status-reports/repo-root-legacy/` - Historical report-style files formerly in the repository root
+- `bridge-trustless-milestones/` - Archived trustless bridge completion and status-report stack
 - `old-configs/ibft2/` - Old IBFT2-based configuration files (migrated to QBFT)
 
 ## Scripts Archive
@@ -18,10 +22,11 @@ Files are archived rather than deleted to:
 - Maintain historical context
 - Enable rollback if needed
 - Provide reference for similar future work
+- Keep the active docs surface focused on current runbooks, deployment state,
+  and reference material
 
 ## Cleanup Policy
 
 - Files older than 6 months may be considered for permanent deletion
 - Critical configuration backups are retained indefinitely
 - Status reports can be removed after 1 year if not referenced
-
diff --git a/docs/bridge/trustless/ALL_NEXT_STEPS_COMPLETE.md b/docs/archive/bridge-trustless-milestones/ALL_NEXT_STEPS_COMPLETE.md
similarity index 100%
rename from docs/bridge/trustless/ALL_NEXT_STEPS_COMPLETE.md
rename to docs/archive/bridge-trustless-milestones/ALL_NEXT_STEPS_COMPLETE.md
diff --git a/docs/bridge/trustless/ALL_TASKS_COMPLETE.md b/docs/archive/bridge-trustless-milestones/ALL_TASKS_COMPLETE.md
similarity index 100%
rename from docs/bridge/trustless/ALL_TASKS_COMPLETE.md
rename to docs/archive/bridge-trustless-milestones/ALL_TASKS_COMPLETE.md
diff --git a/docs/bridge/trustless/COMPLETE_IMPLEMENTATION_FINAL.md b/docs/archive/bridge-trustless-milestones/COMPLETE_IMPLEMENTATION_FINAL.md
similarity index 100%
rename from docs/bridge/trustless/COMPLETE_IMPLEMENTATION_FINAL.md
rename to docs/archive/bridge-trustless-milestones/COMPLETE_IMPLEMENTATION_FINAL.md
diff --git a/docs/bridge/trustless/DEPLOYMENT_STATUS.md b/docs/archive/bridge-trustless-milestones/DEPLOYMENT_STATUS.md
similarity index 100%
rename from docs/bridge/trustless/DEPLOYMENT_STATUS.md
rename to docs/archive/bridge-trustless-milestones/DEPLOYMENT_STATUS.md
diff --git a/docs/bridge/trustless/DEPLOYMENT_SUMMARY.md b/docs/archive/bridge-trustless-milestones/DEPLOYMENT_SUMMARY.md
similarity index 100%
rename from docs/bridge/trustless/DEPLOYMENT_SUMMARY.md
rename to docs/archive/bridge-trustless-milestones/DEPLOYMENT_SUMMARY.md
diff --git a/docs/bridge/trustless/FINAL_IMPLEMENTATION_COMPLETE.md b/docs/archive/bridge-trustless-milestones/FINAL_IMPLEMENTATION_COMPLETE.md
similarity index 100%
rename from docs/bridge/trustless/FINAL_IMPLEMENTATION_COMPLETE.md
rename to docs/archive/bridge-trustless-milestones/FINAL_IMPLEMENTATION_COMPLETE.md
diff --git a/docs/bridge/trustless/FINAL_STATUS_REPORT.md b/docs/archive/bridge-trustless-milestones/FINAL_STATUS_REPORT.md
similarity index 100%
rename from docs/bridge/trustless/FINAL_STATUS_REPORT.md
rename to docs/archive/bridge-trustless-milestones/FINAL_STATUS_REPORT.md
diff --git a/docs/bridge/trustless/IMPLEMENTATION_COMPLETE_SUMMARY.md b/docs/archive/bridge-trustless-milestones/IMPLEMENTATION_COMPLETE_SUMMARY.md
similarity index 100%
rename from docs/bridge/trustless/IMPLEMENTATION_COMPLETE_SUMMARY.md
rename to docs/archive/bridge-trustless-milestones/IMPLEMENTATION_COMPLETE_SUMMARY.md
diff --git a/docs/bridge/trustless/IMPLEMENTATION_STATUS.md b/docs/archive/bridge-trustless-milestones/IMPLEMENTATION_STATUS.md
similarity index 100%
rename from docs/bridge/trustless/IMPLEMENTATION_STATUS.md
rename to docs/archive/bridge-trustless-milestones/IMPLEMENTATION_STATUS.md
diff --git a/docs/bridge/trustless/NEXT_ACTIONS_COMPLETE.md b/docs/archive/bridge-trustless-milestones/NEXT_ACTIONS_COMPLETE.md
similarity index 100%
rename from docs/bridge/trustless/NEXT_ACTIONS_COMPLETE.md
rename to docs/archive/bridge-trustless-milestones/NEXT_ACTIONS_COMPLETE.md
diff --git a/docs/bridge/trustless/OPERATIONAL_TASKS_STATUS.md b/docs/archive/bridge-trustless-milestones/OPERATIONAL_TASKS_STATUS.md
similarity index 100%
rename from docs/bridge/trustless/OPERATIONAL_TASKS_STATUS.md
rename to docs/archive/bridge-trustless-milestones/OPERATIONAL_TASKS_STATUS.md
diff --git a/docs/bridge/trustless/PRODUCTION_READY_SUMMARY.md b/docs/archive/bridge-trustless-milestones/PRODUCTION_READY_SUMMARY.md
similarity index 100%
rename from docs/bridge/trustless/PRODUCTION_READY_SUMMARY.md
rename to docs/archive/bridge-trustless-milestones/PRODUCTION_READY_SUMMARY.md
diff --git a/docs/archive/bridge-trustless-milestones/README.md b/docs/archive/bridge-trustless-milestones/README.md
new file mode 100644
index 0000000..3361b1e
--- /dev/null
+++ b/docs/archive/bridge-trustless-milestones/README.md
@@ -0,0 +1,30 @@
+# Trustless Bridge Milestone Archive
+
+**Last Updated**: 2026-04-13  
+**Status**: Archived
+
+This archive contains historical trustless-bridge milestone and completion reports that were removed from the active docs surface to keep `docs/bridge/trustless/` focused on evergreen operator guidance.
+
+## Archived Milestone Files
+
+- `ALL_NEXT_STEPS_COMPLETE.md`
+- `ALL_TASKS_COMPLETE.md`
+- `COMPLETE_IMPLEMENTATION_FINAL.md`
+- `DEPLOYMENT_STATUS.md`
+- `DEPLOYMENT_SUMMARY.md`
+- `FINAL_IMPLEMENTATION_COMPLETE.md`
+- `FINAL_STATUS_REPORT.md`
+- `IMPLEMENTATION_COMPLETE_SUMMARY.md`
+- `IMPLEMENTATION_STATUS.md`
+- `NEXT_ACTIONS_COMPLETE.md`
+- `OPERATIONAL_TASKS_STATUS.md`
+- `PRODUCTION_READY_SUMMARY.md`
+- `SECTION_7.2_COMPLETE.md`
+
+## Active Docs
+
+For current trustless bridge documentation, use:
+
+- [docs/bridge/trustless/README.md](../../bridge/trustless/README.md)
+
+That overview points to the current architecture, security, deployment, and operations guides.
diff --git a/docs/bridge/trustless/SECTION_7.2_COMPLETE.md b/docs/archive/bridge-trustless-milestones/SECTION_7.2_COMPLETE.md
similarity index 100%
rename from docs/bridge/trustless/SECTION_7.2_COMPLETE.md
rename to docs/archive/bridge-trustless-milestones/SECTION_7.2_COMPLETE.md
diff --git a/docs/archive/status-reports/README.md b/docs/archive/status-reports/README.md
new file mode 100644
index 0000000..a9a338a
--- /dev/null
+++ b/docs/archive/status-reports/README.md
@@ -0,0 +1,26 @@
+# Archived Status Reports
+
+**Last Updated**: 2026-04-12  
+**Status**: Active archive index
+
+This directory contains historical status-report collections that were removed
+from the active documentation surface to keep current runbooks and reference
+docs easier to navigate.
+
+## Collections
+
+- `operations-legacy/` - Former contents of `docs/operations/status-reports/`.
+- `docs-root-legacy/` - Historical report-style files formerly located directly
+  under `docs/`.
+- `repo-root-legacy/` - Historical report-style files formerly located at the
+  repository root.
+- `phase1/` - Earlier archived phase-1 status reports.
+- `phase1-old/` - Additional early legacy reports retained for reference.
+
+## Notes
+
+- Archived documents may preserve historical paths, naming, or assumptions.
+- Not every internal link inside archived material is kept current.
+- Use active docs such as `docs/STATUS_AND_TOKEN_ROUTING.md`,
+  `docs/deployment/DEPLOYMENT_STATUS_AND_NEXT_STEPS.md`, and
+  `docs/MASTER_CONTRACTS_AND_INFRASTRUCTURE_LIST.md` for current state.
diff --git a/docs/ALL_ACTIONS_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/ALL_ACTIONS_COMPLETE.md
similarity index 100%
rename from docs/ALL_ACTIONS_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/ALL_ACTIONS_COMPLETE.md
diff --git a/docs/ALL_ADDITIONAL_SUGGESTIONS_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/ALL_ADDITIONAL_SUGGESTIONS_COMPLETE.md
similarity index 100%
rename from docs/ALL_ADDITIONAL_SUGGESTIONS_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/ALL_ADDITIONAL_SUGGESTIONS_COMPLETE.md
diff --git a/docs/ALL_RECOMMENDATIONS_AND_SUGGESTIONS.md b/docs/archive/status-reports/docs-root-legacy/ALL_RECOMMENDATIONS_AND_SUGGESTIONS.md
similarity index 100%
rename from docs/ALL_RECOMMENDATIONS_AND_SUGGESTIONS.md
rename to docs/archive/status-reports/docs-root-legacy/ALL_RECOMMENDATIONS_AND_SUGGESTIONS.md
diff --git a/docs/ALL_STEPS_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/ALL_STEPS_COMPLETE.md
similarity index 100%
rename from docs/ALL_STEPS_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/ALL_STEPS_COMPLETE.md
diff --git a/docs/ALL_TODO_ITEMS_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/ALL_TODO_ITEMS_COMPLETE.md
similarity index 100%
rename from docs/ALL_TODO_ITEMS_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/ALL_TODO_ITEMS_COMPLETE.md
diff --git a/docs/BLOCKERS_REMOVED_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/BLOCKERS_REMOVED_SUMMARY.md
similarity index 100%
rename from docs/BLOCKERS_REMOVED_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/BLOCKERS_REMOVED_SUMMARY.md
diff --git a/docs/CLEANUP_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/CLEANUP_COMPLETE.md
similarity index 100%
rename from docs/CLEANUP_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/CLEANUP_COMPLETE.md
diff --git a/docs/CLEANUP_COMPLETE_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/CLEANUP_COMPLETE_SUMMARY.md
similarity index 100%
rename from docs/CLEANUP_COMPLETE_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/CLEANUP_COMPLETE_SUMMARY.md
diff --git a/docs/CLEANUP_DEDUPLICATION_REPORT.md b/docs/archive/status-reports/docs-root-legacy/CLEANUP_DEDUPLICATION_REPORT.md
similarity index 100%
rename from docs/CLEANUP_DEDUPLICATION_REPORT.md
rename to docs/archive/status-reports/docs-root-legacy/CLEANUP_DEDUPLICATION_REPORT.md
diff --git a/docs/CLEANUP_SUMMARY_2025_11_18.md b/docs/archive/status-reports/docs-root-legacy/CLEANUP_SUMMARY_2025_11_18.md
similarity index 100%
rename from docs/CLEANUP_SUMMARY_2025_11_18.md
rename to docs/archive/status-reports/docs-root-legacy/CLEANUP_SUMMARY_2025_11_18.md
diff --git a/docs/COMPLETE_PROJECT_REVIEW.md b/docs/archive/status-reports/docs-root-legacy/COMPLETE_PROJECT_REVIEW.md
similarity index 100%
rename from docs/COMPLETE_PROJECT_REVIEW.md
rename to docs/archive/status-reports/docs-root-legacy/COMPLETE_PROJECT_REVIEW.md
diff --git a/docs/COMPLETE_STATUS_REPORT.md b/docs/archive/status-reports/docs-root-legacy/COMPLETE_STATUS_REPORT.md
similarity index 100%
rename from docs/COMPLETE_STATUS_REPORT.md
rename to docs/archive/status-reports/docs-root-legacy/COMPLETE_STATUS_REPORT.md
diff --git a/docs/COMPLETE_TODO_LIST.md b/docs/archive/status-reports/docs-root-legacy/COMPLETE_TODO_LIST.md
similarity index 100%
rename from docs/COMPLETE_TODO_LIST.md
rename to docs/archive/status-reports/docs-root-legacy/COMPLETE_TODO_LIST.md
diff --git a/docs/COMPLETION_STATUS.md b/docs/archive/status-reports/docs-root-legacy/COMPLETION_STATUS.md
similarity index 100%
rename from docs/COMPLETION_STATUS.md
rename to docs/archive/status-reports/docs-root-legacy/COMPLETION_STATUS.md
diff --git a/docs/COMPLETION_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/COMPLETION_SUMMARY.md
similarity index 100%
rename from docs/COMPLETION_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/COMPLETION_SUMMARY.md
diff --git a/docs/E2E_TESTING_AND_DEPLOYMENT_STATUS.md b/docs/archive/status-reports/docs-root-legacy/E2E_TESTING_AND_DEPLOYMENT_STATUS.md
similarity index 100%
rename from docs/E2E_TESTING_AND_DEPLOYMENT_STATUS.md
rename to docs/archive/status-reports/docs-root-legacy/E2E_TESTING_AND_DEPLOYMENT_STATUS.md
diff --git a/docs/E2E_TESTING_REPORT.md b/docs/archive/status-reports/docs-root-legacy/E2E_TESTING_REPORT.md
similarity index 100%
rename from docs/E2E_TESTING_REPORT.md
rename to docs/archive/status-reports/docs-root-legacy/E2E_TESTING_REPORT.md
diff --git a/docs/FINAL_COMPLETION_REPORT.md b/docs/archive/status-reports/docs-root-legacy/FINAL_COMPLETION_REPORT.md
similarity index 100%
rename from docs/FINAL_COMPLETION_REPORT.md
rename to docs/archive/status-reports/docs-root-legacy/FINAL_COMPLETION_REPORT.md
diff --git a/docs/FINAL_COMPLETION_STATUS.md b/docs/archive/status-reports/docs-root-legacy/FINAL_COMPLETION_STATUS.md
similarity index 100%
rename from docs/FINAL_COMPLETION_STATUS.md
rename to docs/archive/status-reports/docs-root-legacy/FINAL_COMPLETION_STATUS.md
diff --git a/docs/FINAL_E2E_REPORT_AND_RECOMMENDATIONS.md b/docs/archive/status-reports/docs-root-legacy/FINAL_E2E_REPORT_AND_RECOMMENDATIONS.md
similarity index 100%
rename from docs/FINAL_E2E_REPORT_AND_RECOMMENDATIONS.md
rename to docs/archive/status-reports/docs-root-legacy/FINAL_E2E_REPORT_AND_RECOMMENDATIONS.md
diff --git a/docs/IMPLEMENTATION_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/IMPLEMENTATION_COMPLETE.md
similarity index 100%
rename from docs/IMPLEMENTATION_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/IMPLEMENTATION_COMPLETE.md
diff --git a/docs/INTEGRATION_COMPLETE.md b/docs/archive/status-reports/docs-root-legacy/INTEGRATION_COMPLETE.md
similarity index 100%
rename from docs/INTEGRATION_COMPLETE.md
rename to docs/archive/status-reports/docs-root-legacy/INTEGRATION_COMPLETE.md
diff --git a/docs/NEXT_STEPS_COMPLETE_GUIDE.md b/docs/archive/status-reports/docs-root-legacy/NEXT_STEPS_COMPLETE_GUIDE.md
similarity index 100%
rename from docs/NEXT_STEPS_COMPLETE_GUIDE.md
rename to docs/archive/status-reports/docs-root-legacy/NEXT_STEPS_COMPLETE_GUIDE.md
diff --git a/docs/NEXT_STEPS_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/NEXT_STEPS_SUMMARY.md
similarity index 100%
rename from docs/NEXT_STEPS_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/NEXT_STEPS_SUMMARY.md
diff --git a/docs/OPTIMIZATION_IMPLEMENTATION_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/OPTIMIZATION_IMPLEMENTATION_SUMMARY.md
similarity index 100%
rename from docs/OPTIMIZATION_IMPLEMENTATION_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/OPTIMIZATION_IMPLEMENTATION_SUMMARY.md
diff --git a/docs/PARALLEL_COMPLETION_TASK_LIST.md b/docs/archive/status-reports/docs-root-legacy/PARALLEL_COMPLETION_TASK_LIST.md
similarity index 100%
rename from docs/PARALLEL_COMPLETION_TASK_LIST.md
rename to docs/archive/status-reports/docs-root-legacy/PARALLEL_COMPLETION_TASK_LIST.md
diff --git a/docs/PARALLEL_EXECUTION_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/PARALLEL_EXECUTION_SUMMARY.md
similarity index 100%
rename from docs/PARALLEL_EXECUTION_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/PARALLEL_EXECUTION_SUMMARY.md
diff --git a/docs/archive/status-reports/docs-root-legacy/README.md b/docs/archive/status-reports/docs-root-legacy/README.md
new file mode 100644
index 0000000..7253293
--- /dev/null
+++ b/docs/archive/status-reports/docs-root-legacy/README.md
@@ -0,0 +1,9 @@
+# Docs Root Legacy Reports
+
+**Archived**: 2026-04-12  
+**Original Location**: `docs/`  
+**Reason for Archiving**: Historical report-style and completion-summary files
+were moved out of the primary docs surface to keep active documentation smaller
+and easier to navigate.
+
+This directory preserves those files as reference material.
diff --git a/docs/REMAINING_TASKS_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/REMAINING_TASKS_SUMMARY.md
similarity index 100%
rename from docs/REMAINING_TASKS_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/REMAINING_TASKS_SUMMARY.md
diff --git a/docs/REMAINING_TODO_ITEMS.md b/docs/archive/status-reports/docs-root-legacy/REMAINING_TODO_ITEMS.md
similarity index 100%
rename from docs/REMAINING_TODO_ITEMS.md
rename to docs/archive/status-reports/docs-root-legacy/REMAINING_TODO_ITEMS.md
diff --git a/docs/TODO.md b/docs/archive/status-reports/docs-root-legacy/TODO.md
similarity index 100%
rename from docs/TODO.md
rename to docs/archive/status-reports/docs-root-legacy/TODO.md
diff --git a/docs/TODO_GAP_ANALYSIS.md b/docs/archive/status-reports/docs-root-legacy/TODO_GAP_ANALYSIS.md
similarity index 100%
rename from docs/TODO_GAP_ANALYSIS.md
rename to docs/archive/status-reports/docs-root-legacy/TODO_GAP_ANALYSIS.md
diff --git a/docs/TODO_LIST_SUMMARY.md b/docs/archive/status-reports/docs-root-legacy/TODO_LIST_SUMMARY.md
similarity index 100%
rename from docs/TODO_LIST_SUMMARY.md
rename to docs/archive/status-reports/docs-root-legacy/TODO_LIST_SUMMARY.md
diff --git a/docs/operations/status-reports/ALL-38-ERRORS-LIST.md b/docs/archive/status-reports/operations-legacy/ALL-38-ERRORS-LIST.md
similarity index 100%
rename from docs/operations/status-reports/ALL-38-ERRORS-LIST.md
rename to docs/archive/status-reports/operations-legacy/ALL-38-ERRORS-LIST.md
diff --git a/docs/operations/status-reports/ALL_MANUAL_STEPS_COMPLETE.md b/docs/archive/status-reports/operations-legacy/ALL_MANUAL_STEPS_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/ALL_MANUAL_STEPS_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/ALL_MANUAL_STEPS_COMPLETE.md
diff --git a/docs/operations/status-reports/ALL_NEXT_STEPS_COMPLETE.md b/docs/archive/status-reports/operations-legacy/ALL_NEXT_STEPS_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/ALL_NEXT_STEPS_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/ALL_NEXT_STEPS_COMPLETE.md
diff --git a/docs/operations/status-reports/ALL_NEXT_STEPS_COMPLETE_FINAL.md b/docs/archive/status-reports/operations-legacy/ALL_NEXT_STEPS_COMPLETE_FINAL.md
similarity index 100%
rename from docs/operations/status-reports/ALL_NEXT_STEPS_COMPLETE_FINAL.md
rename to docs/archive/status-reports/operations-legacy/ALL_NEXT_STEPS_COMPLETE_FINAL.md
diff --git a/docs/operations/status-reports/ALL_TASKS_COMPLETE.md b/docs/archive/status-reports/operations-legacy/ALL_TASKS_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/ALL_TASKS_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/ALL_TASKS_COMPLETE.md
diff --git a/docs/operations/status-reports/CANCUN_FORK_STATUS.md b/docs/archive/status-reports/operations-legacy/CANCUN_FORK_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/CANCUN_FORK_STATUS.md
rename to docs/archive/status-reports/operations-legacy/CANCUN_FORK_STATUS.md
diff --git a/docs/operations/status-reports/CHAIN138_VERIFICATION_REPORT.md b/docs/archive/status-reports/operations-legacy/CHAIN138_VERIFICATION_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/CHAIN138_VERIFICATION_REPORT.md
rename to docs/archive/status-reports/operations-legacy/CHAIN138_VERIFICATION_REPORT.md
diff --git a/docs/operations/status-reports/CHANGES_SUMMARY.md b/docs/archive/status-reports/operations-legacy/CHANGES_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/CHANGES_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/CHANGES_SUMMARY.md
diff --git a/docs/operations/status-reports/CLOUD_SOVEREIGNTY_DEPLOYMENT_COMPLETE.md b/docs/archive/status-reports/operations-legacy/CLOUD_SOVEREIGNTY_DEPLOYMENT_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/CLOUD_SOVEREIGNTY_DEPLOYMENT_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/CLOUD_SOVEREIGNTY_DEPLOYMENT_COMPLETE.md
diff --git a/docs/operations/status-reports/CLOUD_SOVEREIGNTY_STATUS.md b/docs/archive/status-reports/operations-legacy/CLOUD_SOVEREIGNTY_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/CLOUD_SOVEREIGNTY_STATUS.md
rename to docs/archive/status-reports/operations-legacy/CLOUD_SOVEREIGNTY_STATUS.md
diff --git a/docs/operations/status-reports/COLOR_VARS_CLEANUP.md b/docs/archive/status-reports/operations-legacy/COLOR_VARS_CLEANUP.md
similarity index 100%
rename from docs/operations/status-reports/COLOR_VARS_CLEANUP.md
rename to docs/archive/status-reports/operations-legacy/COLOR_VARS_CLEANUP.md
diff --git a/docs/operations/status-reports/COMMANDS_INDEX.md b/docs/archive/status-reports/operations-legacy/COMMANDS_INDEX.md
similarity index 100%
rename from docs/operations/status-reports/COMMANDS_INDEX.md
rename to docs/archive/status-reports/operations-legacy/COMMANDS_INDEX.md
diff --git a/docs/operations/status-reports/COMPLETE_ALL_TASKS_SUMMARY.md b/docs/archive/status-reports/operations-legacy/COMPLETE_ALL_TASKS_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETE_ALL_TASKS_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/COMPLETE_ALL_TASKS_SUMMARY.md
diff --git a/docs/operations/status-reports/COMPLETE_DEPLOYMENT_STATUS.md b/docs/archive/status-reports/operations-legacy/COMPLETE_DEPLOYMENT_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETE_DEPLOYMENT_STATUS.md
rename to docs/archive/status-reports/operations-legacy/COMPLETE_DEPLOYMENT_STATUS.md
diff --git a/docs/operations/status-reports/COMPLETE_ENTERPRISE_TASK_SUMMARY.md b/docs/archive/status-reports/operations-legacy/COMPLETE_ENTERPRISE_TASK_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETE_ENTERPRISE_TASK_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/COMPLETE_ENTERPRISE_TASK_SUMMARY.md
diff --git a/docs/operations/status-reports/COMPLETE_NEXT_STEPS_REPORT.md b/docs/archive/status-reports/operations-legacy/COMPLETE_NEXT_STEPS_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETE_NEXT_STEPS_REPORT.md
rename to docs/archive/status-reports/operations-legacy/COMPLETE_NEXT_STEPS_REPORT.md
diff --git a/docs/operations/status-reports/COMPLETE_TASK_SUMMARY.md b/docs/archive/status-reports/operations-legacy/COMPLETE_TASK_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETE_TASK_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/COMPLETE_TASK_SUMMARY.md
diff --git a/docs/operations/status-reports/COMPLETION_REPORT.md b/docs/archive/status-reports/operations-legacy/COMPLETION_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETION_REPORT.md
rename to docs/archive/status-reports/operations-legacy/COMPLETION_REPORT.md
diff --git a/docs/operations/status-reports/COMPLETION_REPORT_FINAL.md b/docs/archive/status-reports/operations-legacy/COMPLETION_REPORT_FINAL.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETION_REPORT_FINAL.md
rename to docs/archive/status-reports/operations-legacy/COMPLETION_REPORT_FINAL.md
diff --git a/docs/operations/status-reports/COMPLETION_STATUS.md b/docs/archive/status-reports/operations-legacy/COMPLETION_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETION_STATUS.md
rename to docs/archive/status-reports/operations-legacy/COMPLETION_STATUS.md
diff --git a/docs/operations/status-reports/COMPLETION_SUMMARY.md b/docs/archive/status-reports/operations-legacy/COMPLETION_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETION_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/COMPLETION_SUMMARY.md
diff --git a/docs/operations/status-reports/COMPLETION_SUMMARY_METAMASK.md b/docs/archive/status-reports/operations-legacy/COMPLETION_SUMMARY_METAMASK.md
similarity index 100%
rename from docs/operations/status-reports/COMPLETION_SUMMARY_METAMASK.md
rename to docs/archive/status-reports/operations-legacy/COMPLETION_SUMMARY_METAMASK.md
diff --git a/docs/operations/status-reports/CREATE_VS_CREATE2_ADDRESSES.md b/docs/archive/status-reports/operations-legacy/CREATE_VS_CREATE2_ADDRESSES.md
similarity index 100%
rename from docs/operations/status-reports/CREATE_VS_CREATE2_ADDRESSES.md
rename to docs/archive/status-reports/operations-legacy/CREATE_VS_CREATE2_ADDRESSES.md
diff --git a/docs/operations/status-reports/DECISION_TREE.md b/docs/archive/status-reports/operations-legacy/DECISION_TREE.md
similarity index 100%
rename from docs/operations/status-reports/DECISION_TREE.md
rename to docs/archive/status-reports/operations-legacy/DECISION_TREE.md
diff --git a/docs/operations/status-reports/DEPLOYABLE_WITHOUT_QUOTA_INCREASE.md b/docs/archive/status-reports/operations-legacy/DEPLOYABLE_WITHOUT_QUOTA_INCREASE.md
similarity index 100%
rename from docs/operations/status-reports/DEPLOYABLE_WITHOUT_QUOTA_INCREASE.md
rename to docs/archive/status-reports/operations-legacy/DEPLOYABLE_WITHOUT_QUOTA_INCREASE.md
diff --git a/docs/operations/status-reports/DOCS_CLEANUP_LOG.md b/docs/archive/status-reports/operations-legacy/DOCS_CLEANUP_LOG.md
similarity index 100%
rename from docs/operations/status-reports/DOCS_CLEANUP_LOG.md
rename to docs/archive/status-reports/operations-legacy/DOCS_CLEANUP_LOG.md
diff --git a/docs/operations/status-reports/EXECUTION_COMPLETE_SUMMARY.md b/docs/archive/status-reports/operations-legacy/EXECUTION_COMPLETE_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/EXECUTION_COMPLETE_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/EXECUTION_COMPLETE_SUMMARY.md
diff --git a/docs/operations/status-reports/EXECUTION_ROADMAP.md b/docs/archive/status-reports/operations-legacy/EXECUTION_ROADMAP.md
similarity index 100%
rename from docs/operations/status-reports/EXECUTION_ROADMAP.md
rename to docs/archive/status-reports/operations-legacy/EXECUTION_ROADMAP.md
diff --git a/docs/operations/status-reports/EXISTING_DEPLOYMENTS_REPORT.md b/docs/archive/status-reports/operations-legacy/EXISTING_DEPLOYMENTS_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/EXISTING_DEPLOYMENTS_REPORT.md
rename to docs/archive/status-reports/operations-legacy/EXISTING_DEPLOYMENTS_REPORT.md
diff --git a/docs/operations/status-reports/EXISTING_DEPLOYMENTS_STATUS.md b/docs/archive/status-reports/operations-legacy/EXISTING_DEPLOYMENTS_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/EXISTING_DEPLOYMENTS_STATUS.md
rename to docs/archive/status-reports/operations-legacy/EXISTING_DEPLOYMENTS_STATUS.md
diff --git a/docs/operations/status-reports/FINAL_CHAIN138_REPORT.txt b/docs/archive/status-reports/operations-legacy/FINAL_CHAIN138_REPORT.txt
similarity index 100%
rename from docs/operations/status-reports/FINAL_CHAIN138_REPORT.txt
rename to docs/archive/status-reports/operations-legacy/FINAL_CHAIN138_REPORT.txt
diff --git a/docs/operations/status-reports/FINAL_COMPLETE_REPORT.md b/docs/archive/status-reports/operations-legacy/FINAL_COMPLETE_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_COMPLETE_REPORT.md
rename to docs/archive/status-reports/operations-legacy/FINAL_COMPLETE_REPORT.md
diff --git a/docs/operations/status-reports/FINAL_COMPLETE_STATUS.md b/docs/archive/status-reports/operations-legacy/FINAL_COMPLETE_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_COMPLETE_STATUS.md
rename to docs/archive/status-reports/operations-legacy/FINAL_COMPLETE_STATUS.md
diff --git a/docs/operations/status-reports/FINAL_COMPLETION_REPORT.md b/docs/archive/status-reports/operations-legacy/FINAL_COMPLETION_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_COMPLETION_REPORT.md
rename to docs/archive/status-reports/operations-legacy/FINAL_COMPLETION_REPORT.md
diff --git a/docs/operations/status-reports/FINAL_COMPLETION_STATUS.md b/docs/archive/status-reports/operations-legacy/FINAL_COMPLETION_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_COMPLETION_STATUS.md
rename to docs/archive/status-reports/operations-legacy/FINAL_COMPLETION_STATUS.md
diff --git a/docs/operations/status-reports/FINAL_COST_ESTIMATES.md b/docs/archive/status-reports/operations-legacy/FINAL_COST_ESTIMATES.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_COST_ESTIMATES.md
rename to docs/archive/status-reports/operations-legacy/FINAL_COST_ESTIMATES.md
diff --git a/docs/operations/status-reports/FINAL_DEPLOYMENT_PLAN.md b/docs/archive/status-reports/operations-legacy/FINAL_DEPLOYMENT_PLAN.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_DEPLOYMENT_PLAN.md
rename to docs/archive/status-reports/operations-legacy/FINAL_DEPLOYMENT_PLAN.md
diff --git a/docs/operations/status-reports/FINAL_DEPLOYMENT_STATUS.md b/docs/archive/status-reports/operations-legacy/FINAL_DEPLOYMENT_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_DEPLOYMENT_STATUS.md
rename to docs/archive/status-reports/operations-legacy/FINAL_DEPLOYMENT_STATUS.md
diff --git a/docs/operations/status-reports/FINAL_MAINNET_REPORT.txt b/docs/archive/status-reports/operations-legacy/FINAL_MAINNET_REPORT.txt
similarity index 100%
rename from docs/operations/status-reports/FINAL_MAINNET_REPORT.txt
rename to docs/archive/status-reports/operations-legacy/FINAL_MAINNET_REPORT.txt
diff --git a/docs/operations/status-reports/FINAL_PARALLEL_EXECUTION_REPORT.md b/docs/archive/status-reports/operations-legacy/FINAL_PARALLEL_EXECUTION_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_PARALLEL_EXECUTION_REPORT.md
rename to docs/archive/status-reports/operations-legacy/FINAL_PARALLEL_EXECUTION_REPORT.md
diff --git a/docs/operations/status-reports/FINAL_PROJECT_STATUS.md b/docs/archive/status-reports/operations-legacy/FINAL_PROJECT_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_PROJECT_STATUS.md
rename to docs/archive/status-reports/operations-legacy/FINAL_PROJECT_STATUS.md
diff --git a/docs/operations/status-reports/FINAL_SUMMARY.md b/docs/archive/status-reports/operations-legacy/FINAL_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/FINAL_SUMMARY.md
diff --git a/docs/operations/status-reports/FINAL_TODO_STATUS.md b/docs/archive/status-reports/operations-legacy/FINAL_TODO_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/FINAL_TODO_STATUS.md
rename to docs/archive/status-reports/operations-legacy/FINAL_TODO_STATUS.md
diff --git a/docs/operations/status-reports/FINANCIAL_TOKENIZATION.md b/docs/archive/status-reports/operations-legacy/FINANCIAL_TOKENIZATION.md
similarity index 100%
rename from docs/operations/status-reports/FINANCIAL_TOKENIZATION.md
rename to docs/archive/status-reports/operations-legacy/FINANCIAL_TOKENIZATION.md
diff --git a/docs/operations/status-reports/FORK_ANALYSIS.md b/docs/archive/status-reports/operations-legacy/FORK_ANALYSIS.md
similarity index 100%
rename from docs/operations/status-reports/FORK_ANALYSIS.md
rename to docs/archive/status-reports/operations-legacy/FORK_ANALYSIS.md
diff --git a/docs/operations/status-reports/GAP_ANALYSIS.md b/docs/archive/status-reports/operations-legacy/GAP_ANALYSIS.md
similarity index 100%
rename from docs/operations/status-reports/GAP_ANALYSIS.md
rename to docs/archive/status-reports/operations-legacy/GAP_ANALYSIS.md
diff --git a/docs/operations/status-reports/IMPLEMENTATION_ROADMAP.md b/docs/archive/status-reports/operations-legacy/IMPLEMENTATION_ROADMAP.md
similarity index 100%
rename from docs/operations/status-reports/IMPLEMENTATION_ROADMAP.md
rename to docs/archive/status-reports/operations-legacy/IMPLEMENTATION_ROADMAP.md
diff --git a/docs/operations/status-reports/INFRASTRUCTURE_DEPLOYMENT_STATUS.md b/docs/archive/status-reports/operations-legacy/INFRASTRUCTURE_DEPLOYMENT_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/INFRASTRUCTURE_DEPLOYMENT_STATUS.md
rename to docs/archive/status-reports/operations-legacy/INFRASTRUCTURE_DEPLOYMENT_STATUS.md
diff --git a/docs/operations/status-reports/INFRASTRUCTURE_STATUS_ANALYSIS.md b/docs/archive/status-reports/operations-legacy/INFRASTRUCTURE_STATUS_ANALYSIS.md
similarity index 100%
rename from docs/operations/status-reports/INFRASTRUCTURE_STATUS_ANALYSIS.md
rename to docs/archive/status-reports/operations-legacy/INFRASTRUCTURE_STATUS_ANALYSIS.md
diff --git a/docs/operations/status-reports/INFRASTRUCTURE_STATUS_EXPLANATION.md b/docs/archive/status-reports/operations-legacy/INFRASTRUCTURE_STATUS_EXPLANATION.md
similarity index 100%
rename from docs/operations/status-reports/INFRASTRUCTURE_STATUS_EXPLANATION.md
rename to docs/archive/status-reports/operations-legacy/INFRASTRUCTURE_STATUS_EXPLANATION.md
diff --git a/docs/operations/status-reports/MAINNET_CONTRACTS_COMPLETE_LIST.md b/docs/archive/status-reports/operations-legacy/MAINNET_CONTRACTS_COMPLETE_LIST.md
similarity index 100%
rename from docs/operations/status-reports/MAINNET_CONTRACTS_COMPLETE_LIST.md
rename to docs/archive/status-reports/operations-legacy/MAINNET_CONTRACTS_COMPLETE_LIST.md
diff --git a/docs/operations/status-reports/MANUAL_ACTIONS_COMPLETED.md b/docs/archive/status-reports/operations-legacy/MANUAL_ACTIONS_COMPLETED.md
similarity index 100%
rename from docs/operations/status-reports/MANUAL_ACTIONS_COMPLETED.md
rename to docs/archive/status-reports/operations-legacy/MANUAL_ACTIONS_COMPLETED.md
diff --git a/docs/operations/status-reports/MAXIMUM_PARALLEL_DEPLOYMENT.md b/docs/archive/status-reports/operations-legacy/MAXIMUM_PARALLEL_DEPLOYMENT.md
similarity index 100%
rename from docs/operations/status-reports/MAXIMUM_PARALLEL_DEPLOYMENT.md
rename to docs/archive/status-reports/operations-legacy/MAXIMUM_PARALLEL_DEPLOYMENT.md
diff --git a/docs/operations/status-reports/NEXT_STEPS_COMPLETED.md b/docs/archive/status-reports/operations-legacy/NEXT_STEPS_COMPLETED.md
similarity index 100%
rename from docs/operations/status-reports/NEXT_STEPS_COMPLETED.md
rename to docs/archive/status-reports/operations-legacy/NEXT_STEPS_COMPLETED.md
diff --git a/docs/operations/status-reports/NEXT_STEPS_STATUS.md b/docs/archive/status-reports/operations-legacy/NEXT_STEPS_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/NEXT_STEPS_STATUS.md
rename to docs/archive/status-reports/operations-legacy/NEXT_STEPS_STATUS.md
diff --git a/docs/operations/status-reports/OPTIMIZED_240_VCPU_DEPLOYMENT.md b/docs/archive/status-reports/operations-legacy/OPTIMIZED_240_VCPU_DEPLOYMENT.md
similarity index 100%
rename from docs/operations/status-reports/OPTIMIZED_240_VCPU_DEPLOYMENT.md
rename to docs/archive/status-reports/operations-legacy/OPTIMIZED_240_VCPU_DEPLOYMENT.md
diff --git a/docs/operations/status-reports/OPTIMIZED_24_REGIONS_240_VCPUS.md b/docs/archive/status-reports/operations-legacy/OPTIMIZED_24_REGIONS_240_VCPUS.md
similarity index 100%
rename from docs/operations/status-reports/OPTIMIZED_24_REGIONS_240_VCPUS.md
rename to docs/archive/status-reports/operations-legacy/OPTIMIZED_24_REGIONS_240_VCPUS.md
diff --git a/docs/operations/status-reports/OPTIMIZED_24_REGIONS_NO_WESTEUROPE.md b/docs/archive/status-reports/operations-legacy/OPTIMIZED_24_REGIONS_NO_WESTEUROPE.md
similarity index 100%
rename from docs/operations/status-reports/OPTIMIZED_24_REGIONS_NO_WESTEUROPE.md
rename to docs/archive/status-reports/operations-legacy/OPTIMIZED_24_REGIONS_NO_WESTEUROPE.md
diff --git a/docs/operations/status-reports/OPTIMIZED_MAX_VALIDATORS.md b/docs/archive/status-reports/operations-legacy/OPTIMIZED_MAX_VALIDATORS.md
similarity index 100%
rename from docs/operations/status-reports/OPTIMIZED_MAX_VALIDATORS.md
rename to docs/archive/status-reports/operations-legacy/OPTIMIZED_MAX_VALIDATORS.md
diff --git a/docs/operations/status-reports/PARALLEL_DEPLOYMENT_COMPARISON.md b/docs/archive/status-reports/operations-legacy/PARALLEL_DEPLOYMENT_COMPARISON.md
similarity index 100%
rename from docs/operations/status-reports/PARALLEL_DEPLOYMENT_COMPARISON.md
rename to docs/archive/status-reports/operations-legacy/PARALLEL_DEPLOYMENT_COMPARISON.md
diff --git a/docs/operations/status-reports/PARALLEL_DEPLOYMENT_STRATEGY.md b/docs/archive/status-reports/operations-legacy/PARALLEL_DEPLOYMENT_STRATEGY.md
similarity index 100%
rename from docs/operations/status-reports/PARALLEL_DEPLOYMENT_STRATEGY.md
rename to docs/archive/status-reports/operations-legacy/PARALLEL_DEPLOYMENT_STRATEGY.md
diff --git a/docs/operations/status-reports/PARALLEL_EXECUTION_COMPLETE.md b/docs/archive/status-reports/operations-legacy/PARALLEL_EXECUTION_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/PARALLEL_EXECUTION_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/PARALLEL_EXECUTION_COMPLETE.md
diff --git a/docs/operations/status-reports/PARALLEL_EXECUTION_REPORT.md b/docs/archive/status-reports/operations-legacy/PARALLEL_EXECUTION_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/PARALLEL_EXECUTION_REPORT.md
rename to docs/archive/status-reports/operations-legacy/PARALLEL_EXECUTION_REPORT.md
diff --git a/docs/operations/status-reports/PROJECT_CLEANUP_LOG.md b/docs/archive/status-reports/operations-legacy/PROJECT_CLEANUP_LOG.md
similarity index 100%
rename from docs/operations/status-reports/PROJECT_CLEANUP_LOG.md
rename to docs/archive/status-reports/operations-legacy/PROJECT_CLEANUP_LOG.md
diff --git a/docs/operations/status-reports/PROJECT_REVIEW.md b/docs/archive/status-reports/operations-legacy/PROJECT_REVIEW.md
similarity index 100%
rename from docs/operations/status-reports/PROJECT_REVIEW.md
rename to docs/archive/status-reports/operations-legacy/PROJECT_REVIEW.md
diff --git a/docs/operations/status-reports/PROJECT_REVIEW_AND_CLEANUP.md b/docs/archive/status-reports/operations-legacy/PROJECT_REVIEW_AND_CLEANUP.md
similarity index 100%
rename from docs/operations/status-reports/PROJECT_REVIEW_AND_CLEANUP.md
rename to docs/archive/status-reports/operations-legacy/PROJECT_REVIEW_AND_CLEANUP.md
diff --git a/docs/operations/status-reports/PROJECT_UPDATE_SUMMARY.md b/docs/archive/status-reports/operations-legacy/PROJECT_UPDATE_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/PROJECT_UPDATE_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/PROJECT_UPDATE_SUMMARY.md
diff --git a/docs/operations/status-reports/QUOTA_ANALYSIS_COMPLETE.md b/docs/archive/status-reports/operations-legacy/QUOTA_ANALYSIS_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/QUOTA_ANALYSIS_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/QUOTA_ANALYSIS_COMPLETE.md
diff --git a/docs/archive/status-reports/operations-legacy/README.md b/docs/archive/status-reports/operations-legacy/README.md
new file mode 100644
index 0000000..f880041
--- /dev/null
+++ b/docs/archive/status-reports/operations-legacy/README.md
@@ -0,0 +1,9 @@
+# Operations Legacy Reports
+
+**Archived**: 2026-04-12  
+**Original Location**: `docs/operations/status-reports/`  
+**Reason for Archiving**: Large historical report pile superseded by active
+runbooks, deployment status docs, and reference indexes.
+
+This directory preserves the former contents of
+`docs/operations/status-reports/` for historical lookup.
diff --git a/docs/operations/status-reports/REAL_TIME_COST_ESTIMATES.md b/docs/archive/status-reports/operations-legacy/REAL_TIME_COST_ESTIMATES.md
similarity index 100%
rename from docs/operations/status-reports/REAL_TIME_COST_ESTIMATES.md
rename to docs/archive/status-reports/operations-legacy/REAL_TIME_COST_ESTIMATES.md
diff --git a/docs/operations/status-reports/RECOMMENDATIONS.md b/docs/archive/status-reports/operations-legacy/RECOMMENDATIONS.md
similarity index 100%
rename from docs/operations/status-reports/RECOMMENDATIONS.md
rename to docs/archive/status-reports/operations-legacy/RECOMMENDATIONS.md
diff --git a/docs/operations/status-reports/RECOMMENDATIONS_AND_SUGGESTIONS.md b/docs/archive/status-reports/operations-legacy/RECOMMENDATIONS_AND_SUGGESTIONS.md
similarity index 100%
rename from docs/operations/status-reports/RECOMMENDATIONS_AND_SUGGESTIONS.md
rename to docs/archive/status-reports/operations-legacy/RECOMMENDATIONS_AND_SUGGESTIONS.md
diff --git a/docs/operations/status-reports/RECOMMENDATIONS_QUICK_FIXES.md b/docs/archive/status-reports/operations-legacy/RECOMMENDATIONS_QUICK_FIXES.md
similarity index 100%
rename from docs/operations/status-reports/RECOMMENDATIONS_QUICK_FIXES.md
rename to docs/archive/status-reports/operations-legacy/RECOMMENDATIONS_QUICK_FIXES.md
diff --git a/docs/operations/status-reports/REVIEW_AND_RECOMMENDATIONS.md b/docs/archive/status-reports/operations-legacy/REVIEW_AND_RECOMMENDATIONS.md
similarity index 100%
rename from docs/operations/status-reports/REVIEW_AND_RECOMMENDATIONS.md
rename to docs/archive/status-reports/operations-legacy/REVIEW_AND_RECOMMENDATIONS.md
diff --git a/docs/operations/status-reports/REVIEW_HPA.md b/docs/archive/status-reports/operations-legacy/REVIEW_HPA.md
similarity index 100%
rename from docs/operations/status-reports/REVIEW_HPA.md
rename to docs/archive/status-reports/operations-legacy/REVIEW_HPA.md
diff --git a/docs/operations/status-reports/REVIEW_NETWORK_POLICIES.md b/docs/archive/status-reports/operations-legacy/REVIEW_NETWORK_POLICIES.md
similarity index 100%
rename from docs/operations/status-reports/REVIEW_NETWORK_POLICIES.md
rename to docs/archive/status-reports/operations-legacy/REVIEW_NETWORK_POLICIES.md
diff --git a/docs/operations/status-reports/REVIEW_RBAC.md b/docs/archive/status-reports/operations-legacy/REVIEW_RBAC.md
similarity index 100%
rename from docs/operations/status-reports/REVIEW_RBAC.md
rename to docs/archive/status-reports/operations-legacy/REVIEW_RBAC.md
diff --git a/docs/operations/status-reports/REVIEW_SUMMARY.md b/docs/archive/status-reports/operations-legacy/REVIEW_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/REVIEW_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/REVIEW_SUMMARY.md
diff --git a/docs/operations/status-reports/RPC_SLO.md b/docs/archive/status-reports/operations-legacy/RPC_SLO.md
similarity index 100%
rename from docs/operations/status-reports/RPC_SLO.md
rename to docs/archive/status-reports/operations-legacy/RPC_SLO.md
diff --git a/docs/operations/status-reports/SCRIPTS_ADOPTION_PLAN.md b/docs/archive/status-reports/operations-legacy/SCRIPTS_ADOPTION_PLAN.md
similarity index 100%
rename from docs/operations/status-reports/SCRIPTS_ADOPTION_PLAN.md
rename to docs/archive/status-reports/operations-legacy/SCRIPTS_ADOPTION_PLAN.md
diff --git a/docs/operations/status-reports/SCRIPTS_INDEX.md b/docs/archive/status-reports/operations-legacy/SCRIPTS_INDEX.md
similarity index 100%
rename from docs/operations/status-reports/SCRIPTS_INDEX.md
rename to docs/archive/status-reports/operations-legacy/SCRIPTS_INDEX.md
diff --git a/docs/operations/status-reports/SCRIPTS_INVENTORY.md b/docs/archive/status-reports/operations-legacy/SCRIPTS_INVENTORY.md
similarity index 100%
rename from docs/operations/status-reports/SCRIPTS_INVENTORY.md
rename to docs/archive/status-reports/operations-legacy/SCRIPTS_INVENTORY.md
diff --git a/docs/operations/status-reports/SCRIPTS_QA_REPORT.md b/docs/archive/status-reports/operations-legacy/SCRIPTS_QA_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/SCRIPTS_QA_REPORT.md
rename to docs/archive/status-reports/operations-legacy/SCRIPTS_QA_REPORT.md
diff --git a/docs/operations/status-reports/TASK_COMPLETION_REPORT.md b/docs/archive/status-reports/operations-legacy/TASK_COMPLETION_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/TASK_COMPLETION_REPORT.md
rename to docs/archive/status-reports/operations-legacy/TASK_COMPLETION_REPORT.md
diff --git a/docs/operations/status-reports/TERRAFORM_STATUS.md b/docs/archive/status-reports/operations-legacy/TERRAFORM_STATUS.md
similarity index 100%
rename from docs/operations/status-reports/TERRAFORM_STATUS.md
rename to docs/archive/status-reports/operations-legacy/TERRAFORM_STATUS.md
diff --git a/docs/operations/status-reports/THE_FIX.md b/docs/archive/status-reports/operations-legacy/THE_FIX.md
similarity index 100%
rename from docs/operations/status-reports/THE_FIX.md
rename to docs/archive/status-reports/operations-legacy/THE_FIX.md
diff --git a/docs/operations/status-reports/TODO_COMPLETE_SUMMARY.md b/docs/archive/status-reports/operations-legacy/TODO_COMPLETE_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/TODO_COMPLETE_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/TODO_COMPLETE_SUMMARY.md
diff --git a/docs/operations/status-reports/TODO_COMPLETION_SUMMARY.md b/docs/archive/status-reports/operations-legacy/TODO_COMPLETION_SUMMARY.md
similarity index 100%
rename from docs/operations/status-reports/TODO_COMPLETION_SUMMARY.md
rename to docs/archive/status-reports/operations-legacy/TODO_COMPLETION_SUMMARY.md
diff --git a/docs/operations/status-reports/TODO_STATUS_REPORT.md b/docs/archive/status-reports/operations-legacy/TODO_STATUS_REPORT.md
similarity index 100%
rename from docs/operations/status-reports/TODO_STATUS_REPORT.md
rename to docs/archive/status-reports/operations-legacy/TODO_STATUS_REPORT.md
diff --git a/docs/operations/status-reports/UPDATE_COMPLETE.md b/docs/archive/status-reports/operations-legacy/UPDATE_COMPLETE.md
similarity index 100%
rename from docs/operations/status-reports/UPDATE_COMPLETE.md
rename to docs/archive/status-reports/operations-legacy/UPDATE_COMPLETE.md
diff --git a/docs/operations/status-reports/UPDATE_STATUS.txt b/docs/archive/status-reports/operations-legacy/UPDATE_STATUS.txt
similarity index 100%
rename from docs/operations/status-reports/UPDATE_STATUS.txt
rename to docs/archive/status-reports/operations-legacy/UPDATE_STATUS.txt
diff --git a/docs/operations/status-reports/WALLET_REQUIREMENTS.md b/docs/archive/status-reports/operations-legacy/WALLET_REQUIREMENTS.md
similarity index 100%
rename from docs/operations/status-reports/WALLET_REQUIREMENTS.md
rename to docs/archive/status-reports/operations-legacy/WALLET_REQUIREMENTS.md
diff --git a/docs/operations/status-reports/d-bis.org.txt b/docs/archive/status-reports/operations-legacy/d-bis.org.txt
similarity index 100%
rename from docs/operations/status-reports/d-bis.org.txt
rename to docs/archive/status-reports/operations-legacy/d-bis.org.txt
diff --git a/docs/operations/status-reports/preserve_list.txt b/docs/archive/status-reports/operations-legacy/preserve_list.txt
similarity index 100%
rename from docs/operations/status-reports/preserve_list.txt
rename to docs/archive/status-reports/operations-legacy/preserve_list.txt
diff --git a/ALL_TASKS_COMPLETE.md b/docs/archive/status-reports/repo-root-legacy/ALL_TASKS_COMPLETE.md
similarity index 100%
rename from ALL_TASKS_COMPLETE.md
rename to docs/archive/status-reports/repo-root-legacy/ALL_TASKS_COMPLETE.md
diff --git a/ALL_TODOS_COMPLETE.md b/docs/archive/status-reports/repo-root-legacy/ALL_TODOS_COMPLETE.md
similarity index 100%
rename from ALL_TODOS_COMPLETE.md
rename to docs/archive/status-reports/repo-root-legacy/ALL_TODOS_COMPLETE.md
diff --git a/COMPLETE_MULTI_CHAIN_DEPLOYMENT.md b/docs/archive/status-reports/repo-root-legacy/COMPLETE_MULTI_CHAIN_DEPLOYMENT.md
similarity index 100%
rename from COMPLETE_MULTI_CHAIN_DEPLOYMENT.md
rename to docs/archive/status-reports/repo-root-legacy/COMPLETE_MULTI_CHAIN_DEPLOYMENT.md
diff --git a/FINAL_DEPLOYMENT_STATUS.md b/docs/archive/status-reports/repo-root-legacy/FINAL_DEPLOYMENT_STATUS.md
similarity index 100%
rename from FINAL_DEPLOYMENT_STATUS.md
rename to docs/archive/status-reports/repo-root-legacy/FINAL_DEPLOYMENT_STATUS.md
diff --git a/FINAL_STATUS.md b/docs/archive/status-reports/repo-root-legacy/FINAL_STATUS.md
similarity index 100%
rename from FINAL_STATUS.md
rename to docs/archive/status-reports/repo-root-legacy/FINAL_STATUS.md
diff --git a/IMPLEMENTATION_REPORT.md b/docs/archive/status-reports/repo-root-legacy/IMPLEMENTATION_REPORT.md
similarity index 100%
rename from IMPLEMENTATION_REPORT.md
rename to docs/archive/status-reports/repo-root-legacy/IMPLEMENTATION_REPORT.md
diff --git a/MULTI_CHAIN_DEPLOYMENT_COMPLETE.md b/docs/archive/status-reports/repo-root-legacy/MULTI_CHAIN_DEPLOYMENT_COMPLETE.md
similarity index 100%
rename from MULTI_CHAIN_DEPLOYMENT_COMPLETE.md
rename to docs/archive/status-reports/repo-root-legacy/MULTI_CHAIN_DEPLOYMENT_COMPLETE.md
diff --git a/MULTI_CHAIN_INTEGRATION_STATUS.md b/docs/archive/status-reports/repo-root-legacy/MULTI_CHAIN_INTEGRATION_STATUS.md
similarity index 100%
rename from MULTI_CHAIN_INTEGRATION_STATUS.md
rename to docs/archive/status-reports/repo-root-legacy/MULTI_CHAIN_INTEGRATION_STATUS.md
diff --git a/docs/archive/status-reports/repo-root-legacy/README.md b/docs/archive/status-reports/repo-root-legacy/README.md
new file mode 100644
index 0000000..f4aa155
--- /dev/null
+++ b/docs/archive/status-reports/repo-root-legacy/README.md
@@ -0,0 +1,8 @@
+# Repo Root Legacy Reports
+
+**Archived**: 2026-04-12  
+**Original Location**: repository root  
+**Reason for Archiving**: Historical completion/status reports were removed from
+the repository root so the root reflects active project artifacts more clearly.
+
+These files are preserved here for historical reference.
diff --git a/README_COMPLETE.md b/docs/archive/status-reports/repo-root-legacy/README_COMPLETE.md
similarity index 100%
rename from README_COMPLETE.md
rename to docs/archive/status-reports/repo-root-legacy/README_COMPLETE.md
diff --git a/TESTING_SUMMARY.md b/docs/archive/status-reports/repo-root-legacy/TESTING_SUMMARY.md
similarity index 100%
rename from TESTING_SUMMARY.md
rename to docs/archive/status-reports/repo-root-legacy/TESTING_SUMMARY.md
diff --git a/TODOS_COMPLETION_SUMMARY.md b/docs/archive/status-reports/repo-root-legacy/TODOS_COMPLETION_SUMMARY.md
similarity index 100%
rename from TODOS_COMPLETION_SUMMARY.md
rename to docs/archive/status-reports/repo-root-legacy/TODOS_COMPLETION_SUMMARY.md
diff --git a/UNIVERSAL_BRIDGE_IMPLEMENTATION_COMPLETE.md b/docs/archive/status-reports/repo-root-legacy/UNIVERSAL_BRIDGE_IMPLEMENTATION_COMPLETE.md
similarity index 100%
rename from UNIVERSAL_BRIDGE_IMPLEMENTATION_COMPLETE.md
rename to docs/archive/status-reports/repo-root-legacy/UNIVERSAL_BRIDGE_IMPLEMENTATION_COMPLETE.md
diff --git a/docs/azure/GEO-AWARE-COMMITTEE-CONFIG.md b/docs/azure/GEO-AWARE-COMMITTEE-CONFIG.md
index d154c08..c58b184 100644
--- a/docs/azure/GEO-AWARE-COMMITTEE-CONFIG.md
+++ b/docs/azure/GEO-AWARE-COMMITTEE-CONFIG.md
@@ -122,7 +122,7 @@ This document defines the geo-aware validator committee configuration for the 36
 
 ## 📊 Committee Configuration
 
-### QBFT/IBFT2 Settings
+### QBFT Settings
 
 **Block Time:** 2-4 seconds
 - Optimized for low-latency rings (2s for Europe/Asia primary)
@@ -138,12 +138,12 @@ This document defines the geo-aware validator committee configuration for the 36
 - Backup validators: Active in 20% of rounds (rotating)
 - Ensures all validators participate while maintaining low latency
 
-### Consensus Algorithm: IBFT 2.0
+### Consensus Algorithm: QBFT
 
 **Configuration:**
 ```yaml
 consensus:
-  algorithm: IBFT2
+  algorithm: QBFT
   block_period: 2  # 2 seconds for primary regions
   epoch_length: 30000
   request_timeout: 10
@@ -360,7 +360,6 @@ validators:
 
 ## 📚 References
 
-- [Hyperledger Besu IBFT 2.0](https://besu.hyperledger.org/en/stable/HowTo/Configure/Consensus-Protocols/IBFT/)
-- [36-Region Blueprint](./36-REGION-BLUEPRINT.md)
-- [Deployment Checklist](./DEPLOYMENT_CHECKLIST.md)
-
+- [Hyperledger Besu QBFT](https://besu.hyperledger.org/private-networks/how-to/configure/consensus/qbft)
+- [36-Region Blueprint](../deployment/36-REGION-BLUEPRINT.md)
+- [Deployment Checklist](../deployment/DEPLOYMENT_CHECKLIST.md)
diff --git a/docs/azure/KUBERNETES-36REGION-MAPPING.md b/docs/azure/KUBERNETES-36REGION-MAPPING.md
index 654f5ee..9f0adc7 100644
--- a/docs/azure/KUBERNETES-36REGION-MAPPING.md
+++ b/docs/azure/KUBERNETES-36REGION-MAPPING.md
@@ -234,7 +234,7 @@ cluster_config:
 2. Deploy Besu sentries (3 pods per region)
 3. Deploy Besu RPC nodes (3 pods per region)
 4. Configure geo-aware validator selection
-5. Initialize IBFT 2.0 consensus
+5. Initialize QBFT consensus
 
 ### Phase 3: Application Stack Deployment
 
@@ -280,7 +280,6 @@ cluster_config:
 
 ## 📚 References
 
-- [36-Region Blueprint](./36-REGION-BLUEPRINT.md)
 - [Geo-Aware Committee Configuration](./GEO-AWARE-COMMITTEE-CONFIG.md)
-- [Deployment Checklist](./DEPLOYMENT_CHECKLIST.md)
-
+- [36-Region Blueprint](../deployment/36-REGION-BLUEPRINT.md)
+- [Deployment Checklist](../deployment/DEPLOYMENT_CHECKLIST.md)
diff --git a/docs/azure/MULTI_REGION_VALIDATOR_DEPLOYMENT.md b/docs/azure/MULTI_REGION_VALIDATOR_DEPLOYMENT.md
index 34a2747..3d37ab2 100644
--- a/docs/azure/MULTI_REGION_VALIDATOR_DEPLOYMENT.md
+++ b/docs/azure/MULTI_REGION_VALIDATOR_DEPLOYMENT.md
@@ -73,7 +73,7 @@ kubectl apply -f k8s/besu/validator-deployment.yaml
 - Configure network security groups to allow P2P (port 30303)
 
 ### Consensus
-- IBFT 2.0 consensus
+- QBFT consensus
 - 5 validators = 3 minimum for consensus (tolerant of 2 failures)
 - Block time: ~2 seconds
 
diff --git a/docs/azure/QUOTA_ISSUE_RESOLUTION.md b/docs/azure/QUOTA_ISSUE_RESOLUTION.md
index 2bb43b0..b61ef18 100644
--- a/docs/azure/QUOTA_ISSUE_RESOLUTION.md
+++ b/docs/azure/QUOTA_ISSUE_RESOLUTION.md
@@ -58,6 +58,6 @@ terraform apply tfplan
 ## Production Considerations
 - Current configuration is for testing/development only
 - Production requires:
-  - Minimum 4 validators for IBFT 2.0 fault tolerance
+  - Minimum 4 validators for QBFT fault tolerance
   - Larger VM sizes for performance
   - Multiple regions for redundancy
diff --git a/docs/bridge/ETHERLINK_RELAY_RUNBOOK.md b/docs/bridge/ETHERLINK_RELAY_RUNBOOK.md
index 2bf640b..cc3802a 100644
--- a/docs/bridge/ETHERLINK_RELAY_RUNBOOK.md
+++ b/docs/bridge/ETHERLINK_RELAY_RUNBOOK.md
@@ -4,8 +4,8 @@ Runbook for bridging to **Etherlink** (chain 42793) when CCIP does not support E
 
 ## Branch: CCIP vs Custom Relay
 
-- **If CCIP supports Etherlink**: Use official CCIP lane. Deploy receiver bridges on Etherlink per [DeployWETHBridges.s.sol](script/deploy/bridge/DeployWETHBridges.s.sol) and [execute-bridge-config.sh](scripts/deployment/execute-bridge-config.sh). Configure addDestination on source (138, 651940 if ever CCIP) with Etherlink chain selector and receiver addresses. Fund LINK. No custom relay needed.
-- **If CCIP does not support Etherlink**: Use **custom relay** (this runbook). Same pattern as 138→Mainnet in [relay ARCHITECTURE](relay/ARCHITECTURE.md).
+- **If CCIP supports Etherlink**: Use official CCIP lane. Deploy receiver bridges on Etherlink per [DeployWETHBridges.s.sol](../../script/deploy/bridge/DeployWETHBridges.s.sol) and [execute-bridge-config.sh](../../scripts/deployment/execute-bridge-config.sh). Configure addDestination on source (138, 651940 if ever CCIP) with Etherlink chain selector and receiver addresses. Fund LINK. No custom relay needed.
+- **If CCIP does not support Etherlink**: Use **custom relay** (this runbook). Same pattern as 138→Mainnet in [relay ARCHITECTURE](../relay/ARCHITECTURE.md).
 
 ## Custom Relay Path (when CCIP not available)
 
@@ -41,5 +41,5 @@ Runbook for bridging to **Etherlink** (chain 42793) when CCIP does not support E
 
 ## References
 
-- [relay ARCHITECTURE](relay/ARCHITECTURE.md) (138→Mainnet pattern).
-- [TEZOS_CCIP_DON_PREREQUISITES](../../docs/07-ccip/TEZOS_CCIP_DON_PREREQUISITES.md): verify CCIP first; if not listed, use this runbook.
+- [relay ARCHITECTURE](../relay/ARCHITECTURE.md) (138→Mainnet pattern).
+- [TEZOS_CCIP_DON_PREREQUISITES](../../../docs/07-ccip/TEZOS_CCIP_DON_PREREQUISITES.md): verify CCIP first; if not listed, use this runbook.
diff --git a/docs/bridge/TEZOS_ADAPTER_PRODUCTION_CHECKLIST.md b/docs/bridge/TEZOS_ADAPTER_PRODUCTION_CHECKLIST.md
index 4f5c08f..92f4835 100644
--- a/docs/bridge/TEZOS_ADAPTER_PRODUCTION_CHECKLIST.md
+++ b/docs/bridge/TEZOS_ADAPTER_PRODUCTION_CHECKLIST.md
@@ -4,13 +4,13 @@ Production readiness for Tezos L1 bridging via TezosAdapter and BridgeRegistry/C
 
 ## Contracts
 
-- **TezosAdapter**: Deployed via [DeployAllAdapters.s.sol](script/deploy/chains/DeployAllAdapters.s.sol). No new Tezos L1 EVM contracts required.
-- **BridgeRegistry**: Tezos-Mainnet registered with chainId **1** (non-EVM) in [InitializeRegistry.s.sol](scripts/bridge/interop/InitializeRegistry.s.sol). Ensure registry is initialized (run script or call registerDestination(1, "Tezos-Mainnet", ...)).
+- **TezosAdapter**: Deployed via [DeployAllAdapters.s.sol](../../script/deploy/chains/DeployAllAdapters.s.sol). No new Tezos L1 EVM contracts required.
+- **BridgeRegistry**: Tezos-Mainnet registered with chainId **1** (non-EVM) in [InitializeRegistry.s.sol](../../scripts/bridge/interop/InitializeRegistry.s.sol). Ensure registry is initialized (run script or call registerDestination(1, "Tezos-Mainnet", ...)).
 - **ChainRegistry**: Tezos-Mainnet registered via DeployAllAdapters as `registerNonEVMChain("Tezos-Mainnet", ChainType.Other, tezosAdapter, "https://tzkt.io", ...)`.
 
 ## Token config
 
-- For tokens that may bridge to Tezos L1, include **1** in allowedDestinations when registering with BridgeRegistry or integration contracts (VaultBridgeIntegration, eMoneyBridgeIntegration, WTokenBridgeIntegration). BRG scripts: see [register-vault-deposit-tokens.sh](scripts/bridge/register-vault-deposit-tokens.sh), [register-iso-deposit-tokens.sh](scripts/bridge/register-iso-deposit-tokens.sh) (comments reference 42793 and 1).
+- For tokens that may bridge to Tezos L1, include **1** in allowedDestinations when registering with BridgeRegistry or integration contracts (VaultBridgeIntegration, eMoneyBridgeIntegration, WTokenBridgeIntegration). BRG scripts: see [register-vault-deposit-tokens.sh](../../scripts/bridge/register-vault-deposit-tokens.sh), [register-iso-deposit-tokens.sh](../../scripts/bridge/register-iso-deposit-tokens.sh) (comments reference 42793 and 1).
 
 ## Relay
 
@@ -18,5 +18,5 @@ Production readiness for Tezos L1 bridging via TezosAdapter and BridgeRegistry/C
 
 ## References
 
-- [TEZOS_BRIDGE_DEPLOYMENT](../../docs/03-deployment/TEZOS_BRIDGE_DEPLOYMENT.md)
+- [TEZOS_BRIDGE_DEPLOYMENT](../../../docs/03-deployment/TEZOS_BRIDGE_DEPLOYMENT.md)
 - [TEZOS_L1_RELAY_RUNBOOK](TEZOS_L1_RELAY_RUNBOOK.md)
diff --git a/docs/bridge/TEZOS_E2E_RUNBOOK.md b/docs/bridge/TEZOS_E2E_RUNBOOK.md
index 4f44070..525f27b 100644
--- a/docs/bridge/TEZOS_E2E_RUNBOOK.md
+++ b/docs/bridge/TEZOS_E2E_RUNBOOK.md
@@ -4,8 +4,8 @@ End-to-end flow for Tezos L1 bridging: deploy TezosAdapter and relay, run E2E on
 
 ## Prerequisites
 
-- TezosAdapter deployed via [DeployAllAdapters.s.sol](script/deploy/chains/DeployAllAdapters.s.sol).
-- BridgeRegistry destination chainId 1 (Tezos-Mainnet) registered via [InitializeRegistry.s.sol](scripts/bridge/interop/InitializeRegistry.s.sol).
+- TezosAdapter deployed via [DeployAllAdapters.s.sol](../../script/deploy/chains/DeployAllAdapters.s.sol).
+- BridgeRegistry destination chainId 1 (Tezos-Mainnet) registered via [InitializeRegistry.s.sol](../../scripts/bridge/interop/InitializeRegistry.s.sol).
 - ChainRegistry: Tezos-Mainnet registered (ChainType.Other).
 - Relay service: event monitor + Tezos-side mint/transfer + confirmTransaction (see [TEZOS_L1_RELAY_RUNBOOK](TEZOS_L1_RELAY_RUNBOOK.md)).
 
diff --git a/docs/bridge/TEZOS_TOKEN_LIST_EXTENSION.md b/docs/bridge/TEZOS_TOKEN_LIST_EXTENSION.md
index 329c19a..04e07f3 100644
--- a/docs/bridge/TEZOS_TOKEN_LIST_EXTENSION.md
+++ b/docs/bridge/TEZOS_TOKEN_LIST_EXTENSION.md
@@ -9,7 +9,7 @@ How to add Etherlink (42793) and Tezos L1 to token list and UniversalAssetRegist
 
 ## Token list schema (Uniswap-style)
 
-- **Etherlink (42793)**: Add a token list or extend existing list with tokens that have `chainId: 42793`. Same structure as other chains: chainId, address, name, symbol, decimals. File location: follow project [TOKEN_LIST_AUTHORING_GUIDE](docs/11-references/TOKEN_LIST_AUTHORING_GUIDE.md) and [ADDING_NEW_ASSET_TYPE](guides/ADDING_NEW_ASSET_TYPE.md) and token-lists layout; add or reference a list that includes 42793.
+- **Etherlink (42793)**: Add a token list or extend existing list with tokens that have `chainId: 42793`. Same structure as other chains: chainId, address, name, symbol, decimals. File location: follow project [TASK5_TOKEN_LIST_HOSTING](../deployment/TASK5_TOKEN_LIST_HOSTING.md) and [ADDING_NEW_ASSET_TYPE](../guides/ADDING_NEW_ASSET_TYPE.md) and token-lists layout; add or reference a list that includes 42793.
 - **Tezos L1**: Uniswap token list is EVM-only (chainId + address). For Tezos-origin or wrapped-on-Tezos assets, document in registry/metadata; BridgeRegistry destination 1 does not require a token list entry for Tezos-native assets. For EVM-side wrapped representations of Tezos assets (if any), use the chainId of the EVM chain where the wrapped token lives.
 
 ## UniversalAssetRegistry
diff --git a/docs/bridge/trustless/DEPLOYMENT_INSTRUCTIONS.md b/docs/bridge/trustless/DEPLOYMENT_INSTRUCTIONS.md
index 93b1807..010fcf4 100644
--- a/docs/bridge/trustless/DEPLOYMENT_INSTRUCTIONS.md
+++ b/docs/bridge/trustless/DEPLOYMENT_INSTRUCTIONS.md
@@ -173,8 +173,8 @@ Use this to track your progress:
 # Check current status
 ./scripts/deployment/check-env-requirements.sh
 
-# View deployment status
-cat docs/bridge/trustless/DEPLOYMENT_STATUS.md
+# Review current deployment docs
+cat docs/bridge/trustless/README.md
 ```
 
 ## 🎯 Next Steps After Deployment
@@ -216,4 +216,3 @@ If you encounter issues:
 ---
 
 **Ready to deploy?** Run: `./scripts/deployment/start-deployment.sh`
-
diff --git a/docs/bridge/trustless/ENHANCED_SWAP_ROUTER_UPGRADE.md b/docs/bridge/trustless/ENHANCED_SWAP_ROUTER_UPGRADE.md
index 19a7205..742623e 100644
--- a/docs/bridge/trustless/ENHANCED_SWAP_ROUTER_UPGRADE.md
+++ b/docs/bridge/trustless/ENHANCED_SWAP_ROUTER_UPGRADE.md
@@ -126,7 +126,7 @@ To actually use EnhancedSwapRouter for the trustless payout flow you would need
 | 5 | (Optional) Grant `COORDINATOR_ROLE` on EnhancedSwapRouter to BridgeSwapCoordinator for future use. |
 | 6 | (Optional) Adjust routing via `setRoutingConfig` if needed. |
 
-**References:** `DEPLOYMENT_GUIDE.md`, `DEPLOYMENT_SUMMARY.md`, `script/bridge/trustless/DeployEnhancedSwapRouter.s.sol`, `scripts/deployment/phase3-deploy-router.sh`.
+**References:** `README.md`, `DEPLOYMENT_GUIDE.md`, `script/bridge/trustless/DeployEnhancedSwapRouter.s.sol`, `scripts/deployment/phase3-deploy-router.sh`.
 
 ---
 
diff --git a/docs/bridge/trustless/README.md b/docs/bridge/trustless/README.md
new file mode 100644
index 0000000..eaa91d9
--- /dev/null
+++ b/docs/bridge/trustless/README.md
@@ -0,0 +1,46 @@
+# Trustless Bridge Docs
+
+**Last Reviewed**: 2026-04-13  
+**Status**: Active
+
+This directory contains the active design, security, deployment, and operating documentation for the trustless bridge stack.
+
+## Start Here
+
+- [ARCHITECTURE.md](ARCHITECTURE.md) - System design and component layout
+- [SECURITY.md](SECURITY.md) - Security model, controls, and assumptions
+- [INTEGRATION.md](INTEGRATION.md) - Integration behavior and surrounding systems
+- [DEPLOYMENT_GUIDE.md](DEPLOYMENT_GUIDE.md) - Primary deployment guide
+- [DEPLOYMENT_CHECKLIST.md](DEPLOYMENT_CHECKLIST.md) - Deployment execution checklist
+- [OPERATIONS_GUIDE.md](OPERATIONS_GUIDE.md) - Operating procedures and maintenance
+
+## Topic Guides
+
+- [ACCESS_CONTROL.md](ACCESS_CONTROL.md)
+- [FRAUD_PROOFS.md](FRAUD_PROOFS.md)
+- [FORMAL_VERIFICATION.md](FORMAL_VERIFICATION.md)
+- [MULTISIG_OPERATIONS.md](MULTISIG_OPERATIONS.md)
+- [BOND_SIZING.md](BOND_SIZING.md)
+- [CHALLENGE_WINDOW.md](CHALLENGE_WINDOW.md)
+- [LIQUIDITY_POOL_ECONOMICS.md](LIQUIDITY_POOL_ECONOMICS.md)
+- [RATE_LIMITING.md](RATE_LIMITING.md)
+- [RELAYER_FEES.md](RELAYER_FEES.md)
+- [MULTI_ASSET.md](MULTI_ASSET.md)
+- [DEX_INTEGRATION.md](DEX_INTEGRATION.md)
+- [CCIP_AND_SWAP_BRIDGE_COORDINATOR.md](CCIP_AND_SWAP_BRIDGE_COORDINATOR.md)
+
+## Deployment Support
+
+- [DEPLOYMENT_INSTRUCTIONS.md](DEPLOYMENT_INSTRUCTIONS.md)
+- [DEPLOYMENT_AUTOMATION.md](DEPLOYMENT_AUTOMATION.md)
+- [DEPLOY_CONFIGURE_LIVE_TEST.md](DEPLOY_CONFIGURE_LIVE_TEST.md)
+- [ENV_VARIABLES_REFERENCE.md](ENV_VARIABLES_REFERENCE.md)
+- [ENV_VARIABLES_CHECKLIST.md](ENV_VARIABLES_CHECKLIST.md)
+
+## Historical Milestones
+
+Older “all complete”, “final status”, and milestone-summary files were moved out of the active surface to:
+
+- [docs/archive/bridge-trustless-milestones/README.md](../archive/bridge-trustless-milestones/README.md)
+
+Use the archive when you need historical delivery snapshots, milestone-by-milestone completion notes, or older status narratives.
diff --git a/docs/channels/GAPS_AND_ADDITIONAL_TASKS.md b/docs/channels/GAPS_AND_ADDITIONAL_TASKS.md
index 295ab37..38324e0 100644
--- a/docs/channels/GAPS_AND_ADDITIONAL_TASKS.md
+++ b/docs/channels/GAPS_AND_ADDITIONAL_TASKS.md
@@ -8,10 +8,10 @@ This document lists gaps in the current implementation, additional tasks, and co
 
 | # | Task | Gap / need | Priority |
 |---|------|------------|----------|
-| 1.1 | Add GenericStateChannelManager to frontend config | Deployment doc references `CONTRACT_ADDRESSES.mainnet.GENERIC_STATE_CHANNEL_MANAGER` and chain138; [contracts.ts](../frontend-dapp/src/config/contracts.ts) has no `GENERIC_STATE_CHANNEL_MANAGER`. Add optional addresses for mainnet and chain138. | High |
-| 1.2 | GenericStateChannelManager ABI and UI | No [frontend-dapp/src/abis/GenericStateChannelManager.ts](frontend-dapp/src/abis/) ABI; no UI to open/fund/close state channels (with stateHash). Add ABI and a "State channels" section or tab (open, fund, close with stateHash, list channels). | Medium |
+| 1.1 | Add GenericStateChannelManager to frontend config | Deployment doc references `CONTRACT_ADDRESSES.mainnet.GENERIC_STATE_CHANNEL_MANAGER` and chain138; [contracts.ts](../../frontend-dapp/src/config/contracts.ts) has no `GENERIC_STATE_CHANNEL_MANAGER`. Add optional addresses for mainnet and chain138. | High |
+| 1.2 | GenericStateChannelManager ABI and UI | No [frontend-dapp/src/abis/GenericStateChannelManager.ts](../../frontend-dapp/src/abis/) ABI; no UI to open/fund/close state channels (with stateHash). Add ABI and a "State channels" section or tab (open, fund, close with stateHash, list channels). | Medium |
 | 1.3 | Channels UI: cooperative close and submit close | Current UI has open, fund, finalize close only. No form for cooperative close or submit close (require off-chain signatures → v,r,s). Add optional forms (nonce, balanceA, balanceB, sig inputs) or a short guide + link to sign state off-chain. | Medium |
-| 1.4 | Admin panel and Chain 138 | [AdminPanel](frontend-dapp/src/pages/AdminPanel.tsx) restricts to mainnet (`chainId === 1`). Channels and Channel Admin are unreachable on Chain 138. Either allow Chain 138 in the admin panel or add a separate Channels page that works on both Mainnet and Chain 138. | Medium |
+| 1.4 | Admin panel and Chain 138 | [AdminPanel](../../frontend-dapp/src/pages/AdminPanel.tsx) restricts to mainnet (`chainId === 1`). Channels and Channel Admin are unreachable on Chain 138. Either allow Chain 138 in the admin panel or add a separate Channels page that works on both Mainnet and Chain 138. | Medium |
 
 ---
 
@@ -37,7 +37,7 @@ This document lists gaps in the current implementation, additional tasks, and co
 
 | # | Task | Gap / need | Priority |
 |---|------|------------|----------|
-| 4.1 | E2E tests for GenericStateChannelManager | Only unit tests exist for [GenericStateChannelManager](test/channels/GenericStateChannelManager.t.sol). Add full e2e (e.g. `test/e2e/GenericStateChannelsE2E.t.sol`): cooperative close with stateHash, unilateral close, challenge (newest state wins) with stateHash. | Medium |
+| 4.1 | E2E tests for GenericStateChannelManager | Only unit tests exist for [GenericStateChannelManager](../../test/channels/GenericStateChannelManager.t.sol). Add full e2e (e.g. `test/e2e/GenericStateChannelsE2E.t.sol`): cooperative close with stateHash, unilateral close, challenge (newest state wins) with stateHash. | Medium |
 | 4.2 | Gas report in docs | PRE_DEPLOYMENT suggests gas snapshot. Run `forge test --gas-report` for channel and e2e tests and add results to deployment or PRE_DEPLOYMENT doc (or a GAS_REPORT.md). | Low |
 | 4.3 | Fork / testnet e2e | Document or automate running e2e on Mainnet fork and (if available) Chain-138 testnet to catch chain-specific issues. | Low |
 
@@ -48,7 +48,7 @@ This document lists gaps in the current implementation, additional tasks, and co
 | # | Task | Gap / need | Priority |
 |---|------|------------|----------|
 | 5.1 | Chain-138 verification | [PAYMENT_CHANNELS_DEPLOYMENT.md](../deployment/PAYMENT_CHANNELS_DEPLOYMENT.md) mentions `--verify`; Chain-138 may need a different block explorer and env (e.g. Blockscout, `BLOCKSCOUT_API_KEY`). Document chain-specific verification steps or add to deployment script. | Medium |
-| 5.2 | Incident response runbook | PRE_DEPLOYMENT suggests documenting how to pause, unpause, replace admin (multisig). Add a short runbook (section in PRE_DEPLOYMENT or [docs/operations/](operations/)): when to pause, how to unpause, how to change admin. | Low |
+| 5.2 | Incident response runbook | PRE_DEPLOYMENT suggests documenting how to pause, unpause, replace admin (multisig). Add a short runbook (section in PRE_DEPLOYMENT or [docs/operations/](../operations/)): when to pause, how to unpause, how to change admin. | Low |
 
 ---
 
@@ -57,7 +57,7 @@ This document lists gaps in the current implementation, additional tasks, and co
 | # | Task | Gap / need | Priority |
 |---|------|------------|----------|
 | 6.1 | Virtual channels as future work | Virtual channels (hub, ledger channels, guarantees) are documented as external (Statechannels.org/Nitro). Add a short "Future work" section in [README.md](README.md) or a [FUTURE_WORK.md](FUTURE_WORK.md) that lists virtual channels and links to [State Channels blog](https://blog.statechannels.org/virtual-channels/). | Low |
-| 6.2 | SUPPORTED_CHAINS for Chain 138 | [contracts.ts](frontend-dapp/src/config/contracts.ts) exports `SUPPORTED_CHAINS = { mainnet }`. If the dApp should support Chain 138 for channels, add chain 138 to wagmi chains and to SUPPORTED_CHAINS. | Medium (if targeting Chain 138 in UI) |
+| 6.2 | SUPPORTED_CHAINS for Chain 138 | [contracts.ts](../../frontend-dapp/src/config/contracts.ts) exports `SUPPORTED_CHAINS = { mainnet }`. If the dApp should support Chain 138 for channels, add chain 138 to wagmi chains and to SUPPORTED_CHAINS. | Medium (if targeting Chain 138 in UI) |
 
 ---
 
diff --git a/docs/configuration/AZURE_CLOUDFLARE_ENV_SETUP.md b/docs/configuration/AZURE_CLOUDFLARE_ENV_SETUP.md
index 443d84a..ed793ac 100644
--- a/docs/configuration/AZURE_CLOUDFLARE_ENV_SETUP.md
+++ b/docs/configuration/AZURE_CLOUDFLARE_ENV_SETUP.md
@@ -263,7 +263,6 @@ After setting up your `.env` file:
 
 ## See Also
 
-- [Deployment Guide](DEPLOYMENT.md)
+- [Deployment Guide](../deployment/DEPLOYMENT.md)
 - [Terraform Backend Setup](TERRAFORM_BACKEND_SETUP.md)
-- [Next Steps List](NEXT_STEPS_LIST.md)
-
+- [Next Steps List](../operations/tasks/NEXT_STEPS_LIST.md)
diff --git a/docs/configuration/CONFIGURATION_FIXES_APPLIED.md b/docs/configuration/CONFIGURATION_FIXES_APPLIED.md
index 62e41b3..3705138 100644
--- a/docs/configuration/CONFIGURATION_FIXES_APPLIED.md
+++ b/docs/configuration/CONFIGURATION_FIXES_APPLIED.md
@@ -114,11 +114,11 @@ rpc-http-host-allowlist=["rpc.d-bis.org", "rpc2.d-bis.org"]
 **Issue**: Genesis file has `extraData: "0x"` (no validators configured).
 
 **Fix Applied**:
-- Created script: `scripts/deployment/generate-genesis-with-validators.sh`
-- Script generates validator keys if they don't exist
-- Script attempts to use Besu to generate proper genesis with extraData
+- Kept `scripts/deployment/generate-genesis-with-validators.sh` as a compatibility wrapper
+- Promoted `scripts/generate-genesis-proper.sh` as the canonical generator
+- Canonical flow now generates and validates QBFT genesis data explicitly
 
-**File**: `scripts/deployment/generate-genesis-with-validators.sh`
+**File**: `scripts/generate-genesis-proper.sh`
 
 **Status**: ⚠️ **REQUIRES BESU CLI FOR COMPLETE FIX**
 
@@ -130,7 +130,8 @@ rpc-http-host-allowlist=["rpc.d-bis.org", "rpc2.d-bis.org"]
 
 2. Generate proper genesis:
    ```bash
-   ./scripts/deployment/generate-genesis-with-validators.sh
+   ./scripts/generate-genesis-proper.sh 4
+   ./scripts/validation/validate-genesis.sh
    ```
 
 3. If Besu is not available, manually generate extraData:
@@ -154,7 +155,7 @@ rpc-http-host-allowlist=["rpc.d-bis.org", "rpc2.d-bis.org"]
 | RPC storage size | ✅ Fixed | `k8s/base/rpc/statefulset.yaml` |
 | Terraform backend | ✅ Created | `terraform/backend.tf` |
 | RPC security (CORS/host) | ⚠️ Annotated | `config/rpc/besu-config.toml`, `k8s/base/rpc/statefulset.yaml`, `helm/besu-network/values-rpc.yaml` |
-| Genesis validators | ⚠️ Script created | `scripts/deployment/generate-genesis-with-validators.sh` |
+| Genesis validators | ⚠️ Canonical path defined | `scripts/generate-genesis-proper.sh`, `scripts/validation/validate-genesis.sh` |
 
 ---
 
@@ -172,7 +173,8 @@ Edit `terraform/backend.tf` and configure:
 
 Run the genesis generation script:
 ```bash
-./scripts/deployment/generate-genesis-with-validators.sh
+./scripts/generate-genesis-proper.sh 4
+./scripts/validation/validate-genesis.sh
 ```
 
 If Besu is not installed, install it first:
@@ -219,7 +221,7 @@ Run validation script to verify all fixes:
    - Phase 2: Deploy sentries (3 nodes)
    - Phase 3: Deploy RPC nodes (3 nodes)
 
-2. **Genesis Generation**: Proper IBFT 2.0 extraData encoding requires Besu CLI. The script will attempt automatic generation, but manual steps may be needed.
+2. **Genesis Generation**: Proper QBFT extraData encoding requires Besu CLI. The script will attempt automatic generation, but manual steps may be needed.
 
 3. **Security**: RPC security settings are currently permissive for initial deployment. **MUST** be restricted before production use.
 
@@ -244,4 +246,3 @@ For issues or questions:
 - Review: `docs/DEPLOYMENT_CONFIGURATION_AUDIT.md`
 - Run: `./scripts/deployment/validate-deployment-config.sh`
 - Check: `docs/DEPLOYMENT_COMPLETE_GUIDE.md`
-
diff --git a/docs/configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md b/docs/configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md
index 9080a06..e4834ca 100644
--- a/docs/configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md
+++ b/docs/configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md
@@ -237,6 +237,5 @@ forge test -vvvv
 
 - [Foundry Documentation](https://book.getfoundry.sh/)
 - [Chainlink CCIP Documentation](https://docs.chain.link/ccip)
-- [WETH Deployment Guide](docs/WETH_CCIP_DEPLOYMENT.md)
+- [WETH Deployment Guide](../operations/integrations/WETH_CCIP_DEPLOYMENT.md)
 - [Azure/Cloudflare Environment Setup](AZURE_CLOUDFLARE_ENV_SETUP.md)
-
diff --git a/docs/deployment/36-REGION-BLUEPRINT.md b/docs/deployment/36-REGION-BLUEPRINT.md
index 4cca7cc..a26a0b2 100644
--- a/docs/deployment/36-REGION-BLUEPRINT.md
+++ b/docs/deployment/36-REGION-BLUEPRINT.md
@@ -243,6 +243,5 @@ If **West Europe** should be purely for admin/control plane (no workload nodes):
 ## 📝 References
 
 - [Azure Regions List](https://learn.microsoft.com/en-us/azure/reliability/regions-list)
-- [Cloud for Sovereignty Landing Zone](./CLOUD_SOVEREIGNTY_LANDING_ZONE.md)
+- [Cloud for Sovereignty Landing Zone](./CLOUD_FOR_SOVEREIGNTY_LANDING_ZONE.md)
 - [Deployment Checklist](./DEPLOYMENT_CHECKLIST.md)
-
diff --git a/docs/deployment/ALL_BIDIRECTIONAL_TASKS_COMPLETE.md b/docs/deployment/ALL_BIDIRECTIONAL_TASKS_COMPLETE.md
index 5c7d0d7..f66cdae 100644
--- a/docs/deployment/ALL_BIDIRECTIONAL_TASKS_COMPLETE.md
+++ b/docs/deployment/ALL_BIDIRECTIONAL_TASKS_COMPLETE.md
@@ -1,7 +1,9 @@
 # All Bidirectional Configuration Tasks - Complete
 
 **Date**: 2025-01-18  
-**Status**: ✅ **100% COMPLETE - READY FOR EXECUTION**
+**Status**: Historical bidirectional-configuration snapshot
+
+This document records a delivery milestone for bidirectional bridge configuration. Validate current readiness against live deployment and bridge docs before executing changes.
 
 ---
 
diff --git a/docs/deployment/ALL_MAINNET_VERIFICATION_COMPLETE.md b/docs/deployment/ALL_MAINNET_VERIFICATION_COMPLETE.md
index 9c28a93..372cbc3 100644
--- a/docs/deployment/ALL_MAINNET_VERIFICATION_COMPLETE.md
+++ b/docs/deployment/ALL_MAINNET_VERIFICATION_COMPLETE.md
@@ -149,7 +149,7 @@ Standardized labels for metrics:
 2. ✅ `chains.ts` - ALL_MAINNET config added with verification results
 3. ✅ `LiFiRoutingService` - Support check added
 4. ✅ `generate-all-adapters.sh` - Documentation updated
-5. ✅ `MULTI_CHAIN_DEPLOYMENT_COMPLETE.md` - Status updated
+5. ✅ `../archive/status-reports/repo-root-legacy/MULTI_CHAIN_DEPLOYMENT_COMPLETE.md` - Historical status snapshot updated
 6. ✅ `MULTI_CHAIN_DEPLOYMENT_GUIDE.md` - ALL Mainnet section added
 7. ✅ `ALL_MAINNET_CONFIGURATION.md` - Verification checklist created
 8. ✅ `ALL_MAINNET_ROUTING_LOGIC.md` - Routing strategy documented
diff --git a/docs/deployment/ALL_NEXT_STEPS_COMPLETE.md b/docs/deployment/ALL_NEXT_STEPS_COMPLETE.md
index d47e582..5514f59 100644
--- a/docs/deployment/ALL_NEXT_STEPS_COMPLETE.md
+++ b/docs/deployment/ALL_NEXT_STEPS_COMPLETE.md
@@ -1,7 +1,9 @@
 # All Next Steps Complete - Final Report
 
 **Date**: 2025-12-11
-**Status**: ✅ **ALL COMPLETE**
+**Status**: Historical completion snapshot
+
+This document captures a point-in-time completion report. Treat it as historical reference rather than the current deployment checklist.
 
 ---
 
diff --git a/docs/deployment/ALL_TASKS_COMPLETION_SUMMARY.md b/docs/deployment/ALL_TASKS_COMPLETION_SUMMARY.md
index 3b93373..c18d467 100644
--- a/docs/deployment/ALL_TASKS_COMPLETION_SUMMARY.md
+++ b/docs/deployment/ALL_TASKS_COMPLETION_SUMMARY.md
@@ -1,7 +1,9 @@
 # All Tasks Completion Summary
 
 **Date**: 2025-01-18  
-**Status**: COMPREHENSIVE TASK COMPLETION REPORT
+**Status**: Historical task-summary snapshot
+
+This summary reflects an earlier task-review checkpoint. Use current deployment/runbook docs for active operational work.
 
 ## Executive Summary
 
diff --git a/docs/deployment/ALL_TASKS_FINAL_STATUS.md b/docs/deployment/ALL_TASKS_FINAL_STATUS.md
index 6e553cd..1451c1c 100644
--- a/docs/deployment/ALL_TASKS_FINAL_STATUS.md
+++ b/docs/deployment/ALL_TASKS_FINAL_STATUS.md
@@ -1,5 +1,10 @@
 # All Tasks Final Status Report
 
+**Last Reviewed**: 2026-04-13  
+**Status**: Historical completion snapshot
+
+This document preserves a task-rollup checkpoint from an earlier delivery phase. Use current deployment indexes and runbooks for live operator guidance.
+
 **Date**: 2025-01-18  
 **Status**: ✅ **ALL TASKS COMPLETE OR DOCUMENTED**
 
diff --git a/docs/deployment/BIDIRECTIONAL_CONFIGURATION_EXECUTION_STATUS.md b/docs/deployment/BIDIRECTIONAL_CONFIGURATION_EXECUTION_STATUS.md
index d1d52d2..3d8a599 100644
--- a/docs/deployment/BIDIRECTIONAL_CONFIGURATION_EXECUTION_STATUS.md
+++ b/docs/deployment/BIDIRECTIONAL_CONFIGURATION_EXECUTION_STATUS.md
@@ -2,6 +2,9 @@
 
 **Date**: 2025-01-18  
 **Execution Attempt**: Configuration scripts ready, prerequisites check completed
+**Status**: Historical execution snapshot
+
+This document preserves a prior execution-readiness check. Re-verify credentials, RPC endpoints, and deployment state before using it operationally.
 
 ---
 
diff --git a/docs/deployment/BRIDGE_CONFIGURATION.md b/docs/deployment/BRIDGE_CONFIGURATION.md
index cccbfec..aa0da24 100644
--- a/docs/deployment/BRIDGE_CONFIGURATION.md
+++ b/docs/deployment/BRIDGE_CONFIGURATION.md
@@ -171,9 +171,8 @@ cast send $CCIPWETH9BRIDGE_BSC \
 
 - [CCIP Documentation](https://docs.chain.link/ccip)
 - [Chain Selectors](https://docs.chain.link/ccip/supported-networks)
-- [Bridge Contract Documentation](../contracts/ccip/)
+- [Bridge Contract Documentation](../../contracts/ccip/)
 
 ---
 
 **Last Updated**: 2025-12-11
-
diff --git a/docs/deployment/COMPLETE_IMPLEMENTATION_SUMMARY.md b/docs/deployment/COMPLETE_IMPLEMENTATION_SUMMARY.md
index a1cfe6c..4b8a86c 100644
--- a/docs/deployment/COMPLETE_IMPLEMENTATION_SUMMARY.md
+++ b/docs/deployment/COMPLETE_IMPLEMENTATION_SUMMARY.md
@@ -1,7 +1,9 @@
 # Complete Implementation Summary
 
 **Date**: 2025-01-18  
-**Status**: ✅ **ALL TASKS AND NEXT STEPS COMPLETE**
+**Status**: Historical completion snapshot
+
+This document records an earlier implementation milestone. Use the current deployment indexes and runbooks for live operational guidance.
 
 ## Summary
 
diff --git a/docs/deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md b/docs/deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md
index 6737322..02d96ea 100644
--- a/docs/deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md
+++ b/docs/deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md
@@ -242,4 +242,4 @@ See [ENHANCED_SWAP_ROUTER_UPGRADE.md](../bridge/trustless/ENHANCED_SWAP_ROUTER_U
 - [DVM_DEPLOYMENT_CHECK.md](DVM_DEPLOYMENT_CHECK.md) — DODO DVM on Chain 138 vs L2s  
 - [DODO_PMM_INTEGRATION.md](../integration/DODO_PMM_INTEGRATION.md) — Pool creation and swap methods  
 - [ENHANCED_SWAP_ROUTER_UPGRADE.md](../bridge/trustless/ENHANCED_SWAP_ROUTER_UPGRADE.md) — Balancer/Curve/Uniswap on mainnet  
-- [OPERATOR_NEXT_STEPS_RUNBOOK.md](OPERATOR_NEXT_STEPS_RUNBOOK.md) — G1 PMM on L2s, G2/G3 Trustless  
+- [ALL_NEXT_STEPS_CURRENT.md](ALL_NEXT_STEPS_CURRENT.md) — Current G1 PMM on L2s and G2/G3 Trustless follow-up steps  
diff --git a/docs/deployment/DEPLOYMENT.md b/docs/deployment/DEPLOYMENT.md
index b3176a3..c4bef10 100644
--- a/docs/deployment/DEPLOYMENT.md
+++ b/docs/deployment/DEPLOYMENT.md
@@ -52,7 +52,8 @@ This guide provides step-by-step instructions for deploying the DeFi Oracle Meta
 
 3. Generate genesis file:
 ```bash
-./scripts/generate-genesis.sh
+./scripts/generate-genesis-proper.sh 4
+./scripts/validation/validate-genesis.sh
 ```
 
 4. Store keys in Azure Key Vault:
@@ -230,7 +231,7 @@ npm run example:transaction
 npm run example:contract
 ```
 
-See [Tatum SDK Integration Guide](TATUM_SDK.md) for detailed documentation.
+See [Tatum SDK Integration Guide](../api/TATUM_SDK.md) for detailed documentation.
 
 ## Step 9: Verification
 
@@ -281,4 +282,3 @@ npm run smoke-test
 - Set up backup procedures
 - Review security hardening
 - Document operational procedures
-
diff --git a/docs/deployment/DEPLOYMENT_CHECKLIST.md b/docs/deployment/DEPLOYMENT_CHECKLIST.md
index 1e75897..ed676a9 100644
--- a/docs/deployment/DEPLOYMENT_CHECKLIST.md
+++ b/docs/deployment/DEPLOYMENT_CHECKLIST.md
@@ -79,7 +79,7 @@ terraform apply tfplan-240vpu
 
 ### 3.1 Generate Genesis File
 - [ ] Generate genesis.json with 48 validators
-- [ ] Configure IBFT 2.0 consensus parameters
+- [ ] Configure QBFT consensus parameters
 - [ ] Add validator addresses to genesis
 - [ ] Verify genesis file is valid
 
diff --git a/docs/deployment/DEPLOYMENT_COMPLETE_GUIDE.md b/docs/deployment/DEPLOYMENT_COMPLETE_GUIDE.md
index 022fbc0..b25c389 100644
--- a/docs/deployment/DEPLOYMENT_COMPLETE_GUIDE.md
+++ b/docs/deployment/DEPLOYMENT_COMPLETE_GUIDE.md
@@ -364,8 +364,7 @@ For issues or questions:
 ## References
 
 - [Deployment Order](DEPLOYMENT_ORDER.md)
-- [WETH CCIP Deployment](WETH_CCIP_DEPLOYMENT.md)
+- [WETH CCIP Deployment](../operations/integrations/WETH_CCIP_DEPLOYMENT.md)
 - [Contract Deployment Environment Setup](../configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md)
 - [Azure/Cloudflare Environment Setup](../configuration/AZURE_CLOUDFLARE_ENV_SETUP.md)
 - [Deployment Credentials](DEPLOYMENT_CREDENTIALS.md)
-
diff --git a/docs/deployment/DEPLOYMENT_CONFIGURATION_AUDIT.md b/docs/deployment/DEPLOYMENT_CONFIGURATION_AUDIT.md
index 12fadd2..5a8272a 100644
--- a/docs/deployment/DEPLOYMENT_CONFIGURATION_AUDIT.md
+++ b/docs/deployment/DEPLOYMENT_CONFIGURATION_AUDIT.md
@@ -4,9 +4,9 @@
 
 This document provides a comprehensive audit of the deployment configuration for the DeFi Oracle Meta Mainnet (ChainID 138), identifying misconfigurations, gaps, and recommendations.
 
-**Audit Date**: $(date)
+**Audit Date**: 2026-04-13
 **Chain ID**: 138
-**Status**: ⚠️ **CONFIGURATION ISSUES FOUND**
+**Status**: Historical audit snapshot; revalidate against current configs before acting
 
 ---
 
@@ -17,7 +17,7 @@ This document provides a comprehensive audit of the deployment configuration for
 **Issue**: The `config/genesis.json` file has `extraData: "0x"` which means no validators are configured in the genesis block.
 
 **Impact**: 
-- IBFT 2.0 requires validators to be specified in the genesis `extraData` field
+- QBFT requires validators to be specified in the genesis `extraData` field
 - Network cannot start without validators
 - Blocks cannot be produced
 
@@ -28,12 +28,12 @@ This document provides a comprehensive audit of the deployment configuration for
 "extraData": "0x"
 ```
 
-**Required**: Validator addresses must be encoded in `extraData` using IBFT 2.0 format:
+**Required**: Validator addresses must be encoded in `extraData` using QBFT format:
 ```
 extraData = RLP([32 bytes Vanity, [][20 bytes]Validators, 65 bytes Signature])
 ```
 
-**Fix**: Run `./scripts/generate-genesis.sh` to regenerate genesis with validator addresses from `keys/validators/`.
+**Fix**: Run `./scripts/generate-genesis-proper.sh 4` to regenerate genesis with validator addresses from `keys/validators/`.
 
 ---
 
@@ -103,9 +103,9 @@ az aks get-versions --location westeurope --output table
 
 **Required**: Validator public keys must be extracted from `keys/validators/` and encoded in genesis `extraData`.
 
-**Fix**: Ensure `scripts/generate-genesis.sh`:
+**Fix**: Ensure `scripts/generate-genesis-proper.sh`:
 1. Reads validator public keys from `keys/validators/*/key.pub`
-2. Encodes them in IBFT 2.0 format
+2. Encodes them in QBFT format
 3. Updates `extraData` field
 
 ---
@@ -189,11 +189,11 @@ All configurations use Chain ID 138:
 
 ---
 
-### ✅ IBFT 2.0 Configuration
+### ✅ QBFT Configuration
 
 **Status**: ✅ **CONSISTENT**
 
-IBFT 2.0 parameters are consistent:
+QBFT parameters are consistent:
 - Block period: 2 seconds ✅
 - Epoch length: 30,000 blocks ✅
 - Request timeout: 10 seconds ✅
@@ -245,7 +245,7 @@ IBFT 2.0 parameters are consistent:
 ### Besu Configuration
 
 #### Validators
-- ✅ Consensus: IBFT 2.0
+- ✅ Consensus: QBFT
 - ✅ RPC: Disabled (correct for security)
 - ✅ P2P: Enabled on port 30303
 - ✅ Sync Mode: FULL
@@ -253,7 +253,7 @@ IBFT 2.0 parameters are consistent:
 - ✅ Metrics: Enabled on port 9545
 
 #### Sentries
-- ✅ Consensus: IBFT 2.0 (read-only)
+- ✅ Consensus: QBFT (read-only)
 - ✅ RPC: Enabled but internal only (127.0.0.1)
 - ✅ P2P: Enabled on port 30303
 - ✅ Sync Mode: FULL
@@ -261,7 +261,7 @@ IBFT 2.0 parameters are consistent:
 - ✅ Metrics: Enabled
 
 #### RPC Nodes
-- ✅ Consensus: IBFT 2.0 (read-only)
+- ✅ Consensus: QBFT (read-only)
 - ✅ RPC: Enabled publicly (0.0.0.0)
 - ✅ P2P: Disabled (correct)
 - ✅ Sync Mode: SNAP (correct for RPC nodes)
@@ -362,7 +362,7 @@ IBFT 2.0 parameters are consistent:
 
 1. **Fix Genesis File**
    ```bash
-   ./scripts/generate-genesis.sh
+   ./scripts/generate-genesis-proper.sh 4
    ```
    Verify `extraData` contains validator addresses.
 
@@ -417,7 +417,7 @@ IBFT 2.0 parameters are consistent:
 ### ✅ Correctly Configured
 
 - Chain ID: 138 (consistent across all files)
-- IBFT 2.0 parameters (block period, epoch, timeout)
+- QBFT parameters (block period, epoch, timeout)
 - Network ID: 138 (consistent)
 - Besu image: hyperledger/besu:23.10.0
 - Resource sizing (mostly consistent)
@@ -463,4 +463,3 @@ For questions or issues:
 - Check deployment documentation
 - Verify prerequisites
 - Run validation scripts
-
diff --git a/docs/deployment/DEPLOYMENT_CREDENTIALS.md b/docs/deployment/DEPLOYMENT_CREDENTIALS.md
index f9b07bf..9c50013 100644
--- a/docs/deployment/DEPLOYMENT_CREDENTIALS.md
+++ b/docs/deployment/DEPLOYMENT_CREDENTIALS.md
@@ -257,7 +257,6 @@ forge test -vvvv
 
 - [Foundry Documentation](https://book.getfoundry.sh/)
 - [Chainlink CCIP Documentation](https://docs.chain.link/ccip)
-- [WETH Deployment Guide](docs/WETH_CCIP_DEPLOYMENT.md)
+- [WETH Deployment Guide](../operations/integrations/WETH_CCIP_DEPLOYMENT.md)
 - [Contract Deployment Environment Setup](../configuration/CONTRACT_DEPLOYMENT_ENV_SETUP.md)
 - [Azure/Cloudflare Environment Setup](../configuration/AZURE_CLOUDFLARE_ENV_SETUP.md)
-
diff --git a/docs/deployment/DEPLOYMENT_FIREFLY_CACTI.md b/docs/deployment/DEPLOYMENT_FIREFLY_CACTI.md
index 24a82a7..9e224b0 100644
--- a/docs/deployment/DEPLOYMENT_FIREFLY_CACTI.md
+++ b/docs/deployment/DEPLOYMENT_FIREFLY_CACTI.md
@@ -332,7 +332,6 @@ kubectl delete service financial-tokenization-service -n besu-network
 
 - [Firefly Documentation](https://hyperledger.github.io/firefly/)
 - [Cacti Documentation](https://hyperledger.github.io/cacti/)
-- [Integration Guide](INTEGRATION_GUIDE.md)
-- [Firefly Integration](FIREFLY_INTEGRATION.md)
-- [Cacti Integration](CACTI_INTEGRATION.md)
-
+- [Integration Guide](../guides/INTEGRATION_GUIDE.md)
+- [Firefly Integration](../operations/integrations/FIREFLY_INTEGRATION.md)
+- [Cacti Integration](../operations/integrations/CACTI_INTEGRATION.md)
diff --git a/docs/deployment/DEPLOYMENT_INDEX.md b/docs/deployment/DEPLOYMENT_INDEX.md
index 0afd7c9..11297df 100644
--- a/docs/deployment/DEPLOYMENT_INDEX.md
+++ b/docs/deployment/DEPLOYMENT_INDEX.md
@@ -8,7 +8,7 @@ This index helps you find the right deployment guide for your needs.
 ## Which Guide Should I Use?
 
 ### Quick Start
-**Use**: [Deployment Quick Start](../../DEPLOYMENT_QUICK_START.md)  
+**Use**: [Deployment Quick Start](../DEPLOYMENT_QUICK_START.md)  
 **When**: You want the fastest deployment path  
 **Covers**: One-command deployment, parallel execution, quick setup
 
@@ -23,7 +23,7 @@ This index helps you find the right deployment guide for your needs.
 **Covers**: Pre-deployment, deployment, post-deployment checklist
 
 ### Current Status
-**Use**: [Deployment Status and Next Steps](DEPLOYMENT_STATUS_AND_NEXT_STEPS.md)  
+**Use**: [Deployment Status and Next Steps](../DEPLOYMENT_STATUS_AND_NEXT_STEPS.md)  
 **When**: You need to know current deployment status  
 **Covers**: Current status, next steps, what's deployed
 
@@ -108,19 +108,18 @@ These are historical deployment reports and status documents. Consider archiving
 
 | Guide | Purpose | When to Use |
 |-------|---------|-------------|
-| [Deployment Quick Start](../../DEPLOYMENT_QUICK_START.md) | Fast deployment | Quick setup needed |
+| [Deployment Quick Start](../DEPLOYMENT_QUICK_START.md) | Fast deployment | Quick setup needed |
 | [Deployment Guide](DEPLOYMENT.md) | Comprehensive guide | Detailed instructions needed |
 | [Deployment Checklist](DEPLOYMENT_CHECKLIST.md) | Checklist | Tracking progress |
-| [Deployment Status](DEPLOYMENT_STATUS_AND_NEXT_STEPS.md) | Current status | Check what's deployed |
+| [Deployment Status](../DEPLOYMENT_STATUS_AND_NEXT_STEPS.md) | Current status | Check what's deployed |
 
 ## Related Documentation
 
-- [Master Documentation Index](../../MASTER_DOCUMENTATION_INDEX.md)
-- [Architecture Documentation](../../architecture/ARCHITECTURE.md)
-- [Configuration Index](../../configuration/CONFIGURATION_INDEX.md)
-- [Troubleshooting Guide](../../guides/TROUBLESHOOTING.md)
+- [Master Documentation Index](../MASTER_DOCUMENTATION_INDEX.md)
+- [Architecture Documentation](../architecture/ARCHITECTURE.md)
+- [Configuration Index](../configuration/CONFIGURATION_INDEX.md)
+- [Troubleshooting Guide](../guides/TROUBLESHOOTING.md)
 
 ---
 
 **Last Updated**: 2025-01-27
-
diff --git a/docs/deployment/DEPLOYMENT_ORDER.md b/docs/deployment/DEPLOYMENT_ORDER.md
index b5f0f08..47f22a6 100644
--- a/docs/deployment/DEPLOYMENT_ORDER.md
+++ b/docs/deployment/DEPLOYMENT_ORDER.md
@@ -46,7 +46,7 @@ The deployment is organized into 8 phases, each building on the previous:
 ### 1.4 Key Generation
 - [ ] Generate validator keys (`./scripts/key-management/generate-validator-keys.sh 4`)
 - [ ] Generate oracle keys (`./scripts/key-management/generate-oracle-keys.sh`)
-- [ ] Generate genesis file (`./scripts/generate-genesis.sh`)
+- [ ] Generate genesis file (`./scripts/generate-genesis-proper.sh 4`)
 - [ ] Verify keys are generated correctly
 
 ---
@@ -399,4 +399,3 @@ Phase 1 (Prerequisites)
 - Always verify each phase before proceeding
 - Keep backups of configurations and keys
 - Document any deviations from the standard process
-
diff --git a/docs/deployment/FINAL_COMPLETION_REPORT.md b/docs/deployment/FINAL_COMPLETION_REPORT.md
index 4153db5..eb69338 100644
--- a/docs/deployment/FINAL_COMPLETION_REPORT.md
+++ b/docs/deployment/FINAL_COMPLETION_REPORT.md
@@ -1,9 +1,11 @@
 # Final Completion Report - All Tasks
 
 **Date**: 2025-01-18  
-**Status**: ✅ **MAXIMUM COMPLETION ACHIEVED**  
+**Status**: Historical task-completion snapshot  
 **Total Tasks**: 14
 
+This report captures an earlier project milestone and should be read as historical context, not as a current operator status page.
+
 ## Completion Summary
 
 ### ✅ Completed: 9/14 Tasks (64%)
diff --git a/docs/deployment/FINAL_COMPLETION_STATUS.md b/docs/deployment/FINAL_COMPLETION_STATUS.md
index 7135e94..6184b80 100644
--- a/docs/deployment/FINAL_COMPLETION_STATUS.md
+++ b/docs/deployment/FINAL_COMPLETION_STATUS.md
@@ -1,7 +1,9 @@
 # Final Completion Status - All Tasks and Next Steps
 
 **Date**: 2025-01-18  
-**Status**: ✅ **100% COMPLETE**
+**Status**: Historical completion snapshot
+
+This document records an earlier “all tasks and next steps” milestone. It is useful for historical context but should not replace the current deployment indexes and runbooks.
 
 ## Executive Summary
 
diff --git a/docs/deployment/MAINNET_TETHER_AND_TRANSACTION_MIRROR.md b/docs/deployment/MAINNET_TETHER_AND_TRANSACTION_MIRROR.md
index dc4e2bc..f23759e 100644
--- a/docs/deployment/MAINNET_TETHER_AND_TRANSACTION_MIRROR.md
+++ b/docs/deployment/MAINNET_TETHER_AND_TRANSACTION_MIRROR.md
@@ -331,10 +331,9 @@ forge script script/DeployTransactionMirror.s.sol \
 
 - [Kaleido Tether Documentation](https://docs.kaleido.io/kaleido-services/tether/)
 - [Etherscan Event Search](https://etherscan.io/apis#events)
-- [Foundry Deployment Guide](../MULTICHAIN_DEPLOYMENT_RUNBOOK.md)
+- [Foundry Deployment Guide](MULTICHAIN_DEPLOYMENT_RUNBOOK.md)
 
 ---
 
 **Last Updated**: 2025-12-11
 **Status**: Contracts ready, deployment pending
-
diff --git a/docs/deployment/MASTER_INDEX.md b/docs/deployment/MASTER_INDEX.md
index 239197a..d2eee19 100644
--- a/docs/deployment/MASTER_INDEX.md
+++ b/docs/deployment/MASTER_INDEX.md
@@ -20,7 +20,7 @@
 8. **DETAILED_TASK_LIST_COMPREHENSIVE.md** - Complete task list (14 tasks)
 9. **TASK_COMPLETION_REPORT.md** - Task completion tracking
 10. **ALL_TASKS_COMPLETION_SUMMARY.md** - Completion summary
-11. **FINAL_COMPLETION_REPORT.md** - Final completion status
+11. **../archive/status-reports/docs-root-legacy/FINAL_COMPLETION_REPORT.md** - Historical final completion status
 
 ### Individual Task Documentation
 
@@ -42,7 +42,7 @@
 
 ### Task Lists
 - **Complete Task List**: `DETAILED_TASK_LIST_COMPREHENSIVE.md`
-- **Completion Summary**: `FINAL_COMPLETION_REPORT.md`
+- **Completion Summary**: `../archive/status-reports/docs-root-legacy/FINAL_COMPLETION_REPORT.md`
 
 ### Service Development
 - **State Anchoring Service**: `TASK2_STATE_ANCHORING_SERVICE.md`
@@ -70,7 +70,7 @@
 1. **Start Here**: `DEPLOYMENT_COMPLETE_STATUS_FINAL.md` - Overall status
 2. **Gaps**: `GAP_ANALYSIS_COMPREHENSIVE.md` - All gaps identified
 3. **Tasks**: `DETAILED_TASK_LIST_COMPREHENSIVE.md` - All tasks detailed
-4. **Completion**: `FINAL_COMPLETION_REPORT.md` - What's done
+4. **Completion**: `../archive/status-reports/docs-root-legacy/FINAL_COMPLETION_REPORT.md` - Historical completion snapshot
 
 ---
 
diff --git a/docs/deployment/MULTICHAIN_DEPLOYMENT_RUNBOOK.md b/docs/deployment/MULTICHAIN_DEPLOYMENT_RUNBOOK.md
index 9b9815e..e06e9f8 100644
--- a/docs/deployment/MULTICHAIN_DEPLOYMENT_RUNBOOK.md
+++ b/docs/deployment/MULTICHAIN_DEPLOYMENT_RUNBOOK.md
@@ -507,6 +507,5 @@ For issues or questions:
 - [Foundry Documentation](https://book.getfoundry.sh/)
 - [Chainlink CCIP Documentation](https://docs.chain.link/ccip)
 - [Etherscan API](https://docs.etherscan.io/)
-- [Multichain Deployment Script](../script/DeployAll.s.sol)
-- [CCIPLogger Deployment Script](../script/DeployCCIPLoggerOnly.s.sol)
-
+- [Multichain Deployment Script](../../script/DeployAll.s.sol)
+- [CCIPLogger Deployment Script](../../script/DeployCCIPLoggerOnly.s.sol)
diff --git a/docs/deployment/MULTI_CHAIN_DEPLOYMENT_GUIDE.md b/docs/deployment/MULTI_CHAIN_DEPLOYMENT_GUIDE.md
index 75ff75b..569814d 100644
--- a/docs/deployment/MULTI_CHAIN_DEPLOYMENT_GUIDE.md
+++ b/docs/deployment/MULTI_CHAIN_DEPLOYMENT_GUIDE.md
@@ -386,10 +386,10 @@ forge verify-contract <ADDRESS> <CONTRACT> \
 
 ## 📚 **Additional Resources**
 
-- [Chain Registry Documentation](./CHAIN_REGISTRY.md)
-- [Adapter Development Guide](./ADAPTER_DEVELOPMENT.md)
-- [Hyperledger Integration Guide](./HYPERLEDGER_INTEGRATION.md)
-- [Oracle Service Setup](./ORACLE_SERVICE_SETUP.md)
+- [Current Contract and Infrastructure Inventory](../MASTER_CONTRACTS_AND_INFRASTRUCTURE_LIST.md)
+- [Tezos Adapter Production Checklist](../bridge/TEZOS_ADAPTER_PRODUCTION_CHECKLIST.md)
+- [Integration Guide](../guides/INTEGRATION_GUIDE.md)
+- [Oracle and Keeper Chain 138](../integration/ORACLE_AND_KEEPER_CHAIN138.md)
 
 ---
 
diff --git a/docs/deployment/TODO_TASKS_STATUS.md b/docs/deployment/TODO_TASKS_STATUS.md
index 380c26a..b68fd0d 100644
--- a/docs/deployment/TODO_TASKS_STATUS.md
+++ b/docs/deployment/TODO_TASKS_STATUS.md
@@ -46,7 +46,7 @@ Summary of all deployment TODOs and their current status.
 
 ## Operator runbook (DApp LXC + Dual-Router + NPMplus)
 
-For step-by-step commands to deploy the DApp LXC (5801), add NPMplus proxy, fund mainnet LP, fund CCIP LINK, and optional G1–G3 / CCIPLogger, see **[OPERATOR_NEXT_STEPS_RUNBOOK.md](OPERATOR_NEXT_STEPS_RUNBOOK.md)**.
+For step-by-step commands to deploy the DApp LXC (5801), add NPMplus proxy, fund mainnet LP, fund CCIP LINK, and optional G1–G3 / CCIPLogger, see **[ALL_NEXT_STEPS_CURRENT.md](ALL_NEXT_STEPS_CURRENT.md)**.
 
 ---
 
diff --git a/docs/deployment/VM_DEPLOYMENT_SUMMARY.md b/docs/deployment/VM_DEPLOYMENT_SUMMARY.md
index 53c7f52..7215096 100644
--- a/docs/deployment/VM_DEPLOYMENT_SUMMARY.md
+++ b/docs/deployment/VM_DEPLOYMENT_SUMMARY.md
@@ -1,5 +1,10 @@
 # VM Deployment Implementation Summary
 
+**Last Reviewed**: 2026-04-13  
+**Status**: Historical VM deployment summary
+
+This document summarizes a VM/VMSS delivery milestone. Use the current VM deployment guides and checklists for active planning and operations.
+
 ## Overview
 
 This document summarizes the VM/VMSS deployment implementation for the Besu network, providing an alternative to AKS deployment.
@@ -256,5 +261,4 @@ docs/
 
 ## Conclusion
 
-The VM/VMSS deployment option provides a simpler, more cost-effective alternative to AKS deployment while maintaining full control over the infrastructure. All components are production-ready and fully documented.
-
+The VM/VMSS deployment option provides a simpler, more cost-effective alternative to AKS deployment while maintaining full control over the infrastructure. At the time of this summary, the components were fully documented and ready for the next operational validation step.
diff --git a/docs/deployment/VM_DEPLOYMENT_TROUBLESHOOTING.md b/docs/deployment/VM_DEPLOYMENT_TROUBLESHOOTING.md
index 0ba532d..51de9bf 100644
--- a/docs/deployment/VM_DEPLOYMENT_TROUBLESHOOTING.md
+++ b/docs/deployment/VM_DEPLOYMENT_TROUBLESHOOTING.md
@@ -286,7 +286,7 @@ ssh besuadmin@$VM_IP "iftop"
 
 If you encounter issues not covered here:
 
-1. Check the [main troubleshooting guide](../docs/TROUBLESHOOTING.md)
+1. Check the [main troubleshooting guide](../guides/TROUBLESHOOTING.md)
 2. Review [VM deployment documentation](VM_DEPLOYMENT.md)
 3. Check Besu logs for detailed error messages
 4. Review Azure VM logs in Azure Portal
@@ -302,4 +302,3 @@ To prevent common issues:
 3. **Updates**: Keep VMs and Docker images updated
 4. **Resource Planning**: Monitor resource usage and scale as needed
 5. **Security**: Regularly review and update NSG rules and Key Vault policies
-
diff --git a/docs/diagrams/README.md b/docs/diagrams/README.md
index e51317e..c1ee7b1 100644
--- a/docs/diagrams/README.md
+++ b/docs/diagrams/README.md
@@ -34,7 +34,7 @@ Diagrams can be created using:
 1. Create diagram file in appropriate format
 2. Reference in documentation using:
    ```markdown
-   ![Diagram Description](diagrams/diagram-name.png)
+   ![Diagram Description] (diagrams/diagram-name.png)
    ```
 3. Update this README with diagram description
 
@@ -50,4 +50,3 @@ Diagrams can be created using:
 ---
 
 **Last Updated**: 2025-01-27
-
diff --git a/docs/governance/CHANGELOG.md b/docs/governance/CHANGELOG.md
index 2db6010..1869dcf 100644
--- a/docs/governance/CHANGELOG.md
+++ b/docs/governance/CHANGELOG.md
@@ -70,7 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 - Hyperledger Besu network deployment
-- IBFT 2.0 consensus
+- QBFT consensus
 - Validator, sentry, and RPC node tiers
 - Oracle aggregator contract
 - WETH, Multicall, CREATE2 factory contracts
@@ -96,4 +96,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [Unreleased]: https://github.com/defi-oracle-meta-mainnet/smom-dbis-138/compare/v1.0.0...HEAD
 [1.0.0]: https://github.com/defi-oracle-meta-mainnet/smom-dbis-138/releases/tag/v1.0.0
 [0.1.0]: https://github.com/defi-oracle-meta-mainnet/smom-dbis-138/releases/tag/v0.1.0
-
diff --git a/docs/governance/CHANGELOG_WELL_ARCHITECTED.md b/docs/governance/CHANGELOG_WELL_ARCHITECTED.md
index 0cca513..6b847a8 100644
--- a/docs/governance/CHANGELOG_WELL_ARCHITECTED.md
+++ b/docs/governance/CHANGELOG_WELL_ARCHITECTED.md
@@ -152,7 +152,6 @@ terraform apply -var-file=terraform.tfvars
 
 ## References
 
-- [Well-Architected Framework Review](docs/AZURE_WELL_ARCHITECTED_REVIEW.md)
-- [Well-Architected Implementation](docs/AZURE_WELL_ARCHITECTED_IMPLEMENTATION.md)
-- [Migration Guide](docs/MIGRATION_TO_WELL_ARCHITECTED.md)
-
+- [Well-Architected Framework Review](../azure/AZURE_WELL_ARCHITECTED_REVIEW.md)
+- [Well-Architected Implementation](../azure/AZURE_WELL_ARCHITECTED_IMPLEMENTATION.md)
+- [Migration Guide](../guides/MIGRATION_TO_WELL_ARCHITECTED.md)
diff --git a/docs/governance/DOCUMENTATION_STYLE_GUIDE.md b/docs/governance/DOCUMENTATION_STYLE_GUIDE.md
index 646241f..689c06d 100644
--- a/docs/governance/DOCUMENTATION_STYLE_GUIDE.md
+++ b/docs/governance/DOCUMENTATION_STYLE_GUIDE.md
@@ -115,7 +115,7 @@ Example:
 ### Internal Links
 
 - **Relative paths**: Use relative paths for internal documentation
-- **Format**: `[Link Text](path/to/file.md)`
+- **Format**: ``[Link Text] (path/to/file.md)``
 - **Anchor links**: Use for sections: `[Section Name](#section-name)`
 
 ### External Links
@@ -126,8 +126,8 @@ Example:
 
 ### Link Text
 
-**Good**: See [Deployment Guide](deployment/DEPLOYMENT.md) for details.  
-**Bad**: Click [here](deployment/DEPLOYMENT.md) for details.
+**Good**: See [Deployment Guide](../deployment/DEPLOYMENT.md) for details.  
+**Bad**: Click [here](../deployment/DEPLOYMENT.md) for details.
 
 ## Date Formats
 
@@ -195,8 +195,8 @@ Add "Related Documentation" section where appropriate:
 
 ```markdown
 > **Related Documentation**:
-> - [Guide 1](path/to/guide1.md) - Description
-> - [Guide 2](path/to/guide2.md) - Description
+> - [Guide 1](../guides/GETTING_STARTED.md) - Description
+> - [Guide 2](../deployment/DEPLOYMENT_CHECKLIST.md) - Description
 ```
 
 ## Code Examples
@@ -323,7 +323,7 @@ All documents should include:
 - **Size**: Optimize for web
 
 ```markdown
-![Alt text](images/diagram.png)
+![Alt text] (images/diagram.png)
 ```
 
 ## Checklists
@@ -394,8 +394,8 @@ When reviewing documentation, check:
    ```
 
 > **Related Documentation**:
-> - [Architecture Guide](architecture/ARCHITECTURE.md) - System architecture
-> - [Configuration Guide](configuration/CONFIGURATION_INDEX.md) - Configuration options
+> - [Architecture Guide](../architecture/ARCHITECTURE.md) - System architecture
+> - [Configuration Guide](../configuration/CONFIGURATION_INDEX.md) - Configuration options
 ```
 
 ## Updates
@@ -406,4 +406,3 @@ This style guide should be reviewed and updated quarterly or as needed.
 
 **Last Updated**: 2025-01-27  
 **Next Review**: 2025-04-27
-
diff --git a/docs/guides/ASSETS_GUIDE.md b/docs/guides/ASSETS_GUIDE.md
index 650d8a2..cd5a848 100644
--- a/docs/guides/ASSETS_GUIDE.md
+++ b/docs/guides/ASSETS_GUIDE.md
@@ -76,7 +76,7 @@ This creates a Draw.io stencil for easy icon access.
 Use icons in Markdown documentation:
 
 ```markdown
-![Azure Kubernetes Service](assets/azure-icons/svg/Icon-service-kubernetes-Azure.svg)
+../../assets/azure-icons/svg/<icon-file>.svg
 ```
 
 ### In Presentations
@@ -84,7 +84,7 @@ Use icons in Markdown documentation:
 Use PNG icons for presentations:
 
 ```markdown
-![Azure Kubernetes Service](assets/azure-icons/png/Icon-service-kubernetes-Azure.png)
+../../assets/azure-icons/png/<icon-file>.png
 ```
 
 ## Icon Categories
@@ -313,4 +313,3 @@ If specific icons are missing:
 - Network: `assets/diagrams/network/`
 - Deployment: `assets/diagrams/deployment/`
 - Templates: `assets/diagrams/templates/`
-
diff --git a/docs/guides/ASSETS_QUICK_REFERENCE.md b/docs/guides/ASSETS_QUICK_REFERENCE.md
index b75d29d..9b34309 100644
--- a/docs/guides/ASSETS_QUICK_REFERENCE.md
+++ b/docs/guides/ASSETS_QUICK_REFERENCE.md
@@ -41,12 +41,12 @@ make -f Makefile.assets create-stencil
 
 ### In Documentation
 ```markdown
-![Azure Kubernetes Service](assets/azure-icons/svg/Icon-service-kubernetes-Azure.svg)
+../../assets/azure-icons/svg/<icon-file>.svg
 ```
 
 ### In Presentations
 ```markdown
-![Azure Kubernetes Service](assets/azure-icons/png/Icon-service-kubernetes-Azure.png)
+../../assets/azure-icons/png/<icon-file>.png
 ```
 
 ## Finding Icons
@@ -72,9 +72,9 @@ cat assets/azure-icons/metadata/icon-mapping.json | jq '.icon_mapping.networking
 ## Documentation
 
 - [Assets Guide](ASSETS_GUIDE.md) - Complete guide
-- [Architecture Diagrams Guide](ARCHITECTURE_DIAGRAMS.md) - Creating diagrams
-- [Icon Catalog](../assets/azure-icons/metadata/icon-catalog.md) - Complete catalog
-- [Download Instructions](../assets/azure-icons/metadata/download-instructions.md) - Download guide
+- [Architecture Diagrams Guide](../architecture/ARCHITECTURE_DIAGRAMS.md) - Creating diagrams
+- [Icon Catalog](../../assets/azure-icons/metadata/icon-catalog.md) - Complete catalog
+- [Download Instructions](../../assets/azure-icons/metadata/download-instructions.md) - Download guide
 
 ## Official Sources
 
@@ -117,4 +117,3 @@ make -f Makefile.assets clean-assets
 # Install all assets
 make -f Makefile.assets install-assets
 ```
-
diff --git a/docs/guides/ASSETS_SETUP_SUMMARY.md b/docs/guides/ASSETS_SETUP_SUMMARY.md
index f9b8e7a..0cabdeb 100644
--- a/docs/guides/ASSETS_SETUP_SUMMARY.md
+++ b/docs/guides/ASSETS_SETUP_SUMMARY.md
@@ -65,7 +65,7 @@ make -f Makefile.assets create-stencil
 
 ### In Documentation
 ```markdown
-![Azure Kubernetes Service](assets/azure-icons/svg/Icon-service-kubernetes-Azure.svg)
+../../assets/azure-icons/svg/<icon-file>.svg
 ```
 
 ### Common Icons
@@ -84,10 +84,10 @@ make -f Makefile.assets create-stencil
 
 ## Documentation
 
-- [Assets Guide](docs/ASSETS_GUIDE.md)
-- [Architecture Diagrams Guide](docs/ARCHITECTURE_DIAGRAMS.md)
-- [Icon Catalog](assets/azure-icons/metadata/icon-catalog.md)
-- [Download Instructions](assets/azure-icons/metadata/download-instructions.md)
+- [Assets Guide](ASSETS_GUIDE.md)
+- [Architecture Diagrams Guide](../architecture/ARCHITECTURE_DIAGRAMS.md)
+- [Icon Catalog](../../assets/azure-icons/metadata/icon-catalog.md)
+- [Download Instructions](../../assets/azure-icons/metadata/download-instructions.md)
 
 ## Status
 
diff --git a/docs/guides/CONTRACT_INVENTORY.md b/docs/guides/CONTRACT_INVENTORY.md
index da6cbe1..9735fca 100644
--- a/docs/guides/CONTRACT_INVENTORY.md
+++ b/docs/guides/CONTRACT_INVENTORY.md
@@ -273,4 +273,4 @@ forge test
 
 - [OpenZeppelin Dependency Assessment](./OPENZEPPELIN_DEPENDENCY_ASSESSMENT.md)
 - [OpenZeppelin Tasks Checklist](./OPENZEPPELIN_TASKS_CHECKLIST.md)
-- [WETH CCIP Deployment Guide](./WETH_CCIP_DEPLOYMENT.md)
+- [WETH CCIP Deployment Guide](../operations/integrations/WETH_CCIP_DEPLOYMENT.md)
diff --git a/docs/guides/FAQ.md b/docs/guides/FAQ.md
index 3d7c694..6ebe5e0 100644
--- a/docs/guides/FAQ.md
+++ b/docs/guides/FAQ.md
@@ -18,7 +18,7 @@ Common questions and answers about the DeFi Oracle Meta Mainnet (ChainID 138).
 
 ### What is ChainID 138?
 
-ChainID 138 is the DeFi Oracle Meta Mainnet, a production-ready blockchain network built on Hyperledger Besu with QBFT consensus.
+ChainID 138 is the DeFi Oracle Meta Mainnet, a Hyperledger Besu-based blockchain network that uses QBFT consensus.
 
 ### What consensus mechanism does the network use?
 
@@ -208,4 +208,3 @@ kubectl delete pods -n besu-network -l component=validator
 ---
 
 **Last Updated**: 2025-01-27
-
diff --git a/docs/guides/GAPS_AND_RECOMMENDATIONS.md b/docs/guides/GAPS_AND_RECOMMENDATIONS.md
index d1d8507..9bfa267 100644
--- a/docs/guides/GAPS_AND_RECOMMENDATIONS.md
+++ b/docs/guides/GAPS_AND_RECOMMENDATIONS.md
@@ -2,13 +2,13 @@
 
 ## Executive Summary
 
-This document provides a comprehensive analysis of gaps, recommendations, and suggestions for the DeFi Oracle Meta Mainnet project. All critical and high-priority tasks have been completed, making the project production-ready.
+This document captures a milestone gap analysis for the DeFi Oracle Meta Mainnet project. Treat it as a historical review and recommendation set rather than a current certification of live operational readiness.
 
 ## Gap Analysis
 
-### Critical Gaps: None ✅
+### Critical Gaps at Time of Review: None ✅
 
-All critical functionality is implemented and production-ready.
+All critical functionality was assessed as implemented at the time of this review.
 
 ### Minor Gaps
 
@@ -248,7 +248,7 @@ All critical functionality is implemented and production-ready.
 
 ## Conclusion
 
-The DeFi Oracle Meta Mainnet is **production-ready** with all critical and high-priority tasks completed. The identified gaps are minor and can be addressed incrementally. The project demonstrates:
+The DeFi Oracle Meta Mainnet had reached a strong implementation milestone when this review was written. The identified gaps were minor and could be addressed incrementally. The project demonstrated:
 
 - ✅ Comprehensive infrastructure
 - ✅ Strong security posture
@@ -262,4 +262,3 @@ The DeFi Oracle Meta Mainnet is **production-ready** with all critical and high-
 3. Production configuration
 
 The project is well-positioned for production use and future enhancements.
-
diff --git a/docs/guides/HYBRID_APPROACH_IMPLEMENTATION.md b/docs/guides/HYBRID_APPROACH_IMPLEMENTATION.md
index a081e9c..53e2fb1 100644
--- a/docs/guides/HYBRID_APPROACH_IMPLEMENTATION.md
+++ b/docs/guides/HYBRID_APPROACH_IMPLEMENTATION.md
@@ -272,8 +272,8 @@ contracts/
 - [OpenZeppelin Usage Analysis](./OPENZEPPELIN_USAGE_ANALYSIS.md)
 - [Dependencies Guide](./DEPENDENCIES.md)
 - [Migration Guide](./MIGRATION_GUIDE.md)
-- [Decision Tree](./DECISION_TREE.md)
-- [Security Audit Checklist](./SECURITY_AUDIT_CHECKLIST.md)
+- [Decision Tree (Archived)](../archive/status-reports/operations-legacy/DECISION_TREE.md)
+- [Security Audit Checklist](../security/SECURITY_AUDIT_CHECKLIST.md)
 
 ---
 
@@ -302,4 +302,3 @@ contracts/
 - Existing contracts (CCIPSender, CCIPRouter, etc.) use OpenZeppelin
 - Gradual refactoring planned over 6-12 months
 - All documentation and guides are complete
-
diff --git a/docs/guides/INTEGRATION_GUIDE.md b/docs/guides/INTEGRATION_GUIDE.md
index 4a0ba03..adaccec 100644
--- a/docs/guides/INTEGRATION_GUIDE.md
+++ b/docs/guides/INTEGRATION_GUIDE.md
@@ -376,7 +376,6 @@ curl http://financial-tokenization-service:8080/api/v1/health
 - [Firefly Documentation](https://hyperledger.github.io/firefly/)
 - [Cacti Documentation](https://hyperledger.github.io/cacti/)
 - [Besu Documentation](https://besu.hyperledger.org/)
-- [Financial Tokenization Guide](FINANCIAL_TOKENIZATION.md)
-- [Firefly Integration Guide](FIREFLY_INTEGRATION.md)
-- [Cacti Integration Guide](CACTI_INTEGRATION.md)
-
+- [Financial Tokenization Guide (Archived)](../archive/status-reports/operations-legacy/FINANCIAL_TOKENIZATION.md)
+- [Firefly Integration Guide](../operations/integrations/FIREFLY_INTEGRATION.md)
+- [Cacti Integration Guide](../operations/integrations/CACTI_INTEGRATION.md)
diff --git a/docs/guides/MIGRATION_TO_WELL_ARCHITECTED.md b/docs/guides/MIGRATION_TO_WELL_ARCHITECTED.md
index 5230dd8..0b0f043 100644
--- a/docs/guides/MIGRATION_TO_WELL_ARCHITECTED.md
+++ b/docs/guides/MIGRATION_TO_WELL_ARCHITECTED.md
@@ -265,7 +265,6 @@ az resource list --resource-group defi-oracle-mainnet-rg --query "[?properties.p
 
 ## References
 
-- [Well-Architected Framework Review](AZURE_WELL_ARCHITECTED_REVIEW.md)
-- [Well-Architected Implementation](AZURE_WELL_ARCHITECTED_IMPLEMENTATION.md)
+- [Well-Architected Framework Review](../azure/AZURE_WELL_ARCHITECTED_REVIEW.md)
+- [Well-Architected Implementation](../azure/AZURE_WELL_ARCHITECTED_IMPLEMENTATION.md)
 - [Azure Resource Movement](https://docs.microsoft.com/azure/azure-resource-manager/management/move-resource-group-and-subscription)
-
diff --git a/docs/guides/OPENZEPPELIN_TASKS_CHECKLIST.md b/docs/guides/OPENZEPPELIN_TASKS_CHECKLIST.md
index 97c2688..81d9b9e 100644
--- a/docs/guides/OPENZEPPELIN_TASKS_CHECKLIST.md
+++ b/docs/guides/OPENZEPPELIN_TASKS_CHECKLIST.md
@@ -231,7 +231,7 @@ forge test
 ## Reference Documents
 
 - [Full Assessment Document](./OPENZEPPELIN_DEPENDENCY_ASSESSMENT.md)
-- [WETH CCIP Deployment Guide](./WETH_CCIP_DEPLOYMENT.md)
+- [WETH CCIP Deployment Guide](../operations/integrations/WETH_CCIP_DEPLOYMENT.md)
 - [Foundry Documentation](https://book.getfoundry.sh/)
 
 ---
@@ -242,4 +242,3 @@ For questions or issues related to OpenZeppelin dependencies, refer to:
 - Project maintainers
 - Contract developers
 - Deployment team
-
diff --git a/docs/guides/OPENZEPPELIN_USAGE_ANALYSIS.md b/docs/guides/OPENZEPPELIN_USAGE_ANALYSIS.md
index 33c5b7f..c0f9493 100644
--- a/docs/guides/OPENZEPPELIN_USAGE_ANALYSIS.md
+++ b/docs/guides/OPENZEPPELIN_USAGE_ANALYSIS.md
@@ -353,5 +353,4 @@ contract Voting is Ownable {
 - [OpenZeppelin Documentation](https://docs.openzeppelin.com/)
 - [SafeERC20 Source](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/utils/SafeERC20.sol)
 - [Ownable Source](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol)
-- [CCIPWETH9Bridge Implementation](../contracts/ccip/CCIPWETH9Bridge.sol)
-
+- [CCIPWETH9Bridge Implementation](../../contracts/ccip/CCIPWETH9Bridge.sol)
diff --git a/docs/guides/QUICKSTART.md b/docs/guides/QUICKSTART.md
index fd75d55..2b92b0a 100644
--- a/docs/guides/QUICKSTART.md
+++ b/docs/guides/QUICKSTART.md
@@ -37,7 +37,8 @@ cd smom-dbis-138
 ./scripts/key-management/generate-oracle-keys.sh
 
 # Generate genesis file
-./scripts/generate-genesis.sh
+./scripts/generate-genesis-proper.sh 4
+./scripts/validation/validate-genesis.sh
 ```
 
 ### 3. Deploy Infrastructure
@@ -167,11 +168,11 @@ cd sdk && npm run test
 
 ## Next Steps
 
-- Review [Deployment Guide](DEPLOYMENT.md) for detailed instructions
-- Check [Architecture Documentation](ARCHITECTURE.md) for system design
-- Read [API Documentation](API.md) for RPC API details
-- Review [Tatum SDK Integration](TATUM_SDK.md) for SDK usage
-- Review [Security Documentation](SECURITY.md) for security best practices
+- Review [Deployment Guide](../deployment/DEPLOYMENT.md) for detailed instructions
+- Check [Architecture Documentation](../architecture/ARCHITECTURE.md) for system design
+- Read [API Documentation](../api/API.md) for RPC API details
+- Review [Tatum SDK Integration](../api/TATUM_SDK.md) for SDK usage
+- Review [Security Documentation](../security/SECURITY.md) for security best practices
 
 ## Troubleshooting
 
@@ -196,4 +197,3 @@ cd sdk && npm run test
 ## Support
 
 For support, please open an issue on the project repository or contact the network operators.
-
diff --git a/docs/guides/README_INTEGRATION.md b/docs/guides/README_INTEGRATION.md
index 61079d1..9ddc5d5 100644
--- a/docs/guides/README_INTEGRATION.md
+++ b/docs/guides/README_INTEGRATION.md
@@ -182,9 +182,8 @@ All integration tasks have been completed successfully. The system is ready for
 
 ## References
 
-- [Integration Guide](docs/INTEGRATION_GUIDE.md)
-- [Firefly Integration](docs/FIREFLY_INTEGRATION.md)
-- [Cacti Integration](docs/CACTI_INTEGRATION.md)
-- [Financial Tokenization](docs/FINANCIAL_TOKENIZATION.md)
-- [Deployment Guide](docs/DEPLOYMENT_FIREFLY_CACTI.md)
-
+- [Integration Guide](INTEGRATION_GUIDE.md)
+- [Firefly Integration](../operations/integrations/FIREFLY_INTEGRATION.md)
+- [Cacti Integration](../operations/integrations/CACTI_INTEGRATION.md)
+- [Financial Tokenization (Archived)](../archive/status-reports/operations-legacy/FINANCIAL_TOKENIZATION.md)
+- [Deployment Guide](../deployment/DEPLOYMENT_FIREFLY_CACTI.md)
diff --git a/docs/guides/README_VALIDATION.md b/docs/guides/README_VALIDATION.md
index 67a7278..d5848b6 100644
--- a/docs/guides/README_VALIDATION.md
+++ b/docs/guides/README_VALIDATION.md
@@ -44,7 +44,7 @@ Results are saved in `/tmp/` directory. Check logs for detailed results.
 
 ## Prerequisites
 
-See [Validation Guide](docs/VALIDATION_GUIDE.md) for detailed prerequisites and requirements.
+See [Validation Guide](VALIDATION_GUIDE.md) for detailed prerequisites and requirements.
 
 ## Next Steps
 
@@ -53,4 +53,3 @@ After validation:
 2. Fix any issues found
 3. Re-run validations
 4. Deploy to production
-
diff --git a/docs/guides/README_VM_DEPLOYMENT.md b/docs/guides/README_VM_DEPLOYMENT.md
index 17e7eb1..56ce634 100644
--- a/docs/guides/README_VM_DEPLOYMENT.md
+++ b/docs/guides/README_VM_DEPLOYMENT.md
@@ -51,9 +51,8 @@ terraform apply -var-file=terraform.tfvars.vm
 
 ## Documentation
 
-See [VM Deployment Guide](docs/VM_DEPLOYMENT.md) for detailed instructions.
+See [VM Deployment Guide](../deployment/VM_DEPLOYMENT.md) for detailed instructions.
 
 ## Comparison
 
-See [Deployment Comparison](docs/DEPLOYMENT_COMPARISON.md) for AKS vs VM deployment comparison.
-
+See [Deployment Comparison](../deployment/DEPLOYMENT_COMPARISON.md) for AKS vs VM deployment comparison.
diff --git a/docs/guides/TESTING_GUIDE.md b/docs/guides/TESTING_GUIDE.md
index f7b5c31..c79cb54 100644
--- a/docs/guides/TESTING_GUIDE.md
+++ b/docs/guides/TESTING_GUIDE.md
@@ -307,11 +307,10 @@ jobs:
 
 ## Related Documentation
 
-- [E2E Testing Report](../E2E_TESTING_REPORT.md)
+- [E2E Testing Report (Archived)](../archive/status-reports/docs-root-legacy/E2E_TESTING_REPORT.md)
 - [Security Scanning Guide](../security/SECURITY_SCANNING_GUIDE.md)
 - [Deployment Guide](../deployment/DEPLOYMENT.md)
 
 ---
 
 **Last Updated**: 2025-01-27
-
diff --git a/docs/guides/TROUBLESHOOTING.md b/docs/guides/TROUBLESHOOTING.md
index 6d6840e..5019c4c 100644
--- a/docs/guides/TROUBLESHOOTING.md
+++ b/docs/guides/TROUBLESHOOTING.md
@@ -3,7 +3,7 @@
 **Last Updated**: 2025-01-27  
 **Status**: Active
 
-This is a quick reference guide. For detailed troubleshooting procedures, see [runbooks/troubleshooting.md](../runbooks/troubleshooting.md).
+This is a quick reference guide. For detailed troubleshooting procedures, see [runbooks/troubleshooting.md](../../runbooks/troubleshooting.md).
 
 > **Related Documentation**:
 > - [Deployment Guide](../deployment/DEPLOYMENT.md) - Deployment instructions
@@ -55,7 +55,7 @@ kubectl top nodes
 
 ## Getting Help
 
-- Check [runbooks/troubleshooting.md](../runbooks/troubleshooting.md) for detailed procedures
+- Check [runbooks/troubleshooting.md](../../runbooks/troubleshooting.md) for detailed procedures
 - Review [FAQ](FAQ.md) for common questions
 - Review monitoring dashboards
 - Check logs in Loki
@@ -65,4 +65,3 @@ kubectl top nodes
 > **Related Documentation**:
 > - [FAQ](FAQ.md) - Frequently asked questions
 > - [Best Practices](BEST_PRACTICES.md) - Best practices for operations
-
diff --git a/docs/guides/VALIDATION_GUIDE.md b/docs/guides/VALIDATION_GUIDE.md
index 0dac116..9bea611 100644
--- a/docs/guides/VALIDATION_GUIDE.md
+++ b/docs/guides/VALIDATION_GUIDE.md
@@ -143,7 +143,6 @@ After validation:
 
 ## References
 
-- [Deployment Guide](DEPLOYMENT.md)
+- [Deployment Guide](../deployment/DEPLOYMENT.md)
 - [Troubleshooting Guide](TROUBLESHOOTING.md)
 - [Runbooks](../runbooks/)
-
diff --git a/docs/integration/EMONEY_INTEGRATION_GUIDE.md b/docs/integration/EMONEY_INTEGRATION_GUIDE.md
index 6dcc891..80c1ed5 100644
--- a/docs/integration/EMONEY_INTEGRATION_GUIDE.md
+++ b/docs/integration/EMONEY_INTEGRATION_GUIDE.md
@@ -245,7 +245,7 @@ forge test --match-path "test/emoney/invariants/**"
 
 ## Upgrading Token Implementation
 
-See [UPGRADE_PROCEDURE.md](../../../gru_emoney_token-factory/docs/UPGRADE_PROCEDURE.md) for detailed upgrade procedures.
+See external `gru_emoney_token-factory/docs/UPGRADE_PROCEDURE.md` in the token factory repository for detailed upgrade procedures.
 
 ### Quick Upgrade Steps
 
@@ -352,8 +352,7 @@ address token = factory.deployToken(name, symbol, config);
 
 ## References
 
-- [eMoney Token Factory README](../../../gru_emoney_token-factory/README.md)
-- [Upgrade Procedure](../../../gru_emoney_token-factory/docs/UPGRADE_PROCEDURE.md)
-- [Architecture Decision Records](../../../gru_emoney_token-factory/docs/ADRs/)
+- External eMoney Token Factory README: `gru_emoney_token-factory/README.md`
+- External Upgrade Procedure: `gru_emoney_token-factory/docs/UPGRADE_PROCEDURE.md`
+- External Architecture Decision Records: `gru_emoney_token-factory/docs/ADRs/`
 - [Integration Status](./INTEGRATION_STATUS.md)
-
diff --git a/docs/integration/FINAL_INTEGRATION_SUMMARY.md b/docs/integration/FINAL_INTEGRATION_SUMMARY.md
index 25b43c2..7dfa443 100644
--- a/docs/integration/FINAL_INTEGRATION_SUMMARY.md
+++ b/docs/integration/FINAL_INTEGRATION_SUMMARY.md
@@ -1,13 +1,15 @@
 # Final Integration Summary
 
 **Date**: 2025-01-27
-**Status**: ✅ **ALL INTEGRATIONS COMPLETE**
+**Status**: Historical integration snapshot
+
+This document captures a point-in-time integration milestone. Validate deployment readiness against the current integration, deployment, and testing docs before treating it as live status.
 
 ---
 
 ## Executive Summary
 
-Both **eMoney Token Factory** and **Reserve System** have been successfully integrated into `smom-dbis-138`. All contracts, tests, deployment scripts, and documentation are complete and ready for deployment to ChainID 138.
+Both **eMoney Token Factory** and **Reserve System** had been integrated into `smom-dbis-138` at the time of this summary. Treat this as historical project context rather than a current deployment certification.
 
 ---
 
@@ -376,9 +378,9 @@ forge test --match-path "test/**"
 | **Scripts** | ✅ Complete | 7 files | 100% |
 | **Documentation** | ✅ Complete | 4 files | 100% |
 
-### Overall Status: ✅ **100% COMPLETE**
+### Overall Status: Historical milestone snapshot
 
-All integrations are complete and ready for deployment to ChainID 138. The system is production-ready with comprehensive testing, documentation, and deployment scripts.
+At the time of this summary, the integrations had reached a strong implementation milestone with comprehensive testing, documentation, and deployment scripts.
 
 ---
 
@@ -387,4 +389,3 @@ All integrations are complete and ready for deployment to ChainID 138. The syste
 Both **eMoney Token Factory** and **Reserve System** have been successfully integrated into `smom-dbis-138`. All contracts are implemented, tested, and documented. The system is ready for deployment to ChainID 138 (DeFi Oracle Meta Mainnet).
 
 **Next Action**: Deploy to ChainID 138 testnet and verify functionality.
-
diff --git a/docs/integration/INTEGRATION_STATUS.md b/docs/integration/INTEGRATION_STATUS.md
index 4c688b8..57bdab0 100644
--- a/docs/integration/INTEGRATION_STATUS.md
+++ b/docs/integration/INTEGRATION_STATUS.md
@@ -354,8 +354,7 @@ Both `gru_emoney_token-factory` and `gru_reserve_system` exist as **separate pro
 
 ## References
 
-- [eMoney Token Factory README](../../../gru_emoney_token-factory/README.md)
-- [Reserve System Whitepaper](../../../dbis_docs/gru_reserve_system/GRU_Reserve_System_Whitepaper.md)
+- External eMoney Token Factory README: `gru_emoney_token-factory/README.md`
+- External Reserve System Whitepaper: `dbis_docs/gru_reserve_system/GRU_Reserve_System_Whitepaper.md`
 - [smom-dbis-138 Contract Inventory](../guides/CONTRACT_INVENTORY.md)
 - [Integration Guide](../guides/INTEGRATION_GUIDE.md)
-
diff --git a/docs/integration/ORACLE_AND_KEEPER_CHAIN138.md b/docs/integration/ORACLE_AND_KEEPER_CHAIN138.md
index ad1fbe4..4707e5f 100644
--- a/docs/integration/ORACLE_AND_KEEPER_CHAIN138.md
+++ b/docs/integration/ORACLE_AND_KEEPER_CHAIN138.md
@@ -17,7 +17,7 @@ Set in project `.env` (and in token-aggregation or relay when they consume oracl
 | `RESERVE_SYSTEM` | ReserveSystem address (Chain 138). Required for DODOPMMIntegration oracle-backed mid price. |
 | `RPC_URL_138` / `RPC_URL` | RPC endpoint for Chain 138 (keeper and scripts). |
 
-References: [DEPLOYMENT_COMPLETE_GUIDE.md](../deployment/DEPLOYMENT_COMPLETE_GUIDE.md), [DEPLOYMENT_CHECKLIST.md](../DEPLOYMENT_CHECKLIST.md), [PARALLEL_COMPLETION_TASK_LIST.md](../PARALLEL_COMPLETION_TASK_LIST.md).
+References: [DEPLOYMENT_COMPLETE_GUIDE.md](../deployment/DEPLOYMENT_COMPLETE_GUIDE.md), [DEPLOYMENT_CHECKLIST.md](../deployment/DEPLOYMENT_CHECKLIST.md), [MASTER_TASK_LIST.md](../operations/tasks/MASTER_TASK_LIST.md).
 
 ---
 
diff --git a/docs/integration/PRICE_FEED_AND_RESERVES_COMPLETE.md b/docs/integration/PRICE_FEED_AND_RESERVES_COMPLETE.md
index a0553b9..1fc4e98 100644
--- a/docs/integration/PRICE_FEED_AND_RESERVES_COMPLETE.md
+++ b/docs/integration/PRICE_FEED_AND_RESERVES_COMPLETE.md
@@ -313,5 +313,4 @@ All price feed and reserve assets configuration components are complete and read
 - [Price Feed Setup Guide](./PRICE_FEED_SETUP.md)
 - [Reserve Assets Configuration](./RESERVE_ASSETS_CONFIG.md)
 - [Reserve System Integration](./INTEGRATION_COMPLETE.md)
-- [Oracle System Documentation](../oracle/README.md)
-
+- [Price Feed Setup Guide](./PRICE_FEED_SETUP.md)
diff --git a/docs/integration/PRICE_FEED_SETUP.md b/docs/integration/PRICE_FEED_SETUP.md
index d4a1cf8..f17aaa7 100644
--- a/docs/integration/PRICE_FEED_SETUP.md
+++ b/docs/integration/PRICE_FEED_SETUP.md
@@ -313,6 +313,5 @@ done
 ## References
 
 - [Reserve System Documentation](./INTEGRATION_COMPLETE.md)
-- [Oracle System Documentation](../oracle/README.md)
+- [Price Feed and Reserve Summary](./PRICE_FEED_AND_RESERVES_COMPLETE.md)
 - [Chainlink Price Feeds](https://docs.chain.link/data-feeds/price-feeds)
-
diff --git a/docs/operations/WRAP_AND_BRIDGE_WETH9_TO_MAINNET.md b/docs/operations/WRAP_AND_BRIDGE_WETH9_TO_MAINNET.md
index 8f3fe90..71c3fa1 100644
--- a/docs/operations/WRAP_AND_BRIDGE_WETH9_TO_MAINNET.md
+++ b/docs/operations/WRAP_AND_BRIDGE_WETH9_TO_MAINNET.md
@@ -243,11 +243,10 @@ export RPC_URL_138=http://192.168.11.250:8545
 
 ## Related Documentation
 
-- [Bridge Addresses Reference](../ALL_BRIDGE_ADDRESSES_AND_ROUTES.md)
-- [CCIP Integration Guide](../ccip-integration/CCIP_BRIDGE_GUIDE.md)
+- [Bridge Addresses Reference (Archived)](../../../docs/archive/historical/ALL_BRIDGE_ADDRESSES_AND_ROUTES.md)
+- [CCIP Integration Guide](../operations/integrations/CCIP_INTEGRATION.md)
 - [WETH9 Contract Documentation](../architecture/PREDEPLOYED_WETH_ARCHITECTURE.md)
 
 ---
 
 **Last Updated**: 2025-01-12
-
diff --git a/docs/operations/integrations/CCIP_FEES.md b/docs/operations/integrations/CCIP_FEES.md
index ff9e60a..d111e70 100644
--- a/docs/operations/integrations/CCIP_FEES.md
+++ b/docs/operations/integrations/CCIP_FEES.md
@@ -162,7 +162,6 @@ Check refund status in transaction logs.
 
 ## References
 
-- [CCIP Integration Guide](docs/CCIP_INTEGRATION.md)
-- [CCIP Router Setup](docs/CCIP_ROUTER_SETUP.md)
+- [CCIP Integration Guide](CCIP_INTEGRATION.md)
+- [CCIP Router Setup](CCIP_ROUTER_SETUP.md)
 - [Chainlink CCIP Fees](https://docs.chain.link/ccip/fees)
-
diff --git a/docs/operations/integrations/CCIP_INTEGRATION.md b/docs/operations/integrations/CCIP_INTEGRATION.md
index 47c80d6..157bf94 100644
--- a/docs/operations/integrations/CCIP_INTEGRATION.md
+++ b/docs/operations/integrations/CCIP_INTEGRATION.md
@@ -149,7 +149,6 @@ See `monitoring/prometheus/alerts/ccip.yml` for alerting rules.
 ## References
 
 - [Chainlink CCIP Documentation](https://docs.chain.link/ccip)
-- [CCIP Router Setup Guide](docs/CCIP_ROUTER_SETUP.md)
-- [CCIP Message Format](docs/CCIP_MESSAGE_FORMAT.md)
-- [CCIP Fees](docs/CCIP_FEES.md)
-
+- [CCIP Router Setup Guide](CCIP_ROUTER_SETUP.md)
+- [CCIP Message Format](CCIP_MESSAGE_FORMAT.md)
+- [CCIP Fees](CCIP_FEES.md)
diff --git a/docs/operations/integrations/CCIP_MESSAGE_FORMAT.md b/docs/operations/integrations/CCIP_MESSAGE_FORMAT.md
index 4be1106..503838d 100644
--- a/docs/operations/integrations/CCIP_MESSAGE_FORMAT.md
+++ b/docs/operations/integrations/CCIP_MESSAGE_FORMAT.md
@@ -141,7 +141,6 @@ require(roundId > lastRoundId, "Invalid round ID");
 
 ## References
 
-- [CCIP Integration Guide](docs/CCIP_INTEGRATION.md)
-- [CCIP Router Setup](docs/CCIP_ROUTER_SETUP.md)
+- [CCIP Integration Guide](CCIP_INTEGRATION.md)
+- [CCIP Router Setup](CCIP_ROUTER_SETUP.md)
 - [Chainlink CCIP Documentation](https://docs.chain.link/ccip)
-
diff --git a/docs/operations/integrations/CCIP_ROUTER_SETUP.md b/docs/operations/integrations/CCIP_ROUTER_SETUP.md
index bc084e7..3833fb0 100644
--- a/docs/operations/integrations/CCIP_ROUTER_SETUP.md
+++ b/docs/operations/integrations/CCIP_ROUTER_SETUP.md
@@ -184,6 +184,5 @@ See `monitoring/prometheus/alerts/ccip.yml` for alerting rules.
 ## References
 
 - [Chainlink CCIP Documentation](https://docs.chain.link/ccip)
-- [CCIP Integration Guide](docs/CCIP_INTEGRATION.md)
-- [CCIP Message Format](docs/CCIP_MESSAGE_FORMAT.md)
-
+- [CCIP Integration Guide](CCIP_INTEGRATION.md)
+- [CCIP Message Format](CCIP_MESSAGE_FORMAT.md)
diff --git a/docs/operations/integrations/CCIP_TROUBLESHOOTING.md b/docs/operations/integrations/CCIP_TROUBLESHOOTING.md
index 45dd72f..30903da 100644
--- a/docs/operations/integrations/CCIP_TROUBLESHOOTING.md
+++ b/docs/operations/integrations/CCIP_TROUBLESHOOTING.md
@@ -215,9 +215,8 @@ function pause() external onlyAdmin {
 
 ## References
 
-- [CCIP Integration Guide](docs/CCIP_INTEGRATION.md)
-- [CCIP Router Setup](docs/CCIP_ROUTER_SETUP.md)
-- [CCIP Message Format](docs/CCIP_MESSAGE_FORMAT.md)
-- [CCIP Fees](docs/CCIP_FEES.md)
+- [CCIP Integration Guide](CCIP_INTEGRATION.md)
+- [CCIP Router Setup](CCIP_ROUTER_SETUP.md)
+- [CCIP Message Format](CCIP_MESSAGE_FORMAT.md)
+- [CCIP Fees](CCIP_FEES.md)
 - [Chainlink CCIP Support](https://chain.link/support)
-
diff --git a/docs/operations/integrations/FIREFLY_INTEGRATION.md b/docs/operations/integrations/FIREFLY_INTEGRATION.md
index 6e44866..29867fe 100644
--- a/docs/operations/integrations/FIREFLY_INTEGRATION.md
+++ b/docs/operations/integrations/FIREFLY_INTEGRATION.md
@@ -131,11 +131,10 @@ Firefly enables tokenization of:
 - **Assets**: Real-world assets
 - **Data**: Any digital data
 
-See [Financial Tokenization Service](../services/financial-tokenization/) for details.
+See [Financial Tokenization Service](../../../services/financial-tokenization/) for details.
 
 ## References
 
 - [Firefly Documentation](https://hyperledger.github.io/firefly/)
 - [Firefly API](https://hyperledger.github.io/firefly/api/)
 - [Firefly Tokens](https://hyperledger.github.io/firefly/tokens/)
-
diff --git a/docs/operations/integrations/METAMASK_BD.md b/docs/operations/integrations/METAMASK_BD.md
index c2c4696..3592361 100644
--- a/docs/operations/integrations/METAMASK_BD.md
+++ b/docs/operations/integrations/METAMASK_BD.md
@@ -84,7 +84,7 @@ We are reaching out to request native MetaMask feature support for ChainID 138 (
 **About ChainID 138**:
 - ChainID: 138 (0x8a)
 - Network: DeFi Oracle Meta Mainnet
-- Consensus: IBFT 2.0 (Istanbul BFT)
+- Consensus: QBFT
 - Block Time: ~2 seconds
 - Finality: Immediate (BFT)
 - RPC: https://rpc.d-bis.org
@@ -129,7 +129,7 @@ Best regards,
 ### Technical Specifications
 
 - **ChainID**: 138
-- **Consensus**: IBFT 2.0
+- **Consensus**: QBFT
 - **Block Time**: ~2 seconds
 - **Finality**: Immediate
 - **RPC Endpoints**: 2+ high-availability endpoints
@@ -198,4 +198,3 @@ Track updates and communications:
 - [Consensys Website](https://consensys.io)
 - [MetaMask Support](https://support.metamask.io)
 - [SEC Swaps Scrutiny](https://www.reuters.com/legal/us-sec-sues-blockchain-software-technology-company-consensys-2024-06-28/)
-
diff --git a/docs/operations/integrations/METAMASK_DEVELOPER_GUIDE.md b/docs/operations/integrations/METAMASK_DEVELOPER_GUIDE.md
index 967583a..d6ecc2c 100644
--- a/docs/operations/integrations/METAMASK_DEVELOPER_GUIDE.md
+++ b/docs/operations/integrations/METAMASK_DEVELOPER_GUIDE.md
@@ -302,8 +302,7 @@ global.window.ethereum = createMockMetaMask();
 
 ## References
 
-- [MetaMask SDK Documentation](../metamask-sdk/README.md)
+- [MetaMask SDK Documentation](../../../metamask-sdk/README.md)
 - [MetaMask Integration Guide](./METAMASK_INTEGRATION.md)
-- [Quick Start Guide](../metamask/QUICK_START.md)
+- [Quick Start Guide](../../../metamask/QUICK_START.md)
 - [MetaMask Documentation](https://docs.metamask.io)
-
diff --git a/docs/operations/status-reports/STATUS_REPORTS_INDEX.md b/docs/operations/status-reports/STATUS_REPORTS_INDEX.md
index 9967514..20683a0 100644
--- a/docs/operations/status-reports/STATUS_REPORTS_INDEX.md
+++ b/docs/operations/status-reports/STATUS_REPORTS_INDEX.md
@@ -1,138 +1,38 @@
 # Status Reports Index
 
-**Last Updated**: 2025-01-27  
-**Status**: Active
+**Last Updated**: 2026-04-12  
+**Status**: Active index, legacy reports archived
 
-This index categorizes all status reports in this directory. Status reports older than 6 months should be archived to `docs/archive/status-reports/`.
+This directory now acts as a small routing layer between the active status docs
+we still use and the large historical report sets that were moved into
+`docs/archive/status-reports/`.
 
-## Current Status Reports (Active)
+## Active Status Entry Points
 
-### Project Status
-- [PROJECT_REVIEW.md](PROJECT_REVIEW.md) - Project review
-- [PROJECT_REVIEW_AND_CLEANUP.md](PROJECT_REVIEW_AND_CLEANUP.md) - Review and cleanup
-- [PROJECT_UPDATE_SUMMARY.md](PROJECT_UPDATE_SUMMARY.md) - Project update summary
-- [FINAL_PROJECT_STATUS.md](FINAL_PROJECT_STATUS.md) - Final project status
+- [../../STATUS_AND_TOKEN_ROUTING.md](../../STATUS_AND_TOKEN_ROUTING.md) - Current contract, token-routing, and service status.
+- [../../MASTER_CONTRACTS_AND_INFRASTRUCTURE_LIST.md](../../MASTER_CONTRACTS_AND_INFRASTRUCTURE_LIST.md) - Current active contract and infrastructure inventory.
+- [../../DEPLOYMENT_STATUS_AND_NEXT_STEPS.md](../../DEPLOYMENT_STATUS_AND_NEXT_STEPS.md) - Current deployment posture and next actions.
+- [../../deployment/COMPILATION_STATUS.md](../../deployment/COMPILATION_STATUS.md) - Current contract compilation notes and exceptions.
+- [../../architecture/FOUNDRY_MONOREPO_SCOPES.md](../../architecture/FOUNDRY_MONOREPO_SCOPES.md) - Current Forge scoping and compile-surface policy.
+- [../tasks/TODO.md](../tasks/TODO.md) - Active task backlog.
 
-### Deployment Status
-- [DEPLOYMENT_STATUS.md](DEPLOYMENT_STATUS.md) - Deployment status
-- [COMPLETE_DEPLOYMENT_STATUS.md](COMPLETE_DEPLOYMENT_STATUS.md) - Complete deployment status
-- [FINAL_DEPLOYMENT_STATUS.md](FINAL_DEPLOYMENT_STATUS.md) - Final deployment status
-- [FINAL_DEPLOYMENT_PLAN.md](FINAL_DEPLOYMENT_PLAN.md) - Final deployment plan
-- [INFRASTRUCTURE_DEPLOYMENT_STATUS.md](INFRASTRUCTURE_DEPLOYMENT_STATUS.md) - Infrastructure deployment status
-- [INFRASTRUCTURE_STATUS_ANALYSIS.md](INFRASTRUCTURE_STATUS_ANALYSIS.md) - Infrastructure status analysis
-- [INFRASTRUCTURE_STATUS_EXPLANATION.md](INFRASTRUCTURE_STATUS_EXPLANATION.md) - Infrastructure status explanation
-- [CLOUD_SOVEREIGNTY_STATUS.md](CLOUD_SOVEREIGNTY_STATUS.md) - Cloud sovereignty status
-- [CLOUD_SOVEREIGNTY_DEPLOYMENT_COMPLETE.md](CLOUD_SOVEREIGNTY_DEPLOYMENT_COMPLETE.md) - Cloud sovereignty deployment complete
+## Archived Report Collections
 
-### Completion Reports
-- [COMPLETION_REPORT.md](COMPLETION_REPORT.md) - Completion report
-- [COMPLETION_REPORT_FINAL.md](COMPLETION_REPORT_FINAL.md) - Final completion report
-- [COMPLETION_STATUS.md](COMPLETION_STATUS.md) - Completion status
-- [COMPLETION_SUMMARY.md](COMPLETION_SUMMARY.md) - Completion summary
-- [COMPLETION_SUMMARY_METAMASK.md](COMPLETION_SUMMARY_METAMASK.md) - MetaMask completion summary
-- [FINAL_COMPLETION_REPORT.md](FINAL_COMPLETION_REPORT.md) - Final completion report
-- [FINAL_COMPLETION_STATUS.md](FINAL_COMPLETION_STATUS.md) - Final completion status
-- [FINAL_COMPLETE_REPORT.md](FINAL_COMPLETE_REPORT.md) - Final complete report
-- [FINAL_COMPLETE_STATUS.md](FINAL_COMPLETE_STATUS.md) - Final complete status
-- [FINAL_SUMMARY.md](FINAL_SUMMARY.md) - Final summary
+- [../../archive/status-reports/README.md](../../archive/status-reports/README.md) - Archive overview.
+- [../../archive/status-reports/operations-legacy/README.md](../../archive/status-reports/operations-legacy/README.md) - Historical files formerly in `docs/operations/status-reports/`.
+- [../../archive/status-reports/docs-root-legacy/README.md](../../archive/status-reports/docs-root-legacy/README.md) - Historical report-style files formerly in `docs/`.
+- [../../archive/status-reports/repo-root-legacy/README.md](../../archive/status-reports/repo-root-legacy/README.md) - Historical report-style files formerly in the repository root.
+- [../../archive/status-reports/phase1/](../../archive/status-reports/phase1/) - Older phase-1 archives retained from previous cleanup passes.
+- [../../archive/status-reports/phase1-old/](../../archive/status-reports/phase1-old/) - Additional early legacy reports.
 
-### Task Completion
-- [COMPLETE_ALL_TASKS_SUMMARY.md](COMPLETE_ALL_TASKS_SUMMARY.md) - Complete all tasks summary
-- [COMPLETE_DEPLOYMENT_STATUS.md](COMPLETE_DEPLOYMENT_STATUS.md) - Complete deployment status
-- [COMPLETE_ENTERPRISE_TASK_SUMMARY.md](COMPLETE_ENTERPRISE_TASK_SUMMARY.md) - Complete enterprise task summary
-- [COMPLETE_NEXT_STEPS_REPORT.md](COMPLETE_NEXT_STEPS_REPORT.md) - Complete next steps report
-- [COMPLETE_TASK_SUMMARY.md](COMPLETE_TASK_SUMMARY.md) - Complete task summary
-- [TASK_COMPLETION_REPORT.md](TASK_COMPLETION_REPORT.md) - Task completion report
-- [ALL_TASKS_COMPLETE.md](ALL_TASKS_COMPLETE.md) - All tasks complete
-- [ALL_MANUAL_STEPS_COMPLETE.md](ALL_MANUAL_STEPS_COMPLETE.md) - All manual steps complete
-- [ALL_NEXT_STEPS_COMPLETE.md](ALL_NEXT_STEPS_COMPLETE.md) - All next steps complete
-- [ALL_NEXT_STEPS_COMPLETE_FINAL.md](ALL_NEXT_STEPS_COMPLETE_FINAL.md) - All next steps complete (final)
+## Usage Notes
 
-### TODO Status
-- [TODO_STATUS_REPORT.md](TODO_STATUS_REPORT.md) - TODO status report
-- [TODO_COMPLETION_SUMMARY.md](TODO_COMPLETION_SUMMARY.md) - TODO completion summary
-- [TODO_COMPLETE_SUMMARY.md](TODO_COMPLETE_SUMMARY.md) - TODO complete summary
-- [FINAL_TODO_STATUS.md](FINAL_TODO_STATUS.md) - Final TODO status
-
-### Next Steps
-- [NEXT_STEPS_STATUS.md](NEXT_STEPS_STATUS.md) - Next steps status
-- [NEXT_STEPS_COMPLETED.md](NEXT_STEPS_COMPLETED.md) - Next steps completed
-
-### Execution Reports
-- [EXECUTION_ROADMAP.md](EXECUTION_ROADMAP.md) - Execution roadmap
-- [EXECUTION_COMPLETE_SUMMARY.md](EXECUTION_COMPLETE_SUMMARY.md) - Execution complete summary
-- [PARALLEL_EXECUTION_REPORT.md](PARALLEL_EXECUTION_REPORT.md) - Parallel execution report
-- [PARALLEL_EXECUTION_COMPLETE.md](PARALLEL_EXECUTION_COMPLETE.md) - Parallel execution complete
-- [FINAL_PARALLEL_EXECUTION_REPORT.md](FINAL_PARALLEL_EXECUTION_REPORT.md) - Final parallel execution report
-
-### Deployment Strategy
-- [PARALLEL_DEPLOYMENT_STRATEGY.md](PARALLEL_DEPLOYMENT_STRATEGY.md) - Parallel deployment strategy
-- [PARALLEL_DEPLOYMENT_COMPARISON.md](PARALLEL_DEPLOYMENT_COMPARISON.md) - Parallel deployment comparison
-- [MAXIMUM_PARALLEL_DEPLOYMENT.md](MAXIMUM_PARALLEL_DEPLOYMENT.md) - Maximum parallel deployment
-- [OPTIMIZED_24_REGIONS_240_VCPUS.md](OPTIMIZED_24_REGIONS_240_VCPUS.md) - Optimized 24 regions 240 VCPUs
-- [OPTIMIZED_24_REGIONS_NO_WESTEUROPE.md](OPTIMIZED_24_REGIONS_NO_WESTEUROPE.md) - Optimized 24 regions no West Europe
-- [OPTIMIZED_240_VCPU_DEPLOYMENT.md](OPTIMIZED_240_VCPU_DEPLOYMENT.md) - Optimized 240 VCPU deployment
-- [OPTIMIZED_MAX_VALIDATORS.md](OPTIMIZED_MAX_VALIDATORS.md) - Optimized max validators
-
-### Analysis Reports
-- [GAP_ANALYSIS.md](GAP_ANALYSIS.md) - Gap analysis
-- [FORK_ANALYSIS.md](FORK_ANALYSIS.md) - Fork analysis
-- [QUOTA_ANALYSIS_COMPLETE.md](QUOTA_ANALYSIS_COMPLETE.md) - Quota analysis complete
-- [REAL_TIME_COST_ESTIMATES.md](REAL_TIME_COST_ESTIMATES.md) - Real-time cost estimates
-- [FINAL_COST_ESTIMATES.md](FINAL_COST_ESTIMATES.md) - Final cost estimates
-- [DEPLOYABLE_WITHOUT_QUOTA_INCREASE.md](DEPLOYABLE_WITHOUT_QUOTA_INCREASE.md) - Deployable without quota increase
-
-### Reviews and Recommendations
-- [REVIEW_AND_RECOMMENDATIONS.md](REVIEW_AND_RECOMMENDATIONS.md) - Review and recommendations
-- [REVIEW_SUMMARY.md](REVIEW_SUMMARY.md) - Review summary
-- [RECOMMENDATIONS.md](RECOMMENDATIONS.md) - Recommendations
-- [RECOMMENDATIONS_AND_SUGGESTIONS.md](RECOMMENDATIONS_AND_SUGGESTIONS.md) - Recommendations and suggestions
-- [RECOMMENDATIONS_QUICK_FIXES.md](RECOMMENDATIONS_QUICK_FIXES.md) - Recommendations quick fixes
-- [REVIEW_HPA.md](REVIEW_HPA.md) - Review HPA
-- [REVIEW_NETWORK_POLICIES.md](REVIEW_NETWORK_POLICIES.md) - Review network policies
-- [REVIEW_RBAC.md](REVIEW_RBAC.md) - Review RBAC
-
-### Existing Deployments
-- [EXISTING_DEPLOYMENTS_REPORT.md](EXISTING_DEPLOYMENTS_REPORT.md) - Existing deployments report
-- [EXISTING_DEPLOYMENTS_STATUS.md](EXISTING_DEPLOYMENTS_STATUS.md) - Existing deployments status
-- [MAINNET_CONTRACTS_COMPLETE_LIST.md](MAINNET_CONTRACTS_COMPLETE_LIST.md) - Mainnet contracts complete list
-
-### Scripts and Commands
-- [SCRIPTS_INDEX.md](SCRIPTS_INDEX.md) - Scripts index
-- [SCRIPTS_INVENTORY.md](SCRIPTS_INVENTORY.md) - Scripts inventory
-- [SCRIPTS_QA_REPORT.md](SCRIPTS_QA_REPORT.md) - Scripts QA report
-- [SCRIPTS_ADOPTION_PLAN.md](SCRIPTS_ADOPTION_PLAN.md) - Scripts adoption plan
-- [COMMANDS_INDEX.md](COMMANDS_INDEX.md) - Commands index
-
-### Other Reports
-- [TERRAFORM_STATUS.md](TERRAFORM_STATUS.md) - Terraform status
-- [RPC_SLO.md](RPC_SLO.md) - RPC SLO
-- [WALLET_REQUIREMENTS.md](WALLET_REQUIREMENTS.md) - Wallet requirements
-- [CREATE_VS_CREATE2_ADDRESSES.md](CREATE_VS_CREATE2_ADDRESSES.md) - CREATE vs CREATE2 addresses
-- [DECISION_TREE.md](DECISION_TREE.md) - Decision tree
-- [FINANCIAL_TOKENIZATION.md](FINANCIAL_TOKENIZATION.md) - Financial tokenization
-- [IMPLEMENTATION_ROADMAP.md](IMPLEMENTATION_ROADMAP.md) - Implementation roadmap
-- [CHAIN138_VERIFICATION_REPORT.md](CHAIN138_VERIFICATION_REPORT.md) - Chain138 verification report
-- [CHANGES_SUMMARY.md](CHANGES_SUMMARY.md) - Changes summary
-- [COLOR_VARS_CLEANUP.md](COLOR_VARS_CLEANUP.md) - Color vars cleanup
-- [DOCS_CLEANUP_LOG.md](DOCS_CLEANUP_LOG.md) - Docs cleanup log
-- [PROJECT_CLEANUP_LOG.md](PROJECT_CLEANUP_LOG.md) - Project cleanup log
-- [THE_FIX.md](THE_FIX.md) - The fix
-- [UPDATE_COMPLETE.md](UPDATE_COMPLETE.md) - Update complete
-- [ALL-38-ERRORS-LIST.md](ALL-38-ERRORS-LIST.md) - All 38 errors list
-
-## Archive Policy
-
-Status reports older than 6 months should be archived to `docs/archive/status-reports/`. 
-
-**Review Schedule**: Quarterly (every 3 months)
+- Treat files under `docs/archive/status-reports/` as historical context, not live runbooks.
+- Some archived docs intentionally preserve old paths, assumptions, or stale links.
+- New operational state should land in runbooks, deployment docs, or explicit reference pages instead of creating another large status-report pile.
 
 ## Related Documentation
 
 - [Master Documentation Index](../../MASTER_DOCUMENTATION_INDEX.md)
-- [Documentation Review](../../DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md)
-
----
-
-**Last Updated**: 2025-01-27
-
+- [Archive README](../../archive/README.md)
+- [Archive Policy](../../archive/ARCHIVE_POLICY.md)
diff --git a/docs/operations/tasks/ACTION_ITEMS.md b/docs/operations/tasks/ACTION_ITEMS.md
index 8859338..e5a4dac 100644
--- a/docs/operations/tasks/ACTION_ITEMS.md
+++ b/docs/operations/tasks/ACTION_ITEMS.md
@@ -1,12 +1,17 @@
 # Action Items and Recommendations
 
+**Last Reviewed**: 2026-04-13  
+**Status**: Historical action-list snapshot
+
+This document preserves an earlier gap-analysis action list. Validate items here against current deployment docs and `docs/PROJECT_OPTIMIZATION_STATUS.md` before executing them.
+
 ## Critical Action Items (Do First)
 
 ### 1. Fix Genesis ExtraData ⚠️ CRITICAL
 **Status**: ❌ Not fixed  
 **Priority**: 🔴 Critical  
 **Effort**: 2-4 hours  
-**Files**: `config/genesis.json`, `scripts/generate-genesis.sh`
+**Files**: `config/genesis.json`, `scripts/generate-genesis-proper.sh`
 
 **Action**:
 ```bash
@@ -18,6 +23,8 @@ jq '.extraData' config/genesis.json
 # Should NOT be "0x" or empty
 ```
 
+Legacy wrappers remain available, but the canonical QBFT path is `./scripts/generate-genesis-proper.sh`.
+
 **Validation**:
 - [ ] extraData is not empty
 - [ ] extraData starts with "0x" and has content
@@ -361,7 +368,7 @@ kubectl get secrets -n besu-network
 - ✅ No security vulnerabilities from hardcoded secrets
 
 ### Phase 2 (Weeks 2-3)
-- ✅ Infrastructure is production-ready
+- ✅ Infrastructure is ready for staged operational rollout
 - ✅ Security is hardened
 - ✅ Monitoring is comprehensive
 - ✅ Smart contracts are audited
@@ -397,8 +404,7 @@ kubectl get secrets -n besu-network
 
 ## References
 
-- [PROJECT_REVIEW.md](PROJECT_REVIEW.md) - Comprehensive project review
-- [RECOMMENDATIONS_QUICK_FIXES.md](RECOMMENDATIONS_QUICK_FIXES.md) - Quick fixes guide
-- [IMPLEMENTATION_ROADMAP.md](IMPLEMENTATION_ROADMAP.md) - Implementation roadmap
-- [REVIEW_SUMMARY.md](REVIEW_SUMMARY.md) - Review summary
-
+- [PROJECT_REVIEW.md](../../project-reviews/PROJECT_REVIEW.md) - Comprehensive project review
+- [RECOMMENDATIONS_QUICK_FIXES.md](../../archive/status-reports/operations-legacy/RECOMMENDATIONS_QUICK_FIXES.md) - Historical quick fixes guide
+- [IMPLEMENTATION_ROADMAP.md](../../archive/status-reports/operations-legacy/IMPLEMENTATION_ROADMAP.md) - Historical implementation roadmap
+- [REVIEW_SUMMARY.md](../../archive/status-reports/operations-legacy/REVIEW_SUMMARY.md) - Historical review summary
diff --git a/docs/operations/tasks/NEXT_STEPS.md b/docs/operations/tasks/NEXT_STEPS.md
index 720ac72..e4c7f92 100644
--- a/docs/operations/tasks/NEXT_STEPS.md
+++ b/docs/operations/tasks/NEXT_STEPS.md
@@ -2,6 +2,11 @@
 
 Comprehensive list of all next steps to complete the deployment and integration of ChainID 138.
 
+**Last Reviewed**: 2026-04-13  
+**Status**: Historical next-steps snapshot
+
+This document preserves an earlier deployment sequence. Check `docs/deployment/MASTER_INDEX.md` and `docs/PROJECT_OPTIMIZATION_STATUS.md` for the current operator view before executing tasks below.
+
 ## Overview
 
 This document provides a prioritized list of all next steps required to complete the deployment and integration of ChainID 138, including infrastructure deployment, contract deployment, DNS configuration, and MetaMask integration.
@@ -388,11 +393,11 @@ This document provides a prioritized list of all next steps required to complete
 
 ## 🔗 Related Documentation
 
-- [Deployment Guide](DEPLOYMENT.md)
-- [MetaMask Integration Guide](METAMASK_INTEGRATION.md)
-- [MetaMask Gaps Analysis](METAMASK_GAPS_ANALYSIS.md)
-- [MetaMask Completion Summary](COMPLETION_SUMMARY_METAMASK.md)
-- [Quick Start Guide](QUICKSTART.md)
+- [Deployment Guide](../../deployment/DEPLOYMENT.md)
+- [MetaMask Integration Guide](../integrations/METAMASK_INTEGRATION.md)
+- [MetaMask Gaps Analysis](../integrations/METAMASK_GAPS_ANALYSIS.md)
+- [MetaMask Completion Summary (Archived)](../../archive/status-reports/operations-legacy/COMPLETION_SUMMARY_METAMASK.md)
+- [Quick Start Guide](../../guides/QUICKSTART.md)
 - [TODO List](TODO.md)
 
 ## 📝 Notes
@@ -419,7 +424,7 @@ Run verification after each deployment step:
 ```
 
 ### Troubleshooting
-See [Troubleshooting Guide](TROUBLESHOOTING.md) for common issues and solutions.
+See [Troubleshooting Guide](../../guides/TROUBLESHOOTING.md) for common issues and solutions.
 
 ## 🎯 Success Criteria
 
@@ -451,4 +456,3 @@ For issues or questions:
 - Contact the project team
 - Review documentation
 - Check troubleshooting guide
-
diff --git a/docs/operations/tasks/NEXT_STEPS_LIST.md b/docs/operations/tasks/NEXT_STEPS_LIST.md
index 42238e3..2c58e3d 100644
--- a/docs/operations/tasks/NEXT_STEPS_LIST.md
+++ b/docs/operations/tasks/NEXT_STEPS_LIST.md
@@ -2,6 +2,11 @@
 
 Complete list of all next steps organized by priority and category.
 
+**Last Reviewed**: 2026-04-13  
+**Status**: Historical next-steps snapshot
+
+This document preserves an earlier deployment checklist. Use `docs/deployment/MASTER_INDEX.md` and `docs/PROJECT_OPTIMIZATION_STATUS.md` as the current operator entry points.
+
 ## 📊 Overview
 
 - **Total Tasks**: 30 (15 deployment + 10 integration + 5 pre-production)
@@ -68,7 +73,7 @@ Complete list of all next steps organized by priority and category.
 - [ ] Configure CORS headers
 
 ### 7. Contract Deployment
-- [ ] Deploy WETH contract
+- [ ] Verify genesis-predeployed WETH contracts
 - [ ] Deploy Multicall contract
 - [ ] Deploy Oracle Aggregator contract
 - [ ] Deploy CCIP Router contract (optional)
@@ -221,10 +226,10 @@ make verify
 
 - [Next Steps](NEXT_STEPS.md) - Detailed next steps guide
 - [Next Steps Quick Reference](NEXT_STEPS_QUICK_REFERENCE.md) - Quick reference
-- [Deployment Checklist](DEPLOYMENT_CHECKLIST.md) - Deployment checklist
-- [Deployment Scripts](../scripts/deployment/README.md) - Script documentation
-- [MetaMask Integration](METAMASK_INTEGRATION.md) - Integration guide
-- [MetaMask Gaps Analysis](METAMASK_GAPS_ANALYSIS.md) - Gap analysis
+- [Deployment Checklist](../../deployment/DEPLOYMENT_CHECKLIST.md) - Deployment checklist
+- [Deployment Scripts](../../../scripts/deployment/README.md) - Script documentation
+- [MetaMask Integration](../integrations/METAMASK_INTEGRATION.md) - Integration guide
+- [MetaMask Gaps Analysis](../integrations/METAMASK_GAPS_ANALYSIS.md) - Gap analysis
 
 ## 📋 Task IDs
 
@@ -291,7 +296,6 @@ make verify
 
 For issues or questions:
 - Review [Next Steps](NEXT_STEPS.md)
-- Check [Deployment Checklist](DEPLOYMENT_CHECKLIST.md)
-- Review [Troubleshooting Guide](TROUBLESHOOTING.md)
+- Check [Deployment Checklist](../../deployment/DEPLOYMENT_CHECKLIST.md)
+- Review [Troubleshooting Guide](../../guides/TROUBLESHOOTING.md)
 - Open an issue on GitHub
-
diff --git a/docs/operations/tasks/NEXT_STEPS_QUICK_REFERENCE.md b/docs/operations/tasks/NEXT_STEPS_QUICK_REFERENCE.md
index 0d1f391..a7a6632 100644
--- a/docs/operations/tasks/NEXT_STEPS_QUICK_REFERENCE.md
+++ b/docs/operations/tasks/NEXT_STEPS_QUICK_REFERENCE.md
@@ -119,26 +119,26 @@ make verify
 ## 📚 Documentation
 
 - [Next Steps](NEXT_STEPS.md) - Detailed next steps
-- [Deployment Checklist](DEPLOYMENT_CHECKLIST.md) - Deployment checklist
-- [Deployment Scripts](../scripts/deployment/README.md) - Script documentation
-- [MetaMask Integration](METAMASK_INTEGRATION.md) - Integration guide
-- [MetaMask Gaps Analysis](METAMASK_GAPS_ANALYSIS.md) - Gap analysis
+- [Deployment Checklist](../../deployment/DEPLOYMENT_CHECKLIST.md) - Deployment checklist
+- [Deployment Scripts](../../../scripts/deployment/README.md) - Script documentation
+- [MetaMask Integration](../integrations/METAMASK_INTEGRATION.md) - Integration guide
+- [MetaMask Gaps Analysis](../integrations/METAMASK_GAPS_ANALYSIS.md) - Gap analysis
 
 ## 🔗 Quick Links
 
-- [Deployment Scripts](../scripts/deployment/)
-- [Makefile](../Makefile)
-- [Environment Variables](../.env.example)
-- [Terraform](../terraform/)
-- [Kubernetes](../k8s/)
-- [Contracts](../contracts/)
+- [Deployment Scripts](../../../scripts/deployment/)
+- [Makefile](../../../Makefile)
+- [Environment Variables Example](../../../env.additions.example)
+- [Terraform](../../../terraform/)
+- [Kubernetes](../../../k8s/)
+- [Contracts](../../../contracts/)
 
 ## ⚠️ Important Notes
 
 1. **Environment Variables**: All required variables must be set in `.env` file
 2. **Deployment Order**: Follow the deployment order in [NEXT_STEPS.md](NEXT_STEPS.md)
 3. **Verification**: Run verification after each deployment step
-4. **Troubleshooting**: See [Troubleshooting Guide](TROUBLESHOOTING.md) for common issues
+4. **Troubleshooting**: See [Troubleshooting Guide](../../guides/TROUBLESHOOTING.md) for common issues
 
 ## 🎯 Success Criteria
 
@@ -160,7 +160,6 @@ make verify
 
 For issues or questions:
 - Review [Next Steps](NEXT_STEPS.md)
-- Check [Deployment Checklist](DEPLOYMENT_CHECKLIST.md)
-- Review [Troubleshooting Guide](TROUBLESHOOTING.md)
+- Check [Deployment Checklist](../../deployment/DEPLOYMENT_CHECKLIST.md)
+- Review [Troubleshooting Guide](../../guides/TROUBLESHOOTING.md)
 - Open an issue on GitHub
-
diff --git a/docs/operations/tasks/NEXT_STEPS_SUMMARY.md b/docs/operations/tasks/NEXT_STEPS_SUMMARY.md
index 33655f8..b22aef0 100644
--- a/docs/operations/tasks/NEXT_STEPS_SUMMARY.md
+++ b/docs/operations/tasks/NEXT_STEPS_SUMMARY.md
@@ -144,8 +144,7 @@ make verify
 ## Documentation
 
 - [Next Steps](NEXT_STEPS.md) - Detailed next steps
-- [Deployment Checklist](DEPLOYMENT_CHECKLIST.md) - Deployment checklist
-- [Deployment Scripts](scripts/deployment/README.md) - Script documentation
-- [MetaMask Integration](METAMASK_INTEGRATION.md) - Integration guide
-- [MetaMask Gaps Analysis](METAMASK_GAPS_ANALYSIS.md) - Gap analysis
-
+- [Deployment Checklist](../../deployment/DEPLOYMENT_CHECKLIST.md) - Deployment checklist
+- [Deployment Scripts](../../../scripts/deployment/README.md) - Script documentation
+- [MetaMask Integration](../integrations/METAMASK_INTEGRATION.md) - Integration guide
+- [MetaMask Gaps Analysis](../integrations/METAMASK_GAPS_ANALYSIS.md) - Gap analysis
diff --git a/docs/operations/tasks/TODO.md b/docs/operations/tasks/TODO.md
index 619c6b4..994e421 100644
--- a/docs/operations/tasks/TODO.md
+++ b/docs/operations/tasks/TODO.md
@@ -2,51 +2,23 @@
 
 ## Overview
 
-This TODO list consolidates all tasks from the Gap Analysis and Action Items, organized by priority and status.
+This file preserves a consolidated historical backlog snapshot from an earlier planning phase. It is still useful for context, but it is no longer the primary current tracker.
 
-**Last Updated**: 2024-12-19
-**Total Tasks**: 142 (87 development + 5 pre-production + 25 MetaMask integration + 15 deployment + 10 integration)
-**Completed**: 112 (Code tasks: 100%)
-**Remaining**: 30 (15 deployment + 10 integration + 5 pre-production operational tasks)
+**Last Reviewed**: 2026-04-13
+**Status**: Historical consolidated backlog snapshot
+**Use Instead for Current Work**:
+- `docs/operations/tasks/NEXT_STEPS_LIST.md`
+- `docs/operations/tasks/ACTION_ITEMS.md`
+- `docs/PROJECT_OPTIMIZATION_STATUS.md`
 
-**Status**: ✅ **ALL DEVELOPMENT TASKS COMPLETED - 100%**
-**Pre-Production Tasks**: 5 tasks remaining (operational procedures)
+**Historical Totals at Time of Snapshot**:
+- Total tasks: 142 (87 development + 5 pre-production + 25 MetaMask integration + 15 deployment + 10 integration)
+- Completed: 112 (code tasks)
+- Remaining: 30 (15 deployment + 10 integration + 5 pre-production operational tasks)
 
-**Final Update**: All remaining optional enhancements have been completed, including:
-- OpenTelemetry service instrumentation
-- Blockscout API rate limiting
-- E2E contract deployment and network resilience tests
-- Multi-region enhancements (configurations, failover, monitoring)
-- Performance optimizations (batching, caching, load balancing)
-- On-chain voting contract
-- Advanced security tools (formal verification, penetration testing, security monitoring)
+**Historical Milestone Note**: Core implementation was marked complete when this roll-up was written, but deployment, integration, archival cleanup, and operator hardening continued afterwards.
 
-**Project Status**: 🎉 **PRODUCTION-READY**
-
-**Completion Summary**:
-- ✅ **Critical Priority**: 11/11 (100%)
-- ✅ **High Priority**: 34/34 (100%)
-- ✅ **Medium Priority**: 38/38 (100%)
-- ✅ **Low Priority**: 4/4 (100% - Core documentation complete)
-
-**Note**: All critical and high-priority tasks completed. The project is production-ready with comprehensive features including:
-- ✅ Complete CCIP cross-chain implementation (6 tasks)
-- ✅ Full security scanning integration (11 tasks)
-- ✅ Comprehensive monitoring and observability (14 tasks)
-- ✅ Extensive testing infrastructure (13 tasks)
-- ✅ Complete documentation and runbooks (20+ tasks)
-- ✅ Governance and compliance framework (8 tasks - documentation complete)
-- ✅ Infrastructure hardening (9 tasks)
-- ✅ Blockscout enhancements (5 tasks)
-
-**All Enhancements Completed**:
-- ✅ Performance optimizations (8 tasks) - All implemented
-- ✅ Multi-region enhancements (4 tasks) - Complete with failover
-- ✅ Advanced security tools (4 tasks) - All frameworks created
-- ✅ Service instrumentation (1 task) - OpenTelemetry integrated
-- ✅ On-chain voting (1 task) - Voting contract implemented
-
-See [Project Review](docs/PROJECT_REVIEW.md), [Recommendations](docs/RECOMMENDATIONS.md), and [Gaps Analysis](docs/GAPS_AND_RECOMMENDATIONS.md) for next steps and enhancements.
+See [Project Review](../../project-reviews/PROJECT_REVIEW.md), [Documentation Recommendations](../../DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md), and [Gaps Analysis](../../guides/GAPS_AND_RECOMMENDATIONS.md) for next steps and enhancements.
 
 ## 🔴 Critical Priority (Must Fix Before Production)
 
@@ -994,7 +966,7 @@ Tasks are listed with their dependencies. Complete dependencies before starting
 ### ✅ Completed Features
 
 **Infrastructure (11 tasks)**
-- IBFT 2.0 consensus with proper genesis configuration
+- QBFT consensus with proper genesis configuration
 - Tiered architecture (Validators, Sentries, RPC nodes)
 - Azure AKS deployment with Terraform
 - Application Gateway with WAF
@@ -1070,20 +1042,20 @@ Tasks are listed with their dependencies. Complete dependencies before starting
 
 ## References
 
-- [Project Review](PROJECT_REVIEW.md) - Comprehensive project review and assessment
-- [Recommendations](RECOMMENDATIONS.md) - Next steps and enhancement recommendations
-- [Gaps and Recommendations](GAPS_AND_RECOMMENDATIONS.md) - Detailed gap analysis
-- [Completion Summary](COMPLETION_SUMMARY.md) - Task completion summary
-- [Final Summary](FINAL_SUMMARY.md) - Final project summary
-- [Gap Analysis](GAP_ANALYSIS.md) - Comprehensive gap analysis
+- [Project Review](../../project-reviews/PROJECT_REVIEW.md) - Comprehensive project review and assessment
+- [Documentation Recommendations](../../DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md) - Next steps and enhancement recommendations
+- [Gaps and Recommendations](../../guides/GAPS_AND_RECOMMENDATIONS.md) - Detailed gap analysis
+- [Completion Summary](../../deployment/COMPLETION_SUMMARY.md) - Task completion summary
+- [Final Summary (Archived)](../../archive/status-reports/operations-legacy/FINAL_SUMMARY.md) - Historical final project summary
+- [Gap Analysis (Archived)](../../archive/status-reports/operations-legacy/GAP_ANALYSIS.md) - Historical comprehensive gap analysis
 - [Action Items](ACTION_ITEMS.md) - Detailed action items
-- [Task Completion Report](TASK_COMPLETION_REPORT.md) - Completed tasks
+- [Task Completion Report](../../deployment/TASK_COMPLETION_REPORT.md) - Completed tasks
 
 ## Final Assessment
 
-### ✅ Production Readiness: **CONFIRMED**
+### ✅ Historical Implementation Milestone
 
-All critical and high-priority tasks have been completed. The DeFi Oracle Meta Mainnet is **production-ready** with:
+At the time of this snapshot, all critical and high-priority implementation tasks had been marked complete. Live operational readiness should still be validated against the current deployment docs, runbooks, and infrastructure state.
 
 1. **Complete Infrastructure**: All critical infrastructure components implemented and tested
 2. **Security**: Comprehensive security scanning and protection in place
@@ -1164,9 +1136,9 @@ Before production deployment, complete these operational procedures:
 - [ ] **INTEG-009**: Host token logos
 - [ ] **INTEG-010**: Test token auto-detection
 
-See [Next Steps](NEXT_STEPS.md) for detailed instructions and [Deployment Checklist](DEPLOYMENT_CHECKLIST.md) for deployment checklist.
+See [Next Steps](NEXT_STEPS.md) for detailed instructions and [Deployment Checklist](../../deployment/DEPLOYMENT_CHECKLIST.md) for deployment checklist.
 
-See [Recommendations](RECOMMENDATIONS.md) for detailed next steps and [Project Review](PROJECT_REVIEW.md) for comprehensive assessment.
+See [Documentation Recommendations](../../DOCUMENTATION_REVIEW_AND_RECOMMENDATIONS.md) for detailed next steps and [Project Review](../../project-reviews/PROJECT_REVIEW.md) for comprehensive assessment.
 
 ## 🔵 MetaMask Integration Tasks (25 tasks)
 
@@ -1376,5 +1348,4 @@ See [Recommendations](RECOMMENDATIONS.md) for detailed next steps and [Project R
 - ✅ GitHub Actions workflow
 - ✅ Production configuration updates
 
-See [MetaMask Integration Guide](docs/METAMASK_INTEGRATION.md) for complete documentation.
-
+See [MetaMask Integration Guide](../integrations/METAMASK_INTEGRATION.md) for complete documentation.
diff --git a/docs/project-reviews/REVIEW_COMPLETE.md b/docs/project-reviews/REVIEW_COMPLETE.md
index 5e3f4b6..b3ee4e7 100644
--- a/docs/project-reviews/REVIEW_COMPLETE.md
+++ b/docs/project-reviews/REVIEW_COMPLETE.md
@@ -2,6 +2,9 @@
 
 **Date**: $(date +%Y-%m-%d)  
 **Review Type**: Comprehensive once-over
+**Status**: Historical project-review snapshot
+
+This review records a specific cleanup milestone. Treat it as historical context rather than a current statement of repository health.
 
 ## 📊 Executive Summary
 
@@ -266,5 +269,4 @@ The project is in **GOOD** health with:
 
 ---
 
-*Review completed on $(date +%Y-%m-%d). All findings documented. No critical issues found. Project is production-ready with clear improvement path.*
-
+*Review completed on $(date +%Y-%m-%d). All findings documented. No critical issues were found at that checkpoint, and the project had a clear improvement path.*
diff --git a/docs/runbooks/RUNBOOKS_INDEX.md b/docs/runbooks/RUNBOOKS_INDEX.md
index ed08140..66e015e 100644
--- a/docs/runbooks/RUNBOOKS_INDEX.md
+++ b/docs/runbooks/RUNBOOKS_INDEX.md
@@ -12,7 +12,7 @@ This index lists operational and deployment runbooks for the DeFi Oracle Meta Ma
 | Runbook | Location | Purpose |
 |---------|----------|---------|
 | **cUSDT/cUSDC Multi-Chain + Liquidity** | [../deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md](../deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md) | Deploy cUSDT/cUSDC to other chains; Dodo PMM, Uniswap, Balancer, Curve |
-| **Operator Next Steps** | [../deployment/OPERATOR_NEXT_STEPS_RUNBOOK.md](../deployment/OPERATOR_NEXT_STEPS_RUNBOOK.md) | G1–G4: PMM on L2s, Trustless L2s, LP funding, CCIPLogger |
+| **Operator Next Steps** | [../deployment/ALL_NEXT_STEPS_CURRENT.md](../deployment/ALL_NEXT_STEPS_CURRENT.md) | Current G1–G4 PMM, Trustless, LP funding, and CCIPLogger follow-up steps |
 | **All Mainnets Deployment** | [../deployment/ALL_MAINNETS_DEPLOYMENT_RUNBOOK.md](../deployment/ALL_MAINNETS_DEPLOYMENT_RUNBOOK.md) | CCIP, Trustless, Oracle, PMM across chains |
 | **Multichain Deployment** | [../deployment/MULTICHAIN_DEPLOYMENT_RUNBOOK.md](../deployment/MULTICHAIN_DEPLOYMENT_RUNBOOK.md) | Multi-chain deployment procedures |
 | **Cronos Verification** | [../deployment/CRONOS_VERIFICATION_RUNBOOK.md](../deployment/CRONOS_VERIFICATION_RUNBOOK.md) | Cronos deployment verification |
@@ -55,6 +55,6 @@ For infra, Besu, Blockscout, CCIP relay, and liquidity controls:
 | Task | Runbook / script |
 |------|-------------------|
 | Deploy cUSDT/cUSDC to all chains | [CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK](../deployment/CUSDT_CUSDC_MULTICHAIN_LIQUIDITY_RUNBOOK.md); `scripts/deployment/deploy-cusdt-cusdc-all-chains.sh` |
-| Dodo PMM on L2s | [OPERATOR_NEXT_STEPS](../deployment/OPERATOR_NEXT_STEPS_RUNBOOK.md) G1; `scripts/deployment/deploy-pmm-all-l2s.sh` |
+| Dodo PMM on L2s | [ALL_NEXT_STEPS_CURRENT](../deployment/ALL_NEXT_STEPS_CURRENT.md) G1; `scripts/deployment/deploy-pmm-all-l2s.sh` |
 | Create Uniswap V3 pool | `scripts/deployment/create-uniswap-v3-pool-cusdt-cusdc.sh` |
 | DODO pools on Chain 138 | [DODO_PMM_INTEGRATION](../integration/DODO_PMM_INTEGRATION.md); `scripts/setup-dodo-pools.sh` |
diff --git a/docs/scripts/scripts_deployment_generate-genesis-with-validators.sh.md b/docs/scripts/scripts_deployment_generate-genesis-with-validators.sh.md
index c74f44f..6eae13f 100644
--- a/docs/scripts/scripts_deployment_generate-genesis-with-validators.sh.md
+++ b/docs/scripts/scripts_deployment_generate-genesis-with-validators.sh.md
@@ -1,6 +1,6 @@
 # scripts/deployment/generate-genesis-with-validators.sh
 
-No description provided.
+Legacy compatibility wrapper for `./scripts/generate-genesis-proper.sh`.
 
 
 **Uses common library**: yes
@@ -8,9 +8,9 @@ No description provided.
 **Has --help**: no
 
 ## Usage
-`./scripts/deployment/generate-genesis-with-validators.sh --help`
+`./scripts/deployment/generate-genesis-with-validators.sh [validator-count]`
 
 ## Examples
 ```bash
-./scripts/deployment/generate-genesis-with-validators.sh --help
+./scripts/deployment/generate-genesis-with-validators.sh 4
 ```
diff --git a/docs/scripts/scripts_generate-genesis.sh.md b/docs/scripts/scripts_generate-genesis.sh.md
index e3bf0d8..b728881 100644
--- a/docs/scripts/scripts_generate-genesis.sh.md
+++ b/docs/scripts/scripts_generate-genesis.sh.md
@@ -1,6 +1,6 @@
 # scripts/generate-genesis.sh
 
-No description provided.
+Compatibility wrapper around `./scripts/generate-genesis-proper.sh`.
 
 
 **Uses common library**: yes
@@ -8,9 +8,9 @@ No description provided.
 **Has --help**: no
 
 ## Usage
-`./scripts/generate-genesis.sh --help`
+`./scripts/generate-genesis.sh [validator-count]`
 
 ## Examples
 ```bash
-./scripts/generate-genesis.sh --help
+./scripts/generate-genesis.sh 4
 ```
diff --git a/docs/security/SECURITY_AUDIT_CHECKLIST.md b/docs/security/SECURITY_AUDIT_CHECKLIST.md
index 4938854..8921c64 100644
--- a/docs/security/SECURITY_AUDIT_CHECKLIST.md
+++ b/docs/security/SECURITY_AUDIT_CHECKLIST.md
@@ -273,10 +273,10 @@ This checklist provides security considerations for contracts refactored to remo
 - `contracts/tokens/WETH10.sol` - Custom implementation ✅
 
 ### Documentation
-- [Migration Guide](./MIGRATION_GUIDE.md)
-- [Contract Inventory](./CONTRACT_INVENTORY.md)
-- [OpenZeppelin Usage Analysis](./OPENZEPPELIN_USAGE_ANALYSIS.md)
-- [Dependencies Guide](./DEPENDENCIES.md)
+- [Migration Guide](../guides/MIGRATION_GUIDE.md)
+- [Contract Inventory](../guides/CONTRACT_INVENTORY.md)
+- [OpenZeppelin Usage Analysis](../guides/OPENZEPPELIN_USAGE_ANALYSIS.md)
+- [Dependencies Guide](../guides/DEPENDENCIES.md)
 
 ---
 
@@ -300,7 +300,6 @@ This checklist provides security considerations for contracts refactored to remo
 ## Questions?
 
 For questions about security audit checklists, refer to:
-- [Migration Guide](./MIGRATION_GUIDE.md)
-- [Contract Inventory](./CONTRACT_INVENTORY.md)
-- [OpenZeppelin Usage Analysis](./OPENZEPPELIN_USAGE_ANALYSIS.md)
-
+- [Migration Guide](../guides/MIGRATION_GUIDE.md)
+- [Contract Inventory](../guides/CONTRACT_INVENTORY.md)
+- [OpenZeppelin Usage Analysis](../guides/OPENZEPPELIN_USAGE_ANALYSIS.md)
diff --git a/docs/security/SECURITY_SCANNING.md b/docs/security/SECURITY_SCANNING.md
index e6d046b..8d39bc4 100644
--- a/docs/security/SECURITY_SCANNING.md
+++ b/docs/security/SECURITY_SCANNING.md
@@ -202,7 +202,6 @@ Set up alerts for:
 
 ## References
 
-- [SolidityScan Setup](docs/SOLIDITYSCAN_SETUP.md)
-- [Security Scanning Guide](docs/SECURITY_SCANNING_GUIDE.md)
-- [Security Scores](docs/SECURITY_SCORES.md)
-
+- [SolidityScan Setup](SOLIDITYSCAN_SETUP.md)
+- [Security Scanning Guide](SECURITY_SCANNING_GUIDE.md)
+- [Security Scores](SECURITY_SCORES.md)
diff --git a/docs/security/SECURITY_SCORES.md b/docs/security/SECURITY_SCORES.md
index 06d3509..8127f1c 100644
--- a/docs/security/SECURITY_SCORES.md
+++ b/docs/security/SECURITY_SCORES.md
@@ -154,6 +154,5 @@ Set up alerts for:
 ## References
 
 - [SolidityScan Documentation](https://docs.solidityscan.com)
-- [Security Scanning Process](docs/SECURITY_SCANNING.md)
-- [Security Best Practices](docs/SECURITY.md)
-
+- [Security Scanning Process](SECURITY_SCANNING.md)
+- [Security Best Practices](SECURITY.md)
diff --git a/docs/templates/NEW_GUIDE_TEMPLATE.md b/docs/templates/NEW_GUIDE_TEMPLATE.md
index 6508d01..e238f5b 100644
--- a/docs/templates/NEW_GUIDE_TEMPLATE.md
+++ b/docs/templates/NEW_GUIDE_TEMPLATE.md
@@ -18,8 +18,8 @@
 Brief overview of what this guide covers and when to use it.
 
 > **Related Documentation**:
-> - [Related Guide 1](path/to/guide1.md) - Description
-> - [Related Guide 2](path/to/guide2.md) - Description
+> - [Related Guide 1] (path/to/guide1.md) - Description
+> - [Related Guide 2] (path/to/guide2.md) - Description
 
 ## Prerequisites
 
@@ -68,4 +68,3 @@ troubleshoot-command
 
 **Last Updated**: YYYY-MM-DD  
 **Next Review**: YYYY-MM-DD
-
diff --git a/docs/templates/STATUS_REPORT_TEMPLATE.md b/docs/templates/STATUS_REPORT_TEMPLATE.md
index 9b2715a..b39582d 100644
--- a/docs/templates/STATUS_REPORT_TEMPLATE.md
+++ b/docs/templates/STATUS_REPORT_TEMPLATE.md
@@ -62,11 +62,10 @@ Brief summary of the status report.
 
 ## Related Documentation
 
-- [Related Report 1](path/to/report1.md)
+- [Related Report 1] (path/to/report1.md)
 - [Master Documentation Index](../MASTER_DOCUMENTATION_INDEX.md)
 
 ---
 
 **Last Updated**: YYYY-MM-DD  
 **Next Review**: YYYY-MM-DD
-
diff --git a/docs/tokenization/COMPLETION_SUMMARY.md b/docs/tokenization/COMPLETION_SUMMARY.md
index ab4ec9d..64f3977 100644
--- a/docs/tokenization/COMPLETION_SUMMARY.md
+++ b/docs/tokenization/COMPLETION_SUMMARY.md
@@ -1,5 +1,10 @@
 # Tokenization Implementation - Completion Summary
 
+**Last Reviewed**: 2026-04-13  
+**Status**: Historical tokenization milestone snapshot
+
+This summary captures an implementation checkpoint. Use the current tokenization architecture, API, and deployment guides for active operational work.
+
 ## ✅ All Next Steps Completed
 
 All next steps from the implementation have been completed:
@@ -71,7 +76,7 @@ All next steps from the implementation have been completed:
 
 ## 🎯 Ready for Deployment
 
-The tokenization system is now **100% complete** and ready for deployment:
+The tokenization system had reached a strong implementation milestone when this summary was written:
 
 1. **All code implemented** - Every component from the plan is built
 2. **All integrations complete** - SolaceNet, Sub-Volumes, Microservices
diff --git a/runbooks/parameter-change.md b/runbooks/parameter-change.md
index 32db491..7317244 100644
--- a/runbooks/parameter-change.md
+++ b/runbooks/parameter-change.md
@@ -2,9 +2,9 @@
 
 ## Overview
 
-This runbook provides procedures for changing IBFT 2.0 parameters and other network parameters.
+This runbook provides procedures for changing QBFT parameters and other network parameters.
 
-## IBFT 2.0 Parameters
+## QBFT Parameters
 
 ### Block Period
 
@@ -19,7 +19,7 @@ This runbook provides procedures for changing IBFT 2.0 parameters and other netw
 2. **Update Genesis File**
    ```bash
    # Update blockperiodseconds in genesis.json
-   jq '.config.ibft2.blockperiodseconds = 5' config/genesis.json > config/genesis-new.json
+   jq '.config.qbft.blockperiodseconds = 5' config/genesis.json > config/genesis-new.json
    mv config/genesis-new.json config/genesis.json
    ```
 
@@ -50,7 +50,7 @@ This runbook provides procedures for changing IBFT 2.0 parameters and other netw
 2. **Update Genesis File**
    ```bash
    # Update epochlength in genesis.json
-   jq '.config.ibft2.epochlength = 50000' config/genesis.json > config/genesis-new.json
+   jq '.config.qbft.epochlength = 50000' config/genesis.json > config/genesis-new.json
    mv config/genesis-new.json config/genesis.json
    ```
 
@@ -76,7 +76,7 @@ This runbook provides procedures for changing IBFT 2.0 parameters and other netw
 1. **Update Genesis File**
    ```bash
    # Update requesttimeoutseconds in genesis.json
-   jq '.config.ibft2.requesttimeoutseconds = 15' config/genesis.json > config/genesis-new.json
+   jq '.config.qbft.requesttimeoutseconds = 15' config/genesis.json > config/genesis-new.json
    mv config/genesis-new.json config/genesis.json
    ```
 
@@ -269,7 +269,6 @@ This runbook provides procedures for changing IBFT 2.0 parameters and other netw
 
 ## References
 
-- [IBFT 2.0 Documentation](https://besu.hyperledger.org/en/stable/HowTo/Configure/Consensus-Protocols/IBFT/)
-- [Network Configuration](docs/NETWORK.md)
-- [Deployment Guide](docs/DEPLOYMENT.md)
-
+- [QBFT Documentation](https://besu.hyperledger.org/private-networks/how-to/configure/consensus/qbft)
+- [Network Configuration](../docs/architecture/NETWORK.md)
+- [Deployment Guide](../docs/deployment/DEPLOYMENT.md)
diff --git a/runbooks/troubleshooting.md b/runbooks/troubleshooting.md
index 1a08062..49896a0 100644
--- a/runbooks/troubleshooting.md
+++ b/runbooks/troubleshooting.md
@@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" \
 1. Restart validators: `kubectl rollout restart statefulset/besu-validator -n besu-network`
 2. Check network connectivity
 3. Verify validator keys
-4. Check IBFT configuration
+4. Check QBFT configuration
 5. Verify genesis file
 
 #### Validators Not Peering
@@ -301,4 +301,3 @@ kubectl top pods -n besu-network
 - Consult runbooks
 - Contact on-call engineer
 - Escalate if needed
-
diff --git a/runbooks/validator-transitions.md b/runbooks/validator-transitions.md
index 4427cfe..5416d96 100644
--- a/runbooks/validator-transitions.md
+++ b/runbooks/validator-transitions.md
@@ -87,7 +87,7 @@ See [Key Rotation Script](../scripts/key-management/rotate-keys.sh) for detailed
 1. Check validator status
 2. Verify validator keys
 3. Check network connectivity
-4. Verify IBFT configuration
+4. Verify QBFT configuration
 5. Check logs
 
 ### Validator Not in Validator Set
@@ -107,4 +107,3 @@ See [Key Rotation Script](../scripts/key-management/rotate-keys.sh) for detailed
 - [Node Add/Remove Runbook](node-add-remove.md)
 - [Parameter Change Runbook](parameter-change.md)
 - [Key Management Scripts](../scripts/key-management/)
-
diff --git a/scripts/configure-network-decision-tree.md b/scripts/configure-network-decision-tree.md
index f278391..c5933d2 100644
--- a/scripts/configure-network-decision-tree.md
+++ b/scripts/configure-network-decision-tree.md
@@ -294,5 +294,4 @@ Tool: ✅ Configuration updated to use VM Scale Sets
 - [Besu Configuration](https://besu.hyperledger.org/stable/Reference/CLI/CLI-Syntax/)
 - [Kubernetes Best Practices](https://kubernetes.io/docs/concepts/security/)
 - [Azure VM Sizes](https://docs.microsoft.com/azure/virtual-machines/sizes)
-- [IBFT2 Consensus](https://besu.hyperledger.org/stable/HowTo/Configure/Consensus-Protocols/IBFT/)
-
+- [Besu QBFT Consensus](https://besu.hyperledger.org/private-networks/how-to/configure/consensus/qbft)
diff --git a/scripts/deployment/deploy-chain138-infrastructure.sh b/scripts/deployment/deploy-chain138-infrastructure.sh
index 4b691fa..cacaf67 100755
--- a/scripts/deployment/deploy-chain138-infrastructure.sh
+++ b/scripts/deployment/deploy-chain138-infrastructure.sh
@@ -150,7 +150,7 @@ if [ -f "config/genesis.json" ] || [ -f "genesis.json" ]; then
     SUCCESS=$((SUCCESS + 1))
 else
     log_error "❌ Genesis file not found"
-    echo "  Generate with: ./scripts/generate-genesis.sh"
+    echo "  Generate with: ./scripts/generate-genesis-proper.sh 4"
     ERRORS=$((ERRORS + 1))
 fi
 
diff --git a/scripts/deployment/deploy-contracts-once-ready.sh b/scripts/deployment/deploy-contracts-once-ready.sh
index 6a9b9b8..bdd14b0 100755
--- a/scripts/deployment/deploy-contracts-once-ready.sh
+++ b/scripts/deployment/deploy-contracts-once-ready.sh
@@ -64,7 +64,7 @@ fi
 
 if [ "$BLOCK" -eq 0 ]; then
     echo "❌ Network is not producing blocks yet"
-    echo "   Please wait for IBFT validators to initialize"
+    echo "   Please wait for QBFT validators to initialize"
     echo "   Run this script again once blocks are being produced"
     exit 1
 fi
diff --git a/scripts/deployment/fix-configuration-issues.sh b/scripts/deployment/fix-configuration-issues.sh
index 17fcf03..380a96a 100755
--- a/scripts/deployment/fix-configuration-issues.sh
+++ b/scripts/deployment/fix-configuration-issues.sh
@@ -72,13 +72,13 @@ if [ -f "config/genesis.json" ]; then
     EXTRADATA=$(grep -oE '"extraData"[[:space:]]*:[[:space:]]*"[^"]*"' config/genesis.json | cut -d'"' -f4)
     if [ "$EXTRADATA" = "0x" ] || [ -z "$EXTRADATA" ]; then
         log_error "❌ Genesis extraData is empty (no validators configured)"
-        log_warn "   Fix: Run ./scripts/generate-genesis.sh to regenerate with validators"
+        log_warn "   Fix: Run ./scripts/generate-genesis-proper.sh 4 to regenerate with validators"
         
         # Check if validator keys exist
         VALIDATOR_KEY_COUNT=$(find keys/validators -name "key.pub" 2>/dev/null | wc -l)
         if [ "$VALIDATOR_KEY_COUNT" -gt 0 ]; then
             log_success "   ✅ Validator keys found: ${VALIDATOR_KEY_COUNT}"
-            log_warn "   Run: ./scripts/generate-genesis.sh"
+            log_warn "   Run: ./scripts/generate-genesis-proper.sh 4"
         else
             log_error "   ❌ No validator keys found"
             log_warn "   Run: ./scripts/key-management/generate-validator-keys.sh 4"
@@ -152,11 +152,10 @@ log_info "=== Summary ==="
 log_success "Configuration issues checked"
 log_warn "Critical fixes needed:"
 echo "  1. Update terraform.tfvars node_count (set sentries=3, rpc=3)"
-echo "  2. Regenerate genesis.json with validators (./scripts/generate-genesis.sh)"
+echo "  2. Regenerate genesis.json with validators (./scripts/generate-genesis-proper.sh 4)"
 echo "  3. Verify Kubernetes version is supported"
 echo "  4. Configure Terraform backend"
 log_warn "Security recommendations:"
 echo "  1. Restrict RPC CORS origins"
 echo "  2. Restrict RPC host allowlist"
 echo "  3. Review network security groups"
-
diff --git a/scripts/deployment/generate-genesis-python.py b/scripts/deployment/generate-genesis-python.py
index 64fb45f..f78f420 100755
--- a/scripts/deployment/generate-genesis-python.py
+++ b/scripts/deployment/generate-genesis-python.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-Generate IBFT 2.0 Genesis with Validator Addresses
+Generate QBFT Genesis with Validator Addresses
 This script extracts validator addresses from keys and creates proper genesis.json
 """
 
@@ -40,7 +40,7 @@ def extract_address_from_key(key_path):
 
 def generate_extra_data(validator_addresses):
     """
-    Generate IBFT 2.0 extraData
+    Generate QBFT extraData
     Format: RLP([32 bytes Vanity, [][20 bytes]Validators, 65 bytes Signature])
     This is a placeholder - proper encoding requires RLP library
     """
diff --git a/scripts/deployment/generate-genesis-with-validators.sh b/scripts/deployment/generate-genesis-with-validators.sh
index f117683..4d52416 100755
--- a/scripts/deployment/generate-genesis-with-validators.sh
+++ b/scripts/deployment/generate-genesis-with-validators.sh
@@ -1,177 +1,12 @@
 #!/usr/bin/env bash
 
-# Generate Genesis with Validator Addresses for IBFT 2.0
-# This script generates validator keys and creates a proper genesis.json with extraData
-
-set -e
+set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/init.sh"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-cd "$PROJECT_ROOT"
-# Load .env via dotenv (RPC CR/LF trim). Fallback: raw source.
-if [[ -f "$SCRIPT_DIR/../lib/deployment/dotenv.sh" ]]; then
-  # shellcheck disable=SC1090
-  source "$SCRIPT_DIR/../lib/deployment/dotenv.sh"
-  load_deployment_env --repo-root "${PROJECT_ROOT:-$REPO_ROOT}"
-elif [[ -n "${PROJECT_ROOT:-}" && -f "$PROJECT_ROOT/.env" ]]; then
-  set -a
-  # shellcheck disable=SC1090
-  source "$PROJECT_ROOT/.env"
-  set +a
-elif [[ -n "${REPO_ROOT:-}" && -f "$REPO_ROOT/.env" ]]; then
-  set -a
-  # shellcheck disable=SC1090
-  source "$REPO_ROOT/.env"
-  set +a
-fi
 
-CONFIG_DIR="$PROJECT_ROOT/config"
-KEYS_DIR="$PROJECT_ROOT/keys"
-VALIDATORS_DIR="$KEYS_DIR/validators"
-
-
-CHAIN_ID=138
-NUM_VALIDATORS=4
-
-log_info "=== Generating Genesis with Validators for Chain ID ${CHAIN_ID} ==="
-
-# Step 1: Generate validator keys if they don't exist
-log_warn "Step 1: Checking validator keys..."
-if [ ! -d "$VALIDATORS_DIR" ] || [ -z "$(ls -A $VALIDATORS_DIR 2>/dev/null)" ]; then
-    log_warn "  Generating ${NUM_VALIDATORS} validator keys..."
-    if [ -f "scripts/key-management/generate-validator-keys.sh" ]; then
-        ./scripts/key-management/generate-validator-keys.sh $NUM_VALIDATORS
-    else
-        log_error "  ❌ Key generation script not found"
-        log_warn "  Creating keys manually..."
-        mkdir -p "$VALIDATORS_DIR"
-        for i in $(seq 1 $NUM_VALIDATORS); do
-            VALIDATOR_DIR="$VALIDATORS_DIR/validator-$i"
-            mkdir -p "$VALIDATOR_DIR"
-            PRIVATE_KEY=$(openssl rand -hex 32)
-            echo "$PRIVATE_KEY" > "$VALIDATOR_DIR/key.priv"
-            chmod 600 "$VALIDATOR_DIR/key.priv"
-            log_success "  ✅ Generated validator $i key"
-        done
-    fi
-else
-    KEY_COUNT=$(find "$VALIDATORS_DIR" -name "key.priv" 2>/dev/null | wc -l)
-    log_success "  ✅ Found ${KEY_COUNT} validator keys"
-fi
-
-# Step 2: Try to generate proper genesis using Besu
-log_warn "Step 2: Generating genesis with Besu..."
-if command -v besu &> /dev/null; then
-    log_success "  ✅ Besu CLI found"
-    
-    # Create genesis template if it doesn't exist
-    if [ ! -f "$CONFIG_DIR/genesis-template.json" ]; then
-        cat > "$CONFIG_DIR/genesis-template.json" <<EOF
-{
-  "genesis": {
-    "config": {
-      "chainId": ${CHAIN_ID},
-      "berlinBlock": 0,
-      "londonBlock": 0,
-      "istanbulBlock": 0,
-      "ibft2": {
-        "blockperiodseconds": 2,
-        "epochlength": 30000,
-        "requesttimeoutseconds": 10
-      }
-    },
-    "nonce": "0x0",
-    "timestamp": "0x0",
-    "gasLimit": "0x1c9c380",
-    "difficulty": "0x1",
-    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
-    "coinbase": "0x0000000000000000000000000000000000000000",
-    "alloc": {}
-  },
-  "blockchain": {
-    "nodes": {
-      "generate": true,
-      "count": ${NUM_VALIDATORS}
-    }
-  }
-}
-EOF
-        log_success "  ✅ Created genesis-template.json"
-    fi
-    
-    # Try to use Besu to generate proper genesis
-    TEMP_GENESIS_DIR=$(mktemp -d)
-    if besu operator generate-blockchain-config \
-        --config-file="$CONFIG_DIR/genesis-template.json" \
-        --to="$TEMP_GENESIS_DIR" \
-        --private-key-file-name=key.priv 2>/dev/null; then
-        log_success "  ✅ Generated genesis using Besu"
-        
-        # Copy generated genesis if it exists
-        if [ -f "$TEMP_GENESIS_DIR/genesis.json" ]; then
-            cp "$TEMP_GENESIS_DIR/genesis.json" "$CONFIG_DIR/genesis.json"
-            log_success "  ✅ Updated config/genesis.json with proper extraData"
-        fi
-        
-        # Copy validator keys if generated
-        if [ -d "$TEMP_GENESIS_DIR/keys" ]; then
-            cp -r "$TEMP_GENESIS_DIR/keys"/* "$VALIDATORS_DIR/" 2>/dev/null || true
-        fi
-        
-        rm -rf "$TEMP_GENESIS_DIR"
-    else
-        log_warn "  ⚠️  Besu genesis generation failed (may need manual configuration)"
-        rm -rf "$TEMP_GENESIS_DIR"
-    fi
-else
-    log_warn "  ⚠️  Besu CLI not found"
-    log_warn "  Install Besu to generate proper IBFT 2.0 extraData"
-    log_warn "  Visit: https://besu.hyperledger.org/en/stable/HowTo/Get-Started/Installation-Options/"
-fi
-
-# Step 3: Verify genesis file
-log_warn "Step 3: Verifying genesis file..."
-if [ -f "$CONFIG_DIR/genesis.json" ]; then
-    EXTRADATA=$(grep -oE '"extraData"[[:space:]]*:[[:space:]]*"[^"]*"' "$CONFIG_DIR/genesis.json" | cut -d'"' -f4)
-    if [ "$EXTRADATA" = "0x" ] || [ -z "$EXTRADATA" ]; then
-        log_error "  ❌ Genesis extraData is still empty"
-        log_warn "  ⚠️  Manual step required:"
-        log_warn "     1. Extract validator addresses from keys/validators/*/key.priv"
-        log_warn "     2. Use Besu to generate proper RLP-encoded extraData"
-        log_warn "     3. Update config/genesis.json extraData field"
-        log_warn "  Alternative: Use Besu's operator generate-blockchain-config command"
-        log_warn "  Example:"
-        log_warn "    besu operator generate-blockchain-config \\"
-        log_warn "      --config-file=config/genesis-template.json \\"
-        log_warn "      --to=keys/validators \\"
-        log_warn "      --private-key-file-name=key.priv"
-    else
-        EXTRADATA_LEN=${#EXTRADATA}
-        if [ "$EXTRADATA_LEN" -gt 4 ]; then
-            log_success "  ✅ Genesis extraData appears to contain validators (length: ${EXTRADATA_LEN} chars)"
-        else
-            log_warn "  ⚠️  Genesis extraData may be incomplete (length: ${EXTRADATA_LEN} chars)"
-        fi
-    fi
-    
-    # Verify Chain ID
-    GENESIS_CHAIN_ID=$(grep -oE '"chainId"[[:space:]]*:[[:space:]]*[0-9]+' "$CONFIG_DIR/genesis.json" | grep -oE '[0-9]+')
-    if [ "$GENESIS_CHAIN_ID" = "138" ]; then
-        log_success "  ✅ Chain ID: 138 (correct)"
-    else
-        log_error "  ❌ Chain ID mismatch: ${GENESIS_CHAIN_ID} (expected 138)"
-    fi
-else
-    log_error "  ❌ Genesis file not found"
-fi
-
-log_info "=== Summary ==="
-log_success "Genesis generation process completed"
-log_warn "Next Steps:"
-echo "  1. Verify validator keys exist: ls -la keys/validators/*/key.priv"
-echo "  2. If extraData is still empty, use Besu to generate proper genesis:"
-echo "     besu operator generate-blockchain-config --config-file=config/genesis-template.json --to=keys/validators"
-echo "  3. Update all ConfigMaps in k8s/base/*/statefulset.yaml with new genesis.json"
-echo "  4. Update Helm ConfigMaps if using Helm deployment"
+log_warn "scripts/deployment/generate-genesis-with-validators.sh is now a compatibility wrapper."
+log_warn "Forwarding to the canonical QBFT generator: ./scripts/generate-genesis-proper.sh ${1:-4}"
 
+exec "$PROJECT_ROOT/scripts/generate-genesis-proper.sh" "$@"
diff --git a/scripts/deployment/prepare-all-phases.sh b/scripts/deployment/prepare-all-phases.sh
index 5e46369..1aaefe3 100755
--- a/scripts/deployment/prepare-all-phases.sh
+++ b/scripts/deployment/prepare-all-phases.sh
@@ -116,7 +116,7 @@ fi
 if [ -f "$PROJECT_ROOT/config/genesis.json" ]; then
     log "Genesis file exists"
 else
-    warn "Genesis file not found. Run: ./scripts/generate-genesis.sh"
+    warn "Genesis file not found. Run: ./scripts/generate-genesis-proper.sh 4"
 fi
 
 # Verify Terraform configuration
@@ -209,4 +209,3 @@ info "2. Review terraform/terraform.tfvars"
 info "3. Initialize Terraform: cd terraform && terraform init"
 info "4. Plan deployment: terraform plan"
 info "5. Apply when ready: terraform apply"
-
diff --git a/scripts/deployment/validate-deployment-config.sh b/scripts/deployment/validate-deployment-config.sh
index 2b6ff63..3034807 100755
--- a/scripts/deployment/validate-deployment-config.sh
+++ b/scripts/deployment/validate-deployment-config.sh
@@ -112,11 +112,11 @@ if [ -f "config/genesis.json" ]; then
         ((ERRORS++))
     fi
     
-    # Check IBFT configuration
-    if grep -q "ibft2" config/genesis.json || grep -q "ibft" config/genesis.json; then
-        log_success "✅ IBFT consensus configured"
+    # Check consensus configuration
+    if grep -q "qbft" config/genesis.json || grep -q "ibft2" config/genesis.json; then
+        log_success "✅ QBFT-compatible consensus configured"
     else
-        log_error "❌ IBFT consensus not found in genesis"
+        log_error "❌ Consensus configuration not found in genesis"
         ((ERRORS++))
     fi
     
@@ -363,4 +363,3 @@ else
     log_error "   Please fix ${ERRORS} error(s) before deployment"
     exit 1
 fi
-
diff --git a/scripts/generate-genesis-proper.sh b/scripts/generate-genesis-proper.sh
index b104d8d..f372cbc 100755
--- a/scripts/generate-genesis-proper.sh
+++ b/scripts/generate-genesis-proper.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-# Generate Genesis for ChainID 138 with proper IBFT extraData
+# Generate Genesis for ChainID 138 with proper QBFT extraData
 # This script uses Besu's operator generate-blockchain-config to create a proper genesis file
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -22,7 +22,7 @@ REQUEST_TIMEOUT=10
 GAS_LIMIT="0x1c9c380"
 NUM_VALIDATORS=${1:-4}
 
-log_success "Generating genesis for ChainID ${CHAIN_ID} with proper IBFT extraData"
+log_success "Generating genesis for ChainID ${CHAIN_ID} with proper QBFT extraData"
 
 # Check if Besu is installed
 if ! command -v besu &> /dev/null; then
@@ -45,7 +45,7 @@ cat > "$CONFIG_DIR/genesis-config.json" <<EOF
       "berlinBlock": 0,
       "londonBlock": 0,
       "istanbulBlock": 0,
-      "ibft2": {
+      "qbft": {
         "blockperiodseconds": ${BLOCK_PERIOD},
         "epochlength": ${EPOCH_LENGTH},
         "requesttimeoutseconds": ${REQUEST_TIMEOUT}
@@ -126,7 +126,7 @@ fi
 # Check extraData is not empty
 EXTRA_DATA=$(jq -r '.extraData' "$CONFIG_DIR/genesis.json")
 if [ "$EXTRA_DATA" = "0x" ] || [ -z "$EXTRA_DATA" ]; then
-    log_error "Error: extraData is empty. IBFT configuration may be invalid"
+    log_error "Error: extraData is empty. QBFT configuration may be invalid"
     exit 1
 fi
 
@@ -153,4 +153,3 @@ echo "2. Store validator keys securely (Azure Key Vault for production)"
 echo "3. Deploy infrastructure using Terraform"
 echo "4. Update static-nodes.json with actual enode addresses after deployment"
 echo "5. Deploy Kubernetes resources"
-
diff --git a/scripts/generate-genesis.sh b/scripts/generate-genesis.sh
index d2bb9af..9a2a261 100755
--- a/scripts/generate-genesis.sh
+++ b/scripts/generate-genesis.sh
@@ -1,162 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
-
-# Generate Genesis for ChainID 138 - DeFi Oracle Meta Mainnet
-# This script generates validator keys and creates the genesis.json with IBFT 2.0
+set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/init.sh"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-CONFIG_DIR="$PROJECT_ROOT/config"
-KEYS_DIR="$PROJECT_ROOT/keys"
-VALIDATORS_DIR="$KEYS_DIR/validators"
-ORACLE_DIR="$KEYS_DIR/oracle"
 
+TARGET_SCRIPT="$SCRIPT_DIR/generate-genesis-proper.sh"
 
-# Configuration
-CHAIN_ID=138
-BLOCK_PERIOD=2
-EPOCH_LENGTH=30000
-REQUEST_TIMEOUT=10
-GAS_LIMIT="0x1c9c380"
-NUM_VALIDATORS=4
-
-log_success "Generating genesis for ChainID ${CHAIN_ID} - DeFi Oracle Meta Mainnet"
-
-# Check if Besu is installed
-if ! command -v besu &> /dev/null; then
-    log_error "Error: Besu CLI not found. Please install Besu."
-    echo "Visit: https://besu.hyperledger.org/en/stable/HowTo/Get-Started/Installation-Options/"
-    exit 1
-fi
-
-# Create directories
-mkdir -p "$VALIDATORS_DIR"
-mkdir -p "$ORACLE_DIR"
-mkdir -p "$CONFIG_DIR"
-
-# Generate validator keys
-log_warn "Generating ${NUM_VALIDATORS} validator keys..."
-VALIDATOR_ADDRESSES=()
-for i in $(seq 1 $NUM_VALIDATORS); do
-    VALIDATOR_DIR="$VALIDATORS_DIR/validator-$i"
-    mkdir -p "$VALIDATOR_DIR"
-    
-    # Generate key pair
-    besu operator generate-blockchain-config \
-        --config-file="$CONFIG_DIR/genesis-template.json" \
-        --to="$VALIDATOR_DIR" \
-        --private-key-file-name=key.priv 2>/dev/null || \
-    besu public-key export-address \
-        --node-private-key-file="$VALIDATOR_DIR/key.priv" > "$VALIDATOR_DIR/address.txt" 2>/dev/null || \
-    {
-        # Fallback: use openssl to generate keys if Besu tooling is limited
-        openssl ecparam -genkey -name secp256k1 -noout -out "$VALIDATOR_DIR/key.pem" 2>/dev/null
-        # Extract public key and derive address (simplified)
-        openssl ec -in "$VALIDATOR_DIR/key.pem" -pubout -out "$VALIDATOR_DIR/pubkey.pem" 2>/dev/null
-    }
-    
-    # For now, we'll generate keys using a simpler method
-    # In production, use proper HSM/KMS key generation
-    if [ ! -f "$VALIDATOR_DIR/key.priv" ]; then
-        # Generate a private key (32 bytes hex)
-        PRIVATE_KEY=$(openssl rand -hex 32)
-        echo "$PRIVATE_KEY" > "$VALIDATOR_DIR/key.priv"
-        log_success "Generated validator $i key"
-    fi
-    
-    # Note: In production, use Besu's operator generate-blockchain-config
-    # which properly generates keys and addresses
-done
-
-# Generate oracle key
-log_warn "Generating oracle key..."
-ORACLE_PRIVATE_KEY=$(openssl rand -hex 32)
-echo "$ORACLE_PRIVATE_KEY" > "$ORACLE_DIR/key.priv"
-log_success "Generated oracle key"
-
-# Generate IBFT extraData
-# Note: This is a placeholder. In production, use Besu's operator generate-blockchain-config
-# which generates the proper RLP-encoded extraData with validator addresses
-log_warn "Generating IBFT extraData..."
-EXTRA_DATA="0x"
-
-# Create genesis.json
-log_warn "Creating genesis.json..."
-cat > "$CONFIG_DIR/genesis.json" <<EOF
-{
-  "config": {
-    "chainId": ${CHAIN_ID},
-    "berlinBlock": 0,
-    "londonBlock": 0,
-    "istanbulBlock": 0,
-    "clique": null,
-    "ibft2": {
-      "blockperiodseconds": ${BLOCK_PERIOD},
-      "epochlength": ${EPOCH_LENGTH},
-      "requesttimeoutseconds": ${REQUEST_TIMEOUT}
-    },
-    "ethash": {}
-  },
-  "nonce": "0x0",
-  "timestamp": "0x$(printf '%x' $(date +%s))",
-  "gasLimit": "${GAS_LIMIT}",
-  "difficulty": "0x1",
-  "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
-  "coinbase": "0x0000000000000000000000000000000000000000",
-  "alloc": {
-    "0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb": {
-      "balance": "0xde0b6b3a7640000"
-    }
-  },
-  "extraData": "${EXTRA_DATA}",
-  "number": "0x0",
-  "gasUsed": "0x0",
-  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-}
-EOF
-
-log_success "Genesis file created at: $CONFIG_DIR/genesis.json"
-log_warn "Note: extraData must be generated using Besu's operator generate-blockchain-config"
-log_warn "with the actual validator addresses for production deployment."
-
-# Create a template for proper genesis generation
-cat > "$CONFIG_DIR/genesis-template.json" <<EOF
-{
-  "genesis": {
-    "config": {
-      "chainId": ${CHAIN_ID},
-      "berlinBlock": 0,
-      "londonBlock": 0,
-      "istanbulBlock": 0,
-      "ibft2": {
-        "blockperiodseconds": ${BLOCK_PERIOD},
-        "epochlength": ${EPOCH_LENGTH},
-        "requesttimeoutseconds": ${REQUEST_TIMEOUT}
-      }
-    },
-    "nonce": "0x0",
-    "timestamp": "0x0",
-    "gasLimit": "${GAS_LIMIT}",
-    "difficulty": "0x1",
-    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
-    "coinbase": "0x0000000000000000000000000000000000000000",
-    "alloc": {}
-  },
-  "blockchain": {
-    "nodes": {
-      "generate": true,
-      "count": ${NUM_VALIDATORS}
-    }
-  }
-}
-EOF
-
-log_success "Setup complete!"
-log_warn "Next steps:"
-echo "1. Review and update genesis.json with actual validator addresses"
-echo "2. Generate proper IBFT extraData using: besu operator generate-blockchain-config"
-echo "3. Store validator keys securely (Azure Key Vault for production)"
-echo "4. Deploy infrastructure using Terraform"
+log_warn "scripts/generate-genesis.sh is now a compatibility wrapper."
+log_warn "Forwarding to the canonical QBFT generator: ./scripts/generate-genesis-proper.sh ${1:-4}"
 
+exec "$TARGET_SCRIPT" "$@"
diff --git a/scripts/key-management/generate-validator-keys.sh b/scripts/key-management/generate-validator-keys.sh
index f9e416c..7fbdc34 100755
--- a/scripts/key-management/generate-validator-keys.sh
+++ b/scripts/key-management/generate-validator-keys.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-# Generate validator keys for IBFT 2.0
-# This script generates validator keypairs for Besu IBFT 2.0 consensus
+# Generate validator keys for QBFT
+# This script generates validator keypairs for Besu QBFT consensus
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../lib/init.sh"
@@ -46,4 +46,3 @@ done
 echo "Validator keys generated in: $KEYS_DIR"
 echo "Password file: $PASSWORD_FILE"
 echo "IMPORTANT: Store keys securely. For production, use Azure Key Vault or HSM."
-
diff --git a/scripts/validation/validate-genesis.sh b/scripts/validation/validate-genesis.sh
index b93d18f..603331b 100755
--- a/scripts/validation/validate-genesis.sh
+++ b/scripts/validation/validate-genesis.sh
@@ -53,7 +53,7 @@ EXTRA_DATA=$(jq -r '.extraData' "$GENESIS_FILE")
 if [ "$EXTRA_DATA" != "0x" ] && [ -n "$EXTRA_DATA" ]; then
     log_success "✓ extraData is set: ${EXTRA_DATA:0:50}..."
     
-    # Validate extraData length (should be reasonable for IBFT)
+    # Validate extraData length (should be reasonable for QBFT)
     EXTRA_DATA_LENGTH=$(echo -n "$EXTRA_DATA" | wc -c)
     if [ "$EXTRA_DATA_LENGTH" -gt 2 ]; then
         log_success "✓ extraData has content (length: $EXTRA_DATA_LENGTH)"
@@ -67,12 +67,12 @@ else
     exit 1
 fi
 
-# Check IBFT 2 / QBFT configuration
-log_warn "Checking IBFT 2 / QBFT configuration..."
-IBFT_CONFIG=$(jq -r '.config.ibft2 // .config.qbft // "null"' "$GENESIS_FILE")
-if [ "$IBFT_CONFIG" != "null" ]; then
-    log_success "✓ IBFT 2.0 / QBFT configuration exists"
-    # Prefer qbft for Chain 138
+# Check QBFT configuration
+log_warn "Checking QBFT configuration..."
+CONSENSUS_CONFIG=$(jq -r '.config.qbft // .config.ibft2 // "null"' "$GENESIS_FILE")
+if [ "$CONSENSUS_CONFIG" != "null" ]; then
+    log_success "✓ QBFT-compatible consensus configuration exists"
+    # Prefer qbft for Chain 138, but tolerate older ibft2-shaped historical files.
     BLOCK_KEY=".config.qbft.blockperiodseconds // .config.ibft2.blockperiodseconds"
     EPOCH_KEY=".config.qbft.epochlength // .config.ibft2.epochlength"
     BLOCK_PERIOD=$(jq -r "$BLOCK_KEY" "$GENESIS_FILE")
@@ -88,7 +88,7 @@ if [ "$IBFT_CONFIG" != "null" ]; then
         log_warn "⚠ Epoch length is $EPOCH_LENGTH (expected 30000)"
     fi
 else
-    log_error "✗ IBFT 2.0 / QBFT configuration not found"
+    log_error "✗ QBFT-compatible consensus configuration not found"
     exit 1
 fi
 
@@ -117,4 +117,3 @@ fi
 
 log_success "Genesis file validation completed"
 log_success "✓ All validations passed"
-