chore: remove outdated documentation and reference files

- Remove debugging service documentation (DEBUgging_SERVICES.md)
- Remove development logs policy and quick reference guides
- Remove E2E test creation summary
- Remove gift certificate example file
- Remove GitHub pull summary documentation

docs/0_getting_started/2_installation.md

@@ -77,10 +77,10 @@ MEMPOOL_BACKEND=database
 ## Systemd Services (Production)
 
 ```bash
-sudo cp systemd/aitbc-*.service /etc/systemd/system/
-sudo systemctl daemon-reload
-sudo systemctl enable --now aitbc-coordinator-api
-sudo systemctl enable --now aitbc-blockchain-node-1
+cp systemd/aitbc-*.service /etc/systemd/system/
+systemctl daemon-reload
+systemctl enable --now aitbc-coordinator-api
+systemctl enable --now aitbc-blockchain-node-1
 ```
 
 ## Verify

docs/0_getting_started/ENHANCED_SERVICES_IMPLEMENTATION_GUIDE.md

@@ -286,7 +286,7 @@ free -h
 systemctl status aitbc-adaptive-learning.service --no-pager
 
 # Adjust memory limits
-sudo systemctl edit aitbc-adaptive-learning.service
+systemctl edit aitbc-adaptive-learning.service
 ```
 
 ### Performance Optimization
@@ -304,7 +304,7 @@ export CUDA_LAUNCH_BLOCKING=1
 #### 2. Service Tuning
 ```bash
 # Adjust service resources
-sudo systemctl edit aitbc-multimodal.service
+systemctl edit aitbc-multimodal.service
 # Add:
 # [Service]
 # MemoryMax=4G
@@ -372,7 +372,7 @@ sudo -u postgres psql aitbc < aitbc-db-backup.sql
 ./manage_services.sh stop
 
 # Emergency restart
-sudo systemctl daemon-reload
+systemctl daemon-reload
 ./manage_services.sh start
 
 # Check system status

docs/12_issues/89_test.md

@@ -59,7 +59,7 @@ skill test
 python -m pytest tests/integration/test_multichain.py -v
 
 # Run all tests including multi-chain scenarios
-./tests/run_all_tests.sh
+./scripts/testing/run_all_tests.sh
 ```
 
 #### Using CLI for Testing
@@ -168,7 +168,7 @@ python -m aitbc_cli --url http://127.0.0.1:8000 --api-key test-key blockchain he
 #### **4.1 Run Complete Test Suite**
 ```bash
 # Execute all tests including multi-chain scenarios
-./tests/run_all_tests.sh
+./scripts/testing/run_all_tests.sh
 
 # Run specific multi-chain integration tests
 python -m pytest tests/integration/test_multichain.py -v
@@ -237,7 +237,7 @@ jobs:
 ### **Scheduled Testing**
 ```bash
 # Regular multi-chain test execution
-0 2 * * * cd /home/oib/windsurf/aitbc && ./tests/run_all_tests.sh
+0 2 * * * cd /home/oib/windsurf/aitbc && ./scripts/testing/run_all_tests.sh
 ```
 
 ## Troubleshooting

docs/12_issues/mock-coordinator-services-removed-2026-02-16.md

@@ -23,23 +23,23 @@ Historical development setup included mock coordinator services for testing purp
 ### 1. Localhost Cleanup
 ```bash
 # Stop and disable mock service
-sudo systemctl stop aitbc-mock-coordinator.service
-sudo systemctl disable aitbc-mock-coordinator.service
+systemctl stop aitbc-mock-coordinator.service
+systemctl disable aitbc-mock-coordinator.service
 
 # Remove service file
-sudo rm /etc/systemd/system/aitbc-mock-coordinator.service
-sudo systemctl daemon-reload
+rm /etc/systemd/system/aitbc-mock-coordinator.service
+systemctl daemon-reload
 ```
 
 ### 2. AITBC Server Cleanup
 ```bash
 # Stop and disable mock service
-ssh aitbc-cascade "systemctl stop aitbc-coordinator.service"
-ssh aitbc-cascade "systemctl disable aitbc-coordinator.service"
+ssh aitbc "systemctl stop aitbc-coordinator.service"
+ssh aitbc "systemctl disable aitbc-coordinator.service"
 
 # Remove service file
-ssh aitbc-cascade "rm /etc/systemd/system/aitbc-coordinator.service"
-ssh aitbc-cascade "systemctl daemon-reload"
+ssh aitbc "rm /etc/systemd/system/aitbc-coordinator.service"
+ssh aitbc "systemctl daemon-reload"
 ```
 
 ### 3. Production Service Verification

docs/13_tasks/completed_phases/15_deployment_guide.md

@@ -209,21 +209,21 @@ server {
 
 ```bash
 # Enable and start services
-sudo systemctl enable aitbc-reputation
-sudo systemctl enable aitbc-rewards
-sudo systemctl enable aitbc-trading
-sudo systemctl enable aitbc-analytics
-sudo systemctl enable aitbc-certification
+systemctl enable aitbc-reputation
+systemctl enable aitbc-rewards
+systemctl enable aitbc-trading
+systemctl enable aitbc-analytics
+systemctl enable aitbc-certification
 
 # Start services
-sudo systemctl start aitbc-reputation
-sudo systemctl start aitbc-rewards
-sudo systemctl start aitbc-trading
-sudo systemctl start aitbc-analytics
-sudo systemctl start aitbc-certification
+systemctl start aitbc-reputation
+systemctl start aitbc-rewards
+systemctl start aitbc-trading
+systemctl start aitbc-analytics
+systemctl start aitbc-certification
 
 # Check status
-sudo systemctl status aitbc-*
+systemctl status aitbc-*
 ```
 
 ## Configuration Details
@@ -588,7 +588,7 @@ CACHE_CONFIG = {
 1. **Database Connection Errors**
    ```bash
    # Check PostgreSQL status
-   sudo systemctl status postgresql
+   systemctl status postgresql
    
    # Check connection
    psql -h localhost -U aitbc_user -d aitbc_economics
@@ -667,10 +667,10 @@ curl -f http://localhost:8000/health || echo "Health check failed"
 
 ```bash
 # Rollback to previous version
-sudo systemctl stop aitbc-*
+systemctl stop aitbc-*
 git checkout previous_version_tag
 pip install -r requirements.txt
-sudo systemctl start aitbc-*
+systemctl start aitbc-*
 ```
 
 ### Database Rollback

docs/13_tasks/deployment_reports/aitbc_aitbc1_deployment_success.md

@@ -193,9 +193,9 @@ server {
 #### **Services Not Starting**
 ```bash
 # Check service status
-sudo systemctl status aitbc-cross-chain-reputation
-sudo systemctl status aitbc-agent-communication
-sudo systemctl status aitbc-advanced-learning
+systemctl status aitbc-cross-chain-reputation
+systemctl status aitbc-agent-communication
+systemctl status aitbc-advanced-learning
 
 # Check logs
 sudo journalctl -u aitbc-cross-chain-reputation
@@ -206,7 +206,7 @@ sudo journalctl -u aitbc-advanced-learning
 #### **Nginx Issues**
 ```bash
 # Check nginx status
-sudo systemctl status nginx
+systemctl status nginx
 
 # Test configuration
 sudo nginx -t
@@ -224,7 +224,7 @@ ls -la /var/www/aitbc.bubuit.net/
 sudo nginx -t
 
 # Restart nginx
-sudo systemctl restart nginx
+systemctl restart nginx
 ```
 
 ### 📞 **Support Contacts**

docs/18_explorer/EXPLORER_FIXES_SUMMARY.md

@@ -145,7 +145,7 @@ testpaths = tests
 
 ## 🧪 **Verification Tests Created**
 
-Created comprehensive test suite `tests/test_explorer_fixes.py`:
+Created comprehensive test suite `tests/explorer/test_explorer_fixes.py`:
 
 ```python
 ✅ test_pytest_configuration_restored

docs/1_project/1_files.md

@@ -2,7 +2,7 @@
 
 This document describes the current organization and status of files and folders in the repository.
 
-Last updated: 2026-03-06
+Last updated: 2026-03-25
 
 ---
 
@@ -21,7 +21,18 @@ Last updated: 2026-03-06
 | `apps/coordinator-api/tests/test_gpu_marketplace.py` | ✅ Active | 22 GPU marketplace tests (Feb 2026) |
 | `apps/coordinator-api/tests/test_billing.py` | ✅ Active | 21 billing/usage-tracking tests (Feb 2026) |
 | `apps/coordinator-api/tests/conftest.py` | ✅ Active | App namespace isolation for coordinator tests |
-| `tests/cli/test_cli_integration.py` | ✅ Active | 24 CLI → live coordinator integration tests (Feb 2026) |
+| `tests/` | ✅ Active | Test suites (reorganized Mar 2026) |
+| `tests/cli/` | ✅ Active | CLI tests (28 files, organized Mar 2026) |
+| `tests/integration/` | ✅ Active | Integration tests (28 files, organized Mar 2026) |
+| `tests/security/` | ✅ Active | Security tests (5 files, organized Mar 2026) |
+| `tests/explorer/` | ✅ Active | Explorer tests (2 files, organized Mar 2026) |
+| `tests/websocket/` | ✅ Active | WebSocket tests (2 files, organized Mar 2026) |
+| `tests/testing/` | ✅ Active | Performance/testing utilities (25 files, organized Mar 2026) |
+| `tests/unit/` | ✅ Active | Unit tests (9 files, organized Mar 2026) |
+| `tests/e2e/` | ✅ Active | End-to-end tests (26 files, organized Mar 2026) |
+| `tests/docs/` | ✅ Active | Test documentation (5 files, organized Mar 2026) |
+| `tests/conftest.py` | ✅ Active | Test configuration (root level) |
+| `tests/test_runner.py` | ✅ Active | Test runner (root level) |
 
 ### Scripts (`scripts/`)
 
@@ -29,12 +40,16 @@ Last updated: 2026-03-06
 |------|--------|-------|
 | `scripts/aitbc-cli.sh` | ✅ Active | Main CLI tool, heavily used |
 | `scripts/dev/gpu/gpu_miner_host.py` | ✅ Active | Production GPU miner, standardized (Mar 2026) |
-| `scripts/deploy/` | ✅ Active | Deployment scripts (35 files) |
-| `scripts/deploy/deploy-multimodal-services.sh` | ✅ Active | Environment-aware multimodal deployment (Mar 2026) |
-| `scripts/verify-codebase-update.sh` | ✅ Active | Automated codebase verification (Mar 2026) |
-| `scripts/service/` | ✅ Active | Service management |
-| `scripts/dev_services.sh` | ✅ Active | Local development |
-| `scripts/testing/` | ✅ Active | Test scripts (moved from root, 13 files) |
+| `scripts/services/` | ✅ Active | Service files (5 FastAPI services, moved Mar 2026) |
+| `scripts/deployment/` | ✅ Active | Deployment scripts (35 files, organized Mar 2026) |
+| `scripts/testing/` | ✅ Active | Test scripts (20 files, organized Mar 2026) |
+| `scripts/monitoring/` | ✅ Active | Monitoring scripts (3 files, organized Mar 2026) |
+| `scripts/development/` | ✅ Active | Development scripts (6 files, organized Mar 2026) |
+| `scripts/utils/` | ✅ Active | Utility scripts (40 files, organized Mar 2026) |
+| `scripts/manage-services.sh` | ✅ Active | Main service management script (updated Mar 2026) |
+| `scripts/README.md` | ✅ Active | Scripts documentation |
+| `scripts/deploy/` | ✅ Active | Legacy deployment scripts (27 files) |
+| `scripts/gpu/` | ✅ Active | GPU service scripts (9 files, moved to services/) |
 
 ### Infrastructure (`infra/`, `systemd/`)
 
@@ -65,7 +80,10 @@ Last updated: 2026-03-06
 
 | Path | Status | Notes |
 |------|--------|-------|
-| `docs/1_project/` | ✅ Active | Project management docs (restructured) |
+| `docs/1_project/` | ✅ Active | Project management docs (updated Mar 2026) |
+| `docs/1_project/aitbc.md` | ✅ Active | Secondary server deployment guide (updated Mar 2026) |
+| `docs/1_project/aitbc1.md` | ✅ Active | Primary server deployment guide (updated Mar 2026) |
+| `docs/1_project/3_infrastructure.md` | ✅ Active | Infrastructure documentation (updated Mar 2026) |
 | `docs/infrastructure/` | ✅ Active | Infrastructure documentation (Mar 2026) |
 | `docs/infrastructure/codebase-update-summary.md` | ✅ Active | Comprehensive standardization summary (Mar 2026) |
 | `docs/DOCS_WORKFLOW_COMPLETION_SUMMARY.md` | ✅ Active | Documentation updates completion (Mar 2026) |
@@ -259,11 +277,26 @@ These empty folders are intentional scaffolding for planned future work per the
 - **Workflows documented** for repeatable processes
 - **File organization prevention** system implemented
 
-### ✅ CLI Development Environment Optimization (March 6, 2026)
-- **CLI development tools** moved from `cli-dev` to `dev/cli`
-- **Centralized development** environment in unified `/dev/` structure
-- **Improved project organization** with reduced root-level clutter
-- **Backup system** implemented with proper git exclusion
+### ✅ Complete Scripts and Tests Organization (March 25, 2026)
+- **Scripts organized** by purpose into 6 categories (services, deployment, testing, monitoring, development, utils)
+- **Test files organized** by function into 9 categories (cli, integration, security, explorer, websocket, testing, unit, e2e, docs)
+- **Service scripts** moved to dedicated `scripts/services/` folder
+- **Documentation updated** to reflect new file locations
+- **No codebase rewrites** needed - all paths already properly configured
+
+### ✅ Server Architecture Updates (March 25, 2026)
+- **aitbc1** established as primary server (https://aitbc1.bubuit.net) with reverse proxy role
+- **aitbc** established as secondary server (https://aitbc.bubuit.net) with application services
+- **SSH access** simplified to `ssh aitbc` and `ssh aitbc1` (root login, no sudo needed)
+- **Deployment guides** updated to reflect new primary/secondary architecture
+- **Infrastructure documentation** updated for two-server setup
+
+### ✅ Documentation Standardization (March 25, 2026)
+- **All sudo references** removed from systemctl commands (root access)
+- **SSH references** updated to use new server names
+- **Service paths** updated in documentation to reflect new organization
+- **12 documentation files** updated across the codebase
+- **Consistent command patterns** applied throughout
 
 ### ✅ Explorer Architecture Simplification (March 6, 2026)
 - **TypeScript explorer** merged into Python blockchain-explorer
@@ -319,12 +352,30 @@ aitbc/
 │   ├── py/aitbc-sdk/        # Python SDK
 │   └── solidity/aitbc-token/# ERC-20 token contract
 ├── plugins/                 # ✅ Keep (ollama)
-├── scripts/                 # ✅ Keep - organized by purpose
-│   ├── deploy/              # ✅ Deployment scripts (35 files)
-│   ├── dev/                 # ✅ Development scripts
-│   └── testing/             # ✅ Test scripts
+├── scripts/                 # ✅ Scripts organized by purpose (Mar 2026)
+│   ├── services/            # ✅ Service files (5 FastAPI services)
+│   ├── deployment/          # ✅ Deployment scripts (35 files)
+│   ├── testing/             # ✅ Test scripts (20 files)
+│   ├── monitoring/          # ✅ Monitoring scripts (3 files)
+│   ├── development/         # ✅ Development scripts (6 files)
+│   ├── utils/               # ✅ Utility scripts (40 files)
+│   ├── deploy/              # ✅ Legacy deployment scripts (27 files)
+│   ├── gpu/                 # ✅ GPU service scripts (9 files)
+│   ├── manage-services.sh   # ✅ Main service management script
+│   └── README.md            # ✅ Scripts documentation
 ├── systemd/                 # ✅ Systemd service units (19+ files)
-├── tests/                   # ✅ Test suites
+├── tests/                   # ✅ Test suites organized by function (Mar 2026)
+│   ├── cli/                 # ✅ CLI tests (28 files)
+│   ├── integration/          # ✅ Integration tests (28 files)
+│   ├── security/            # ✅ Security tests (5 files)
+│   ├── explorer/            # ✅ Explorer tests (2 files)
+│   ├── websocket/           # ✅ WebSocket tests (2 files)
+│   ├── testing/             # ✅ Performance/testing utilities (25 files)
+│   ├── unit/                # ✅ Unit tests (9 files)
+│   ├── e2e/                 # ✅ End-to-end tests (26 files)
+│   ├── docs/                # ✅ Test documentation (5 files)
+│   ├── conftest.py          # ✅ Test configuration
+│   └── test_runner.py       # ✅ Test runner
 ├── website/                 # ✅ Public website and HTML docs
 ├── dev-utils/               # ✅ Development utilities (legacy)
 ├── data/                    # ✅ Runtime data (gitignored)
@@ -335,12 +386,14 @@ aitbc/
 This structure represents the current clean state of the AITBC repository with all essential components organized for optimal development and deployment workflows. The March 2026 standardization effort has resulted in:
 
 - **100% service standardization** across all systemd services
-- **Improved file organization** with proper dev/ structure
+- **Complete scripts and tests organization** by purpose and function
+- **Updated server architecture** with primary/secondary server setup
 - **Enhanced documentation** with comprehensive infrastructure guides
 - **Automated verification tools** for maintaining standards
 - **Production-ready infrastructure** with all services operational
 - **Optimized CLI development** with centralized dev/cli environment
 - **Agent-first architecture** with simplified explorer service
 - **Comprehensive backup system** with proper git exclusion
+- **Standardized SSH access** with root privileges and no sudo requirements
 
 **Note**: Redundant `apps/logs/` directory removed - central `logs/` directory at root level is used for all logging. Redundant `assets/` directory removed - Firefox extension assets are properly organized in `extensions/aitbc-wallet-firefox/`. CLI development environment moved from `cli-dev` to `dev/cli` for better organization. Explorer TypeScript source merged into Python service and backed up.

docs/1_project/2_roadmap.md

@@ -110,6 +110,26 @@ This roadmap aggregates high-priority tasks derived from the bootstrap specifica
   - ✅ Performance validation against deployment report targets
   - ✅ Complete documentation and usage guides
 
+## Stage 28 — Project File Organization & Documentation Updates [COMPLETED: 2026-03-25]
+
+- **Root Directory Cleanup**
+  - ✅ Move 60+ loose files from root to proper subdirectories
+  - ✅ Organize development scripts into `dev/review/`, `dev/fixes/`, `scripts/testing/`
+  - ✅ Organize configuration files into `config/genesis/`, `config/networks/`, `config/templates/`
+  - ✅ Move documentation to `docs/development/`, `docs/deployment/`, `docs/project/`
+  - ✅ Organize temporary files into `temp/backups/`, `temp/patches/`, `logs/qa/`
+
+- **File Organization Workflow**
+  - ✅ Create `/organize-project-files` workflow for systematic file management
+  - ✅ Implement dependency analysis to prevent codebreak from file moves
+  - ✅ Establish categorization rules for different file types
+  - ✅ Verify essential root files remain (configuration, documentation, system files)
+
+- **Documentation Updates**
+  - ✅ Update project completion status in `docs/1_project/5_done.md`
+  - ✅ Reflect file organization milestone in roadmap documentation
+  - ✅ Ensure all documentation references point to correct file locations
+
 ## Current Status: Agent-First Transformation Complete
 
 **Milestone Achievement**: Successfully transformed AITBC to agent-first architecture with comprehensive CLI tools, enhanced services deployment, and complete end-to-end testing framework. All 22 commands from README are fully implemented with complete test coverage and documentation.

docs/1_project/3_infrastructure.md

@@ -4,21 +4,21 @@
 
 ## Overview
 
-Two-tier architecture: **incus host (at1)** runs the reverse proxy with SSL termination, forwarding all `aitbc.bubuit.net` traffic to the **aitbc container** which runs nginx + all services. **Updated for port logic 8000+ implementation with unified numbering scheme and production-ready codebase.**
+Two-tier architecture: **aitbc1 primary server** (https://aitbc1.bubuit.net) and **aitbc secondary server** (https://aitbc.bubuit.net) with **aitbc1 as reverse proxy** forwarding all traffic to aitbc container services. **Updated for port logic 8000+ implementation with unified numbering scheme and production-ready codebase.**
 
 ```
-Internet → aitbc.bubuit.net (HTTPS :443)
+Internet → aitbc1.bubuit.net (HTTPS :443) → aitbc.bubuit.net
     │
     ▼
 ┌──────────────────────────────────────────────┐
-│  Incus Host (at1 / localhost)                │
+│  aitbc1 Primary Server (Reverse Proxy)        │
 │  Nginx reverse proxy (:443 SSL → :80)       │
 │  Config: /etc/nginx/sites-available/         │
 │          aitbc-proxy.conf                    │
 │                                              │
 │  ┌────────────────────────────────────────┐  │
-│  │  Container: aitbc (10.1.223.1)        │  │
-│  │  Access: ssh aitbc-cascade            │  │
+│  │  Container: aitbc (aitbc server)      │  │
+│  │  Access: ssh aitbc                    │  │
 │  │  OS: Debian 13 Trixie                  │  │
 │  │  Node.js: 24+                          │  │
 │  │  Python: 3.13.5+                       │  │
@@ -170,8 +170,8 @@ On at1, `/opt/aitbc` uses individual symlinks to the Windsurf project directorie
 sc-status aitbc-blockchain-node.service aitbc-blockchain-rpc.service aitbc-gpu-miner.service aitbc-mock-coordinator.service
 
 # Start services
-sudo systemctl start aitbc-mock-coordinator.service
-sudo systemctl start aitbc-blockchain-node.service
+systemctl start aitbc-mock-coordinator.service
+systemctl start aitbc-blockchain-node.service
 
 # Check logs
 journalctl -u aitbc-mock-coordinator --no-pager -n 20
@@ -260,7 +260,7 @@ server {
 
 ### Access
 ```bash
-ssh aitbc-cascade                    # Direct SSH to container
+ssh aitbc                          # Direct SSH to aitbc server
 ```
 
 **GPU Access**: No GPU passthrough. All GPU workloads must run on **at1** (Windsurf development host), not inside incus containers.
@@ -378,16 +378,26 @@ All Python services in the AITBC container run on **Python 3.13.5** with isolate
 # Note: Standardized /opt/aitbc structure for all services
 ```
 
-**Verification Commands:**
+**Minimum Default Verification Commands:**
 ```bash
-ssh aitbc-cascade "python3 --version"  # Should show Python 3.13.5
-ssh aitbc-cascade "node --version"      # Should show v24.14.x
-ssh aitbc-cascade "npm --version"       # Should show compatible version
-ssh aitbc-cascade "ls -la /opt/*/.venv/bin/python"  # Check venv symlinks
-ssh aitbc-cascade "curl -s http://127.0.0.1:8000/v1/health"  # Coordinator API health
+# From aitbc1 primary server
+ssh aitbc "python3 --version"  # Should show Python 3.13.5
+ssh aitbc "node --version"      # Should show v24.14.x
+ssh aitbc "npm --version"       # Should show compatible version
+ssh aitbc "ls -la /opt/*/.venv/bin/python"  # Check venv symlinks
+ssh aitbc "curl -s http://127.0.0.1:8000/v1/health"  # Coordinator API health
 curl -s https://aitbc.bubuit.net/api/v1/health  # External API access
 ```
 
+**SSH Access:**
+```bash
+# From aitbc1 to aitbc (secondary server)
+ssh aitbc
+
+# From aitbc to aitbc1 (primary server)  
+ssh aitbc1
+```
+
 ### Nginx Routes (container)
 
 Config: `/etc/nginx/sites-enabled/aitbc`
@@ -549,25 +559,25 @@ curl http://aitbc.keisanki.net/rpc/head    # Node 3 RPC (port 8003)
 ### Deploying to Container
 ```bash
 # Push website files
-scp -r website/* aitbc-cascade:/var/www/aitbc.bubuit.net/
+scp -r website/* aitbc:/var/www/aitbc.bubuit.net/
 
 # Push app updates (blockchain-explorer serves its own interface)
 # No separate deployment needed - blockchain-explorer handles both API and UI
 
 # Restart a service
-ssh aitbc-cascade "systemctl restart coordinator-api"
+ssh aitbc "systemctl restart coordinator-api"
 ```
 
 ## Health Checks
 
 ```bash
-# From at1 (via container)
-ssh aitbc-cascade "curl -s http://localhost:8000/v1/health"
-ssh aitbc-cascade "curl -s http://localhost:8003/rpc/head | jq .height"
+# From aitbc1 (via aitbc server)
+ssh aitbc "curl -s http://localhost:8000/v1/health"
+ssh aitbc "curl -s http://localhost:8003/rpc/head | jq .height"
 
 # Test enhanced services
-ssh aitbc-cascade "curl -s http://localhost:8010/health"  # Multimodal GPU (CPU-only)
-ssh aitbc-cascade "curl -s http://localhost:8017/health"  # Geographic Load Balancer
+ssh aitbc "curl -s http://localhost:8010/health"  # Multimodal GPU (CPU-only)
+ssh aitbc "curl -s http://localhost:8017/health"  # Geographic Load Balancer
 
 # From internet (Python 3.13.5 upgraded services)
 curl -s https://aitbc.bubuit.net/health
@@ -582,25 +592,25 @@ curl -s https://aitbc.bubuit.net/api/loadbalancer/health
 ssh ns3-root "curl -s http://192.168.100.10:8003/rpc/head | jq .height"
 
 # Python version verification
-ssh aitbc-cascade "python3 --version"  # Python 3.13.5
+ssh aitbc "python3 --version"  # Python 3.13.5
 ```
 
 ## Monitoring and Logging
 
 ```bash
 # Container systemd logs
-ssh aitbc-cascade "journalctl -u aitbc-coordinator-api --no-pager -n 20"
-ssh aitbc-cascade "journalctl -u aitbc-blockchain-node --no-pager -n 20"
+ssh aitbc "journalctl -u aitbc-coordinator-api --no-pager -n 20"
+ssh aitbc "journalctl -u aitbc-blockchain-node --no-pager -n 20"
 
 # Enhanced services logs
-ssh aitbc-cascade "journalctl -u aitbc-multimodal-gpu --no-pager -n 20"
-ssh aitbc-cascade "journalctl -u aitbc-loadbalancer-geo --no-pager -n 20"
+ssh aitbc "journalctl -u aitbc-multimodal-gpu --no-pager -n 20"
+ssh aitbc "journalctl -u aitbc-loadbalancer-geo --no-pager -n 20"
 
 # Container nginx logs
-ssh aitbc-cascade "tail -20 /var/log/nginx/aitbc.bubuit.net.error.log"
+ssh aitbc "tail -20 /var/log/nginx/aitbc.bubuit.net.error.log"
 
 # Host nginx logs
-sudo tail -20 /var/log/nginx/error.log
+tail -20 /var/log/nginx/error.log
 ```
 
 ## Security
@@ -645,21 +655,19 @@ PORT=8010-8017  # Enhanced services port range
 
 ### Container Access & Port Logic (Updated March 6, 2026)
 
-#### **SSH-Based Container Access**
+#### **SSH-Based Server Access**
 ```bash
-# Access aitbc container
-ssh aitbc-cascade
+# Access aitbc server
+ssh aitbc
 
-# Access aitbc1 container  
+# Access aitbc1 server (from incus host only)
 ssh aitbc1-cascade
 
-# Check services in containers
-ssh aitbc-cascade 'systemctl list-units | grep aitbc-'
-ssh aitbc1-cascade 'systemctl list-units | grep aitbc-'
+# Check services in servers
+ssh aitbc 'systemctl list-units | grep aitbc-'
 
 # Debug specific services
-ssh aitbc-cascade 'systemctl status aitbc-coordinator-api'
-ssh aitbc1-cascade 'systemctl status aitbc-wallet'
+ssh aitbc 'systemctl status aitbc-coordinator-api'
 ```
 
 #### **Port Distribution Strategy - NEW STANDARD**
@@ -731,28 +739,22 @@ ssh aitbc1-cascade 'systemctl status aitbc-wallet'
 
 # Check port usage
 netstat -tlnp | grep -E ":(800[0-5]|801[0-7]|802[0-9])"
-ssh aitbc-cascade 'netstat -tlnp | grep -E ":(800[0-5]|801[0-7]|802[0-9])"
-ssh aitbc1-cascade 'netstat -tlnp | grep -E ":(800[0-5]|801[0-7]|802[0-9])"
+ssh aitbc 'netstat -tlnp | grep -E ":(800[0-5]|801[0-7]|802[0-9])'
 
 # Service Management Commands:
 # Primary services:
 systemctl status aitbc-blockchain-node.service  # localhost
 systemctl status aitbc-blockchain-rpc.service   # localhost (port 8006)
 systemctl status aitbc-wallet.service          # localhost (port 8002)
-ssh aitbc-cascade 'systemctl status aitbc-blockchain-node.service'  # aitbc container
-ssh aitbc1-cascade 'systemctl status aitbc-blockchain-node.service'  # aitbc1 container
+ssh aitbc 'systemctl status aitbc-blockchain-node.service'  # aitbc server
 
 # Wallet services:
-ssh aitbc-cascade 'systemctl status aitbc-wallet.service'  # port 8002
-ssh aitbc1-cascade 'systemctl status aitbc-wallet.service'  # port 8002
+ssh aitbc 'systemctl status aitbc-wallet.service'  # port 8002
 
 # RPC services:
-ssh aitbc-cascade 'systemctl status aitbc-blockchain-rpc.service'    # port 8006
-ssh aitbc1-cascade 'systemctl status aitbc-blockchain-rpc.service'    # port 8006
-ssh aitbc-cascade 'systemctl status aitbc-blockchain-rpc-dev.service' # port 8026
-ssh aitbc1-cascade 'systemctl status aitbc-blockchain-rpc-dev.service' # port 8026
+ssh aitbc 'systemctl status aitbc-blockchain-rpc.service'    # port 8006
+ssh aitbc 'systemctl status aitbc-blockchain-rpc-dev.service' # port 8026
 
 # Development services:
-ssh aitbc-cascade 'systemctl status aitbc-blockchain-node-dev.service'
-ssh aitbc1-cascade 'systemctl status aitbc-blockchain-node-dev.service'
+ssh aitbc 'systemctl status aitbc-blockchain-node-dev.service'
 ```

docs/1_project/5_done.md

@@ -549,6 +549,16 @@ This document tracks components that have been successfully deployed and are ope
   - Updated `docs/files.md` with new structure
   - Fixed systemd service path for GPU miner
 
+- ✅ **Project File Organization** - Completed March 25, 2026
+  - **Root Directory Cleanup**: Moved 60+ loose files to proper subdirectories
+  - **Development Scripts**: Organized into `dev/review/`, `dev/fixes/`, `scripts/testing/`
+  - **Configuration Files**: Genesis configs to `config/genesis/`, network configs to `config/networks/`
+  - **Documentation**: Moved to `docs/development/`, `docs/deployment/`, `docs/project/`
+  - **Temporary Files**: Organized into `temp/backups/`, `temp/patches/`, `logs/qa/`
+  - **Essential Root Files**: Only configuration, documentation, and system files remain
+  - **Dependency Analysis**: Verified no codebreak from file moves
+  - **Workflow Creation**: Established `/organize-project-files` workflow for future maintenance
+
 ## Recent Updates (2026-02-12)
 
 ### Persistent GPU Marketplace ✅

docs/1_project/aitbc.md

@@ -2,9 +2,9 @@
 
 ## Overview
 
-This guide provides comprehensive deployment instructions for the **aitbc server** (primary container), including infrastructure requirements, service configurations, and troubleshooting procedures. **Updated March 7, 2026: Unified port logic deployed, codebase committed to git, enhanced services operational.**
+This guide provides comprehensive deployment instructions for the **aitbc server** (secondary development server), including infrastructure requirements, service configurations, and troubleshooting procedures. **Updated March 25, 2026: Updated architecture with aitbc1 as primary server and aitbc as secondary server.**
 
-**Note**: This documentation is specific to the aitbc server. For aitbc1 server documentation, see [aitbc1.md](./aitbc1.md).
+**Note**: This documentation is specific to the aitbc secondary server. For aitbc1 primary server documentation, see [aitbc1.md](./aitbc1.md).
 
 ## System Requirements
 
@@ -57,38 +57,38 @@ This guide provides comprehensive deployment instructions for the **aitbc server
 
 ### **Container Access & SSH Management (Updated March 6, 2026)**
 
-#### **SSH-Based Container Access**
+#### **SSH-Based Server Access**
 ```bash
-# Access aitbc server (primary container)
-ssh aitbc-cascade
+# Access aitbc secondary server
+ssh aitbc
 
 # Check aitbc server status
-ssh aitbc-cascade 'systemctl status'
+ssh aitbc 'systemctl status'
 
 # List AITBC services on aitbc server
-ssh aitbc-cascade 'systemctl list-units | grep aitbc-'
+ssh aitbc 'systemctl list-units | grep aitbc-'
 ```
 
 #### **Service Management via SSH**
 ```bash
 # Start/stop services on aitbc server
-ssh aitbc-cascade 'sudo systemctl start aitbc-coordinator-api'
-ssh aitbc-cascade 'sudo systemctl stop aitbc-wallet'
+ssh aitbc 'systemctl start aitbc-coordinator-api'
+ssh aitbc 'systemctl stop aitbc-wallet'
 
 # Check service logs on aitbc server
-ssh aitbc-cascade 'sudo journalctl -f -u aitbc-coordinator-api'
+ssh aitbc 'journalctl -f -u aitbc-coordinator-api'
 
 # Debug service issues on aitbc server
-ssh aitbc-cascade 'sudo systemctl status aitbc-coordinator-api'
-ssh aitbc-cascade 'sudo systemctl status aitbc-wallet'
+ssh aitbc 'systemctl status aitbc-coordinator-api'
+ssh aitbc 'systemctl status aitbc-wallet'
 
 # Check blockchain services on aitbc server
-ssh aitbc-cascade 'sudo systemctl status aitbc-blockchain-node'
-ssh aitbc-cascade 'sudo systemctl status aitbc-blockchain-rpc'
+ssh aitbc 'systemctl status aitbc-blockchain-node'
+ssh aitbc 'systemctl status aitbc-blockchain-rpc'
 
 # Check development services on aitbc server
-ssh aitbc-cascade 'sudo systemctl status aitbc-blockchain-node-dev'
-ssh aitbc-cascade 'sudo systemctl status aitbc-blockchain-rpc-dev'
+ssh aitbc 'systemctl status aitbc-blockchain-node-dev'
+ssh aitbc 'systemctl status aitbc-blockchain-rpc-dev'
 ```
 
 #### **Port Distribution Strategy (Updated March 7, 2026)**
@@ -173,21 +173,21 @@ AITBC Platform Architecture (Updated March 7, 2026)
 #### 1.1 System Preparation
 ```bash
 # Update system packages
-sudo apt update && sudo apt upgrade -y
+apt update && apt upgrade -y
 
 # Install required packages
-sudo apt install -y python3.13 python3.13-venv python3-pip nodejs npm nginx sqlite3
+apt install -y python3.13 python3.13-venv python3-pip nodejs npm nginx sqlite3
 
 # Create aitbc user
-sudo useradd -m -s /bin/bash aitbc
-sudo usermod -aG sudo aitbc
+useradd -m -s /bin/bash aitbc
+usermod -aG sudo aitbc
 ```
 
 #### 1.2 Directory Structure
 ```bash
 # Create AITBC directory structure (standardized)
-sudo mkdir -p /opt/aitbc/{apps,config,logs,scripts,backups}
-sudo chown -R aitbc:aitbc /opt/aitbc
+mkdir -p /opt/aitbc/{apps,config,logs,scripts,backups}
+chown -R aitbc:aitbc /opt/aitbc
 ```
 
 #### 1.3 Code Deployment
@@ -200,8 +200,8 @@ git clone https://github.com/oib/AITBC.git .
 # scp -r /path/to/aitbc/* aitbc@target:/opt/aitbc/
 
 # Set permissions (standardized)
-sudo chown -R aitbc:aitbc /opt/aitbc
-sudo chmod -R 755 /opt/aitbc
+chown -R aitbc:aitbc /opt/aitbc
+chmod -R 755 /opt/aitbc
 ```
 
 ### **Phase 2: Service Configuration**
@@ -245,26 +245,26 @@ chown aitbc:aitbc .env
 #### 2.3 Systemd Service Installation
 ```bash
 # Copy service files (updated for new port logic)
-sudo cp -r /opt/aitbc/systemd/* /etc/systemd/system/
-sudo systemctl daemon-reload
+cp -r /opt/aitbc/systemd/* /etc/systemd/system/
+systemctl daemon-reload
 
 # Enable core services
-sudo systemctl enable aitbc-coordinator-api.service
-sudo systemctl enable aitbc-exchange-api.service
-sudo systemctl enable aitbc-blockchain-node.service
-sudo systemctl enable aitbc-blockchain-rpc.service
-sudo systemctl enable aitbc-blockchain-service.service
-sudo systemctl enable aitbc-network-service.service
-sudo systemctl enable aitbc-explorer.service
+systemctl enable aitbc-coordinator-api.service
+systemctl enable aitbc-exchange-api.service
+systemctl enable aitbc-blockchain-node.service
+systemctl enable aitbc-blockchain-rpc.service
+systemctl enable aitbc-blockchain-service.service
+systemctl enable aitbc-network-service.service
+systemctl enable aitbc-explorer.service
 
 # Enable enhanced services (CPU-only mode)
-sudo systemctl enable aitbc-multimodal-gpu.service
-sudo systemctl enable aitbc-multimodal.service
-sudo systemctl enable aitbc-modality-optimization.service
-sudo systemctl enable aitbc-adaptive-learning.service
-sudo systemctl enable aitbc-marketplace-enhanced.service
-sudo systemctl enable aitbc-openclaw-enhanced.service
-sudo systemctl enable aitbc-loadbalancer-geo.service
+systemctl enable aitbc-multimodal-gpu.service
+systemctl enable aitbc-multimodal.service
+systemctl enable aitbc-modality-optimization.service
+systemctl enable aitbc-adaptive-learning.service
+systemctl enable aitbc-marketplace-enhanced.service
+systemctl enable aitbc-openclaw-enhanced.service
+systemctl enable aitbc-loadbalancer-geo.service
 ```
 
 ### **Phase 3: Service Deployment**
@@ -272,43 +272,43 @@ sudo systemctl enable aitbc-loadbalancer-geo.service
 #### 3.1 Core Services Startup
 ```bash
 # Start core services in order
-sudo systemctl start aitbc-coordinator-api.service
+systemctl start aitbc-coordinator-api.service
 sleep 3
-sudo systemctl start aitbc-exchange-api.service
+systemctl start aitbc-exchange-api.service
 sleep 3
-sudo systemctl start aitbc-blockchain-node.service
+systemctl start aitbc-blockchain-node.service
 sleep 3
-sudo systemctl start aitbc-blockchain-rpc.service
+systemctl start aitbc-blockchain-rpc.service
 sleep 3
-sudo systemctl start aitbc-blockchain-service.service
+systemctl start aitbc-blockchain-service.service
 sleep 3
-sudo systemctl start aitbc-network-service.service
+systemctl start aitbc-network-service.service
 sleep 3
-sudo systemctl start aitbc-explorer.service
+systemctl start aitbc-explorer.service
 ```
 
 #### 3.2 Enhanced Services Startup
 ```bash
 # Start enhanced services (CPU-only mode)
-sudo systemctl start aitbc-multimodal-gpu.service
+systemctl start aitbc-multimodal-gpu.service
 sleep 2
-sudo systemctl start aitbc-multimodal.service
+systemctl start aitbc-multimodal.service
 sleep 2
-sudo systemctl start aitbc-modality-optimization.service
+systemctl start aitbc-modality-optimization.service
 sleep 2
-sudo systemctl start aitbc-adaptive-learning.service
+systemctl start aitbc-adaptive-learning.service
 sleep 2
-sudo systemctl start aitbc-marketplace-enhanced.service
+systemctl start aitbc-marketplace-enhanced.service
 sleep 2
-sudo systemctl start aitbc-openclaw-enhanced.service
+systemctl start aitbc-openclaw-enhanced.service
 sleep 2
-sudo systemctl start aitbc-loadbalancer-geo.service
+systemctl start aitbc-loadbalancer-geo.service
 ```
 
 #### 3.3 Service Verification
 ```bash
 # Check service status
-sudo systemctl list-units --type=service --state=running | grep aitbc
+systemctl list-units --type=service --state=running | grep aitbc
 
 # Test core endpoints
 curl -X GET "http://localhost:8000/health"    # Coordinator API
@@ -352,13 +352,13 @@ PRAGMA temp_store = MEMORY;
 EOF
 
 # System limits
-echo "aitbc soft nofile 65536" | sudo tee -a /etc/security/limits.conf
-echo "aitbc hard nofile 65536" | sudo tee -a /etc/security/limits.conf
+echo "aitbc soft nofile 65536" | tee -a /etc/security/limits.conf
+echo "aitbc hard nofile 65536" | tee -a /etc/security/limits.conf
 
 # Network optimization
-echo "net.core.somaxconn = 1024" | sudo tee -a /etc/sysctl.conf
-echo "net.ipv4.tcp_max_syn_backlog = 1024" | sudo tee -a /etc/sysctl.conf
-sudo sysctl -p
+echo "net.core.somaxconn = 1024" | tee -a /etc/sysctl.conf
+echo "net.ipv4.tcp_max_syn_backlog = 1024" | tee -a /etc/sysctl.conf
+sysctl -p
 ```
 
 #### 4.3 Monitoring Setup
@@ -417,7 +417,7 @@ chown aitbc:aitbc /opt/aitbc/scripts/monitor-services.sh
 #### Service Not Starting
 ```bash
 # Check service logs
-sudo journalctl -u aitbc-coordinator-api.service -n 50
+journalctl -u aitbc-coordinator-api.service -n 50
 
 # Check Python environment (must be 3.13+)
 cd /opt/aitbc/apps/coordinator-api
@@ -443,14 +443,14 @@ mv /opt/aitbc/apps/coordinator-api/aitbc_coordinator.db /opt/aitbc/apps/coordina
 #### Port Conflicts (New Port Logic)
 ```bash
 # Check port usage (new port logic)
-sudo netstat -tlnp | grep -E ":(8000|8001|8003|8010|8011|8012|8013|8014|8015|8016|8017)"
+netstat -tlnp | grep -E ":(8000|8001|8003|8010|8011|8012|8013|8014|8015|8016|8017)"
 
 # Kill conflicting processes
-sudo fuser -k 8000/tcp  # Core services
-sudo fuser -k 8010/tcp  # Enhanced services
+fuser -k 8000/tcp  # Core services
+fuser -k 8010/tcp  # Enhanced services
 
 # Restart services
-sudo systemctl restart aitbc-coordinator-api.service
+systemctl restart aitbc-coordinator-api.service
 ```
 
 #### Container Access Issues
@@ -460,16 +460,16 @@ curl -s http://localhost:8017/health  # Should work
 curl -s http://10.1.223.1:8017/health  # Should work from containers
 
 # Check service binding
-sudo netstat -tlnp | grep :8017  # Should show 0.0.0.0:8017
+netstat -tlnp | grep :8017  # Should show 0.0.0.0:8017
 ```
 
 #### Permission Issues
 ```bash
 # Fix file ownership (standardized)
-sudo chown -R aitbc:aitbc /opt/aitbc
+chown -R aitbc:aitbc /opt/aitbc
 
 # Fix file permissions
-sudo chmod -R 755 /opt/aitbc
+chmod -R 755 /opt/aitbc
 chmod 600 /opt/aitbc/apps/coordinator-api/.env
 ```
 

docs/1_project/aitbc1.md

@@ -2,29 +2,30 @@
 
 ## Overview
 
-This document contains specific deployment notes and considerations for deploying the AITBC platform on the **aitbc1 server** (secondary container). These notes complement the general deployment guide with server-specific configurations and troubleshooting. **Updated for optimized CPU-only deployment with enhanced services disabled.**
+This document contains specific deployment notes and considerations for deploying the AITBC platform on the **aitbc1 server** (primary development server). These notes complement the general deployment guide with server-specific configurations and troubleshooting. **Updated March 25, 2026: Updated architecture with aitbc1 as primary server and aitbc as secondary server.**
 
-**Note**: This documentation is specific to the aitbc1 server. For aitbc server documentation, see [aitbc.md](./aitbc.md).
+**Note**: This documentation is specific to the aitbc1 primary server. For aitbc secondary server documentation, see [aitbc.md](./aitbc.md).
 
 ## Server Specifications
 
-### **aitbc1 Server Details**
-- **Hostname**: aitbc1 (container)
-- **IP Address**: 10.1.223.40 (container IP)
-- **Operating System**: Debian 13 Trixie (secondary development environment)
-- **Access Method**: SSH via aitbc1-cascade proxy
+### **aitbc1 Primary Server Details**
+- **Hostname**: aitbc1 (primary development server)
+- **IP Address**: 10.1.223.40 (server IP)
+- **Operating System**: Debian 13 Trixie (primary development environment)
+- **Access Method**: SSH via aitbc1-cascade proxy (from incus host only)
+- **Reverse Proxy Role**: Primary reverse proxy for aitbc.bubuit.net
 - **GPU Access**: None (CPU-only mode)
 - **Miner Service**: Not needed
 - **Enhanced Services**: Mixed status (some enabled, some failing)
 - **Web Root**: `/var/www/html/`
-- **Nginx Configuration**: Two-tier setup with SSL termination
+- **Nginx Configuration**: Primary reverse proxy with SSL termination
 - **Container Support**: Incus containers with 0.0.0.0 binding for container access
 - **Project Document Root**: `/opt/aitbc` (standardized across all AITBC containers)
 
-### **Network Architecture (Updated March 7, 2026)**
+### **Network Architecture (Updated March 25, 2026)**
 ```
-Internet → aitbc1-cascade (Proxy) → aitbc1 (Container)
-         SSH Access              Application Server
+Internet → aitbc1.bubuit.net (Primary Server) → aitbc.bubuit.net (Secondary Server)
+         HTTPS :443 (SSL Termination)       Application Services
          Port 22/443                       Port 8000-8001 (Core Services)
          Port 8005-8006                    Blockchain Services (AT1 Standard)
          Port 8025-8026                    Development Services
@@ -36,37 +37,40 @@ Internet → aitbc1-cascade (Proxy) → aitbc1 (Container)
 
 #### **Primary Access Methods**
 ```bash
-# Access aitbc1 server (secondary container)
+# Access aitbc1 primary server (from incus host only)
 ssh aitbc1-cascade
 
-# Check aitbc1 server connectivity
-ssh aitbc1-cascade 'echo "Container accessible"'
+# From aitbc secondary server to aitbc1 primary
+ssh aitbc1
+
+# Check aitbc1 primary server connectivity
+ssh aitbc1-cascade 'echo "Primary server accessible"'
 ```
 
 #### **Service Management via SSH**
 ```bash
-# List all AITBC services on aitbc1 server
-ssh aitbc1-cascade 'systemctl list-units | grep aitbc-'
+# List all AITBC services on aitbc1 primary server
+ssh aitbc1 'systemctl list-units | grep aitbc-'
 
-# Check specific service status on aitbc1 server
-ssh aitbc1-cascade 'systemctl status aitbc-coordinator-api'
-ssh aitbc1-cascade 'systemctl status aitbc-wallet'
+# Check specific service status on aitbc1 primary server
+ssh aitbc1 'systemctl status aitbc-coordinator-api'
+ssh aitbc1 'systemctl status aitbc-wallet'
 
-# Start/stop services on aitbc1 server
-ssh aitbc1-cascade 'sudo systemctl start aitbc-coordinator-api'
-ssh aitbc1-cascade 'sudo systemctl stop aitbc-wallet'
+# Start/stop services on aitbc1 primary server
+ssh aitbc1 'systemctl start aitbc-coordinator-api'
+ssh aitbc1 'systemctl stop aitbc-wallet'
 
-# View service logs on aitbc1 server
-ssh aitbc1-cascade 'sudo journalctl -f -u aitbc-coordinator-api'
-ssh aitbc1-cascade 'sudo journalctl -f -u aitbc-blockchain-node'
+# View service logs on aitbc1 primary server
+ssh aitbc1 'journalctl -f -u aitbc-coordinator-api'
+ssh aitbc1 'journalctl -f -u aitbc-blockchain-node'
 
-# Check blockchain services on aitbc1 server
-ssh aitbc1-cascade 'sudo systemctl status aitbc-blockchain-node'
-ssh aitbc1-cascade 'sudo systemctl status aitbc-blockchain-rpc'
+# Check blockchain services on aitbc1 primary server
+ssh aitbc1 'systemctl status aitbc-blockchain-node'
+ssh aitbc1 'systemctl status aitbc-blockchain-rpc'
 
-# Check development services on aitbc1 server
-ssh aitbc1-cascade 'sudo systemctl status aitbc-blockchain-node-dev'
-ssh aitbc1-cascade 'sudo systemctl status aitbc-blockchain-rpc-dev'
+# Check development services on aitbc1 primary server
+ssh aitbc1 'systemctl status aitbc-blockchain-node-dev'
+ssh aitbc1 'systemctl status aitbc-blockchain-rpc-dev'
 ```
 
 #### **Port Distribution & Conflict Resolution (Updated March 6, 2026)**
@@ -108,26 +112,26 @@ ssh aitbc1-cascade 'sudo systemctl status aitbc-blockchain-rpc-dev'
 #### **Debug Container Service Issues**
 ```bash
 # Debug coordinator API port conflict
-ssh aitbc-cascade 'sudo systemctl status aitbc-coordinator-api'
-ssh aitbc-cascade 'sudo journalctl -u aitbc-coordinator-api -n 20'
+ssh aitbc 'systemctl status aitbc-coordinator-api'
+ssh aitbc 'journalctl -u aitbc-coordinator-api -n 20'
 
 # Debug wallet service issues  
-ssh aitbc-cascade 'sudo systemctl status aitbc-wallet'
-ssh aitbc-cascade 'sudo journalctl -u aitbc-wallet -n 20'
+ssh aitbc 'systemctl status aitbc-wallet'
+ssh aitbc 'journalctl -u aitbc-wallet -n 20'
 
-# Check port usage in containers
-ssh aitbc-cascade 'sudo netstat -tlnp | grep :800'
-ssh aitbc1-cascade 'sudo netstat -tlnp | grep :800'
+# Check port usage in servers
+ssh aitbc 'netstat -tlnp | grep :800'
+ssh aitbc1 'netstat -tlnp | grep :800'
 
 # Test service endpoints
-ssh aitbc-cascade 'curl -s http://localhost:8001/health'
-ssh aitbc1-cascade 'curl -s http://localhost:8002/health'
+ssh aitbc 'curl -s http://localhost:8001/health'
+ssh aitbc1 'curl -s http://localhost:8002/health'
 ```
 
 ## Pre-Deployment Checklist
 
 ### **✅ Server Preparation**
-- [ ] SSH access confirmed via aitbc-cascade
+- [ ] SSH access confirmed via aitbc (from aitbc1) and aitbc1-cascade (from incus host)
 - [ ] System packages updated
 - [ ] aitbc user created with sudo access
 - [ ] Directory structure created
@@ -136,13 +140,15 @@ ssh aitbc1-cascade 'curl -s http://localhost:8002/health'
 - [ ] Container networking configured
 - [ ] GPU access confirmed as not available
 - [ ] Miner service requirements confirmed as not needed
+- [ ] Reverse proxy role confirmed as primary
 
 ### **✅ Network Configuration**
-- [ ] Port forwarding configured on aitbc-cascade
-- [ ] SSL certificates installed on proxy
-- [ ] DNS records configured
+- [ ] Port forwarding configured on aitbc1 primary server
+- [ ] SSL certificates installed on primary server
+- [ ] DNS records configured for aitbc1.bubuit.net and aitbc.bubuit.net
 - [ ] Load balancer rules set
 - [ ] Container access configured (0.0.0.0 binding)
+- [ ] Bidirectional SSH access configured (aitbc ↔ aitbc1)
 
 ### **✅ Storage Requirements**
 - [ ] Minimum 50GB free space available
@@ -271,27 +277,27 @@ sudo systemctl edit aitbc-coordinator-api.service
 
 ### **🔥 Issue 5: Nginx Proxy Configuration**
 
-**Problem**: Requests not properly forwarded from aitbc-cascade to aitbc
+**Problem**: Requests not properly forwarded from aitbc1 primary server to aitbc secondary server
 
 **Solution**:
 ```bash
-# On aitbc-cascade, check proxy configuration
+# On aitbc1 primary server, check proxy configuration
 cat /etc/nginx/sites-available/aitbc-proxy.conf
 
-# Ensure upstream configuration includes aitbc
+# Ensure upstream configuration includes aitbc secondary server
 upstream aitbc_backend {
-    server 10.1.223.1:8000;  # Coordinator API
-    server 10.1.223.1:8001;  # Exchange API
-    server 10.1.223.1:8003;  # Blockchain RPC
+    server 10.1.223.1:8000;  # Coordinator API (aitbc secondary)
+    server 10.1.223.1:8001;  # Exchange API (aitbc secondary)
+    server 10.1.223.1:8003;  # Blockchain RPC (aitbc secondary)
     # Add enhanced services ports
-    server 10.1.223.1:8010;  # Multimodal GPU
-    server 10.1.223.1:8011;  # GPU Multimodal
-    server 10.1.223.1:8012;  # Modality Optimization
-    server 10.1.223.1:8013;  # Adaptive Learning
-    server 10.1.223.1:8014;  # Marketplace Enhanced
-    server 10.1.223.1:8015;  # OpenClaw Enhanced
-    server 10.1.223.1:8016;  # Web UI
-    server 10.1.223.1:8017;  # Geographic Load Balancer
+    server 10.1.223.1:8010;  # Multimodal GPU (aitbc secondary)
+    server 10.1.223.1:8011;  # GPU Multimodal (aitbc secondary)
+    server 10.1.223.1:8012;  # Modality Optimization (aitbc secondary)
+    server 10.1.223.1:8013;  # Adaptive Learning (aitbc secondary)
+    server 10.1.223.1:8014;  # Marketplace Enhanced (aitbc secondary)
+    server 10.1.223.1:8015;  # OpenClaw Enhanced (aitbc secondary)
+    server 10.1.223.1:8016;  # Web UI (aitbc secondary)
+    server 10.1.223.1:8017;  # Geographic Load Balancer (aitbc secondary)
 }
 
 # Reload nginx configuration
@@ -300,17 +306,18 @@ sudo nginx -t && sudo systemctl reload nginx
 
 ### **🔥 Issue 6: SSL Certificate Issues**
 
-**Problem**: SSL certificates not properly configured for aitbc domain
+**Problem**: SSL certificates not properly configured for aitbc domains
 
 **Solution**:
 ```bash
-# On aitbc-cascade, check certificate status
+# On aitbc1 primary server, check certificate status
 sudo certbot certificates
 
-# Renew or obtain certificate
-sudo certbot --nginx -d aitbc.bubuit.net
+# Renew or obtain certificate for both domains
+sudo certbot --nginx -d aitbc1.bubuit.net -d aitbc.bubuit.net
 
 # Test SSL configuration
+curl -I https://aitbc1.bubuit.net
 curl -I https://aitbc.bubuit.net
 ```
 
@@ -527,14 +534,17 @@ sudo systemctl restart aitbc-coordinator-api.service
 
 ### **Issue: Network Connectivity**
 ```bash
-# Test local connectivity
+# Test local connectivity on aitbc secondary server
 curl -X GET "http://localhost:8000/v1/health"
 
-# Test external connectivity via proxy
+# Test external connectivity via aitbc1 primary server
 curl -X GET "http://aitbc.bubuit.net/health"
 
-# Check proxy configuration
-ssh aitbc-cascade "cat /etc/nginx/sites-available/aitbc-proxy.conf"
+# Test primary server direct access
+curl -X GET "http://aitbc1.bubuit.net/health"
+
+# Check proxy configuration on aitbc1 primary server
+ssh aitbc1 "cat /etc/nginx/sites-available/aitbc-proxy.conf"
 ```
 
 ### **Issue: Container Access Problems**
@@ -675,36 +685,36 @@ sudo systemctl restart aitbc-*.service
 
 ---
 
-**Server**: aitbc1 (Container)  
+**Server**: aitbc1 (Primary Development Server)  
 **Environment**: Production  
-**IP Address**: 10.1.223.40 (container)  
+**IP Address**: 10.1.223.40 (primary server)  
 **GPU Access**: None (CPU-only mode)  
 **Miner Service**: Not needed  
 **Enhanced Services**: Mixed status (some enabled, some failing)  
-**Last Updated**: 2026-03-07  
+**Last Updated**: 2026-03-25  
 **Maintainer**: AITBC Operations Team  
-**Status**: ✅ PRODUCTION READY (mixed enhanced services)  
+**Status**: ✅ PRODUCTION READY (primary reverse proxy)  
 **Platform Health**: 85% functional  
 **External Access**: 100% working  
-**CLI Functionality**: 70% working (container)  
-**Multi-Site**: 1 of 3 sites operational  
+**CLI Functionality**: 70% working (primary server)  
+**Multi-Site**: 1 of 2 sites operational  
 
 ## Multi-Site Deployment Status
 
-### ✅ **aitbc1 Container Status**
+### ✅ **aitbc1 Primary Server Status**
 - **Services Running**: 8 services active (mixed enhanced services)
 - **External Access**: 100% functional
 - **CLI Installation**: Complete and working
 - **Performance**: Excellent
 - **Stability**: 95% (some enhanced services failing)
+- **Reverse Proxy**: Primary proxy for aitbc.bubuit.net
 
 ### 📊 **Multi-Site Architecture**
-- **at1 (localhost)**: 8 services running
-- **aitbc (container)**: 9 services running ✅
-- **aitbc1 (container)**: 8 services running ⚠️
-- **Total Services**: 25 across 3 sites
+- **aitbc1 (primary server)**: 8 services running
+- **aitbc (secondary server)**: 9 services running ✅
+- **Total Services**: 17 across 2 sites
 
-### 🛠️ **CLI Status in aitbc1 Container**
+### 🛠️ **CLI Status in aitbc1 Primary Server**
 - **CLI Version**: v0.1.0 installed
 - **Wallet Management**: 100% working
 - **Configuration**: 100% working
@@ -712,9 +722,10 @@ sudo systemctl restart aitbc-*.service
 - **Marketplace**: Network errors (known limitation)
 
 ### 🌐 **External Access Configuration**
-- **Primary URL**: https://aitbc.bubuit.net/
+- **Primary URL**: https://aitbc1.bubuit.net/ (primary server)
+- **Secondary URL**: https://aitbc.bubuit.net/ (secondary server)
 - **API Health**: https://aitbc.bubuit.net/api/health
-- **SSL Certificate**: Valid and working
+- **SSL Certificate**: Valid and working for both domains
 - **Performance**: <50ms response times
 - **Uptime**: 100%
 
@@ -745,7 +756,8 @@ Additional Services:
 ```
 
 ### 🔧 **Maintenance Notes**
-- **Container Access**: SSH via aitbc-cascade
+- **Primary Server Access**: SSH via aitbc1-cascade (from incus host) or aitbc1 (from aitbc)
+- **Secondary Server Access**: SSH via aitbc (from aitbc1)
 - **Service Management**: systemctl commands
 - **Log Location**: /opt/aitbc/logs/
 - **Backup Location**: /opt/aitbc/backups/

docs/21_reports/PROJECT_COMPLETION_REPORT.md

@@ -77,7 +77,7 @@ The AITBC Developer Ecosystem & DAO Grants system has been successfully implemen
 #### Test Execution:
 ```bash
 # Run all tests
-./tests/run_all_tests.sh
+./scripts/testing/run_all_tests.sh
 
 # Individual suites
 npx hardhat test tests/contracts/
@@ -211,7 +211,7 @@ npm run test  # Frontend E2E
 ./scripts/production-health-check.sh
 
 # Monitor system logs
-ssh aitbc-cascade "journalctl -u nginx -f"
+ssh aitbc "journalctl -u nginx -f"
 
 # Check contract events
 npx hardhat run scripts/monitor-contracts.js --network mainnet
@@ -220,7 +220,7 @@ npx hardhat run scripts/monitor-contracts.js --network mainnet
 ### Weekly Operations
 ```bash
 # Security updates
-ssh aitbc-cascade "apt update && apt upgrade -y"
+ssh aitbc "apt update && apt upgrade -y"
 
 # Performance monitoring
 ./scripts/performance-report.sh

docs/22_workflow/DOCS_WORKFLOW_COMPLETION_SUMMARY.md

@@ -59,8 +59,8 @@
 - **`tests/cli/test_wallet.py`**: Updated wallet tests for unified CLI interface
 - **`tests/cli/test_marketplace.py`**: Updated marketplace tests for CLI integration
 - **`tests/cli/test_cli_integration.py`**: Enhanced integration testing with CLI support
-- **`tests/conftest.py`**: Enhanced test configuration for CLI testing
-- **`tests/run_all_tests.sh`**: Updated test runner with CLI testing support
+- **`tests/conftest.py`**: Enhanced test configuration
+- **`tests/scripts/testing/run_all_tests.sh`**: Updated test runner with CLI testing support
 - **`tests/cli-test-updates-completed.md`**: Created CLI test completion summary
 - **`tests/test-integration-completed.md`**: Created test ecosystem integration summary
 - **`docs/22_workflow/DOCS_WORKFLOW_COMPLETION_SUMMARY.md`**: Updated with latest workflow completion

docs/23_cli/README.md

@@ -15,72 +15,104 @@
 
 ### Installation and Setup
 ```bash
-# Load development environment
-source /opt/aitbc/.env.dev
-
 # Test CLI installation
 aitbc --help
 aitbc version
 ```
 
+**Note**: The CLI is pre-configured with a bash alias for automatic virtual environment activation:
+```bash
+# The following alias is configured in ~/.bashrc:
+alias aitbc="source /opt/aitbc/cli/venv/bin/activate && aitbc"
+```
+
+This allows you to use `aitbc <command>` directly without manually sourcing the virtual environment.
+
 ### Basic Operations
 ```bash
-# Wallet operations
-aitbc wallet create
-aitbc wallet list
-aitbc wallet balance
+# Core operations
+aitbc client submit --prompt "Generate an image" --model llama2
+aitbc miner status
+aitbc wallet create --type hd
+aitbc marketplace list
+aitbc blockchain info
+aitbc exchange create-pair --pair AITBC/BTC --base-asset AITBC --quote-asset BTC
+aitbc explorer status
+aitbc explorer block 12345
+aitbc explorer transaction 0x123...
+aitbc explorer search --address 0xabc...
 
-# Exchange operations
-aitbc exchange register --name "Binance" --api-key <key>
-aitbc exchange create-pair AITBC/BTC
-aitbc exchange start-trading --pair AITBC/BTC
+# Advanced features
+aitbc analytics summary
+aitbc ai-trading start --strategy arbitrage
+aitbc compliance kyc-submit --user-id user123
+aitbc agent create --type trading
+aitbc multimodal process --input image.jpg --mode text
 
-# Service management
-aitbc-services status
-aitbc-services restart
+# Development tools
+aitbc admin system-status
+aitbc monitor health
+aitbc deploy --target production
+aitbc test --suite integration
 ```
 
 ## 📋 **Command Groups**
 
-### **Wallet Commands**
-- `wallet create` - Create new wallet
-- `wallet list` - List all wallets
-- `wallet balance` - Check wallet balance
-- `wallet send` - Send tokens
-- `wallet address` - Get wallet address
-- `wallet history` - Transaction history
-- `wallet backup` - Backup wallet
-- `wallet restore` - Restore wallet
+### **Core Commands**
+- `client` - Submit and manage AI compute jobs
+- `miner` - GPU mining operations and status
+- `wallet` - Wallet management and transactions
+- `marketplace` - GPU marketplace and trading
+- `blockchain` - Blockchain operations and queries
+- `exchange` - Real exchange integration (Binance, Coinbase, etc.)
+- `explorer` - Blockchain explorer and analytics
 
-### **Exchange Commands**
-- `exchange register` - Register with exchange
-- `exchange create-pair` - Create trading pair
-- `exchange start-trading` - Start trading
-- `exchange stop-trading` - Stop trading
-- `exchange status` - Exchange status
-- `exchange balances` - Exchange balances
+### **Advanced Features**
+- `analytics` - Chain performance monitoring and predictions
+- `ai-trading` - AI-powered trading strategies
+- `surveillance` - Market surveillance and compliance
+- `compliance` - Regulatory compliance and reporting
+- `governance` - Network governance and proposals
 
-### **Blockchain Commands**
-- `blockchain info` - Blockchain information
-- `blockchain status` - Node status
-- `blockchain blocks` - List blocks
-- `blockchain balance` - Check balance
-- `blockchain peers` - Network peers
-- `blockchain transaction` - Transaction details
+### **Development Tools**
+- `admin` - Administrative operations
+- `config` - Configuration management
+- `monitor` - System monitoring and health
+- `test` - CLI testing and validation
+- `deploy` - Deployment and infrastructure management
 
-### **Config Commands**
-- `config show` - Show configuration
-- `config get <key>` - Get config value
-- `config set <key> <value>` - Set config value
-- `config edit` - Edit configuration
-- `config validate` - Validate configuration
+### **Specialized Services**
+- `agent` - AI agent operations
+- `multimodal` - Multi-modal AI processing
+- `oracle` - Price discovery and data feeds
+- `market-maker` - Automated market making
+- `genesis-protection` - Advanced security features
+- `swarm` - Swarm intelligence operations
+- `ai` - AI provider commands
 
-### **Compliance Commands**
-- `compliance list-providers` - List KYC providers
-- `compliance kyc-submit` - Submit KYC verification
-- `compliance kyc-status` - Check KYC status
-- `compliance aml-screen` - AML screening
-- `compliance full-check` - Full compliance check
+### **Enterprise Integration**
+- `enterprise-integration` - Enterprise system integration
+- `cross-chain` - Cross-chain operations
+- `regulatory` - Regulatory reporting
+
+### **Security & Authentication**
+- `auth` - Authentication and token management
+- `keystore` - Key management
+- `multisig` - Multi-signature operations
+- `genesis` - Genesis block operations
+
+### **Network & Infrastructure**
+- `node` - Node management
+- `chain` - Chain operations
+- `sync` - Synchronization operations
+- `optimize` - Performance optimization
+
+### **Plugin System**
+- `plugin` - Plugin management
+- `plugin-registry` - Plugin registry
+- `plugin-marketplace` - Plugin marketplace
+- `plugin-security` - Plugin security
+- `plugin-analytics` - Plugin analytics
 
 ## 🧪 **Testing**
 
@@ -125,9 +157,6 @@ python3 run_simple_tests.py
 
 ### Environment Variables
 ```bash
-# Load development environment
-source /opt/aitbc/.env.dev
-
 # Available aliases
 aitbc-services    # Service management
 aitbc-fix         # Quick permission fix
@@ -143,13 +172,30 @@ aitbc --output json wallet balance
 aitbc --output yaml blockchain info
 
 # Debug mode
-aitbc --debug wallet list
+aitbc --debug client submit --prompt "Test"
 
 # Test mode
 aitbc --test-mode exchange status
 
 # Custom configuration
 aitbc --config-file /path/to/config wallet list
+
+# Dry run mode
+aitbc --dry-run deploy --target production
+
+# Custom timeout
+aitbc --timeout 60 blockchain info
+
+# Custom API endpoint
+aitbc --url http://localhost:8000 blockchain status
+
+# Custom API key
+aitbc --api-key <key> exchange register --name "Exchange"
+
+# Verbosity levels
+aitbc -v client list
+aitbc -vv marketplace show --job-id 123
+aitbc -vvv admin system-status
 ```
 
 ### Service Integration
@@ -162,6 +208,27 @@ aitbc --api-key <key> exchange register --name "Exchange"
 
 # Timeout configuration
 aitbc --timeout 60 blockchain info
+
+# Skip SSL verification (testing only)
+aitbc --no-verify --test-mode client status
+
+# Plugin management
+aitbc plugin list
+aitbc plugin install --name gpu-optimizer
+aitbc plugin enable --name monitoring
+
+# Multi-modal processing
+aitbc multimodal process --input document.pdf --modes text,image
+aitbc multimodal status --job-id 12345
+
+# AI operations
+aitbc ai list-providers
+aitbc ai generate --provider ollama --model llama2 --prompt "Summarize"
+
+# Agent operations
+aitbc agent create --type trading --name trader1
+aitbc agent start --agent-id trader1
+aitbc agent status --agent-id trader1
 ```
 
 ## 🔍 **Troubleshooting**
@@ -187,13 +254,14 @@ aitbc --test-mode blockchain status
 ## 📚 **Additional Resources**
 
 - [Testing Procedures](./testing.md) - Detailed testing documentation
-- [Permission Setup](./permission-setup.md) - Development environment configuration
 - [Service Management](../8_development/) - Service operation guides
 - [Exchange Integration](../19_marketplace/) - Exchange and trading documentation
 
 ---
 
-**Last Updated**: March 8, 2026  
+**Last Updated**: March 25, 2026  
 **CLI Version**: 0.1.0  
 **Test Coverage**: 67/67 tests passing (100%)  
 **Infrastructure**: Complete  
+**Command Groups**: 45+ command groups available  
+**Plugin System**: Full plugin architecture supported

docs/5_reference/8_blockchain-deployment-summary.md

@@ -26,12 +26,12 @@ Successfully deployed two independent AITBC blockchain nodes on the same server
 ### Systemd Services
 ```bash
 # Node 1
-sudo systemctl status blockchain-node    # Consensus node
-sudo systemctl status blockchain-rpc     # RPC API
+systemctl status blockchain-node    # Consensus node
+systemctl status blockchain-rpc     # RPC API
 
 # Node 2
-sudo systemctl status blockchain-node-2  # Consensus node
-sudo systemctl status blockchain-rpc-2   # RPC API
+systemctl status blockchain-node-2  # Consensus node
+systemctl status blockchain-rpc-2   # RPC API
 ```
 
 ### API Endpoints

docs/7_deployment/2_service-naming-convention.md

@@ -36,7 +36,7 @@ These services already had the `aitbc-` prefix:
 ### Check Service Status
 ```bash
 # Site A (via SSH)
-ssh aitbc-cascade "systemctl status aitbc-blockchain-node-1.service"
+ssh aitbc "systemctl status aitbc-blockchain-node-1.service"
 
 # Site B (via SSH)
 ssh ns3-root "incus exec aitbc -- systemctl status aitbc-blockchain-node-3.service"
@@ -45,16 +45,16 @@ ssh ns3-root "incus exec aitbc -- systemctl status aitbc-blockchain-node-3.servi
 ### Restart Services
 ```bash
 # Site A
-ssh aitbc-cascade "sudo systemctl restart aitbc-blockchain-node-1.service"
+ssh aitbc "systemctl restart aitbc-blockchain-node-1.service"
 
 # Site B
-ssh ns3-root "incus exec aitbc -- sudo systemctl restart aitbc-blockchain-node-3.service"
+ssh ns3-root "incus exec aitbc -- systemctl restart aitbc-blockchain-node-3.service"
 ```
 
 ### View Logs
 ```bash
 # Site A
-ssh aitbc-cascade "journalctl -u aitbc-blockchain-node-1.service -f"
+ssh aitbc "journalctl -u aitbc-blockchain-node-1.service -f"
 
 # Site B
 ssh ns3-root "incus exec aitbc -- journalctl -u aitbc-blockchain-node-3.service -f"

docs/8_development/DEVELOPMENT_GUIDELINES.md

@@ -11,7 +11,7 @@
 - `pyproject.toml` - Python project configuration
 - `poetry.lock` - Dependency lock file
 - `pytest.ini` - Test configuration
-- `run_all_tests.sh` - Main test runner
+- `scripts/testing/run_all_tests.sh` - Main test runner
 
 ### Development Scripts → `dev/scripts/`
 ```bash

docs/backend/documented_AITBC_Enhanced_Services__8010-8016__Implementation.md

@@ -35,11 +35,11 @@ This document provides comprehensive technical documentation for aitbc enhanced
 
 **🔧 Service Scripts Created:**
 ```bash
-/opt/aitbc/scripts/multimodal_gpu_service.py      # Port 8010
-/opt/aitbc/scripts/gpu_multimodal_service.py      # Port 8011
-/opt/aitbc/scripts/modality_optimization_service.py # Port 8012
-/opt/aitbc/scripts/adaptive_learning_service.py   # Port 8013
-/opt/aitbc/scripts/web_ui_service.py               # Port 8016
+/opt/aitbc/scripts/services/multimodal_gpu_service.py      # Port 8010
+/opt/aitbc/scripts/services/gpu_multimodal_service.py      # Port 8011
+/opt/aitbc/scripts/services/modality_optimization_service.py # Port 8012
+/opt/aitbc/scripts/services/adaptive_learning_service.py   # Port 8013
+/opt/aitbc/scripts/services/web_ui_service.py               # Port 8016
 ```
 
 **🔧 Systemd Services Updated:**

docs/completed/implementation/enhanced-services-implementation-complete.md

@@ -63,11 +63,11 @@
 
 **🔧 Service Scripts Created:**
 ```bash
-/opt/aitbc/scripts/multimodal_gpu_service.py      # Port 8010
-/opt/aitbc/scripts/gpu_multimodal_service.py      # Port 8011
-/opt/aitbc/scripts/modality_optimization_service.py # Port 8012
-/opt/aitbc/scripts/adaptive_learning_service.py   # Port 8013
-/opt/aitbc/scripts/web_ui_service.py               # Port 8016
+/opt/aitbc/scripts/services/multimodal_gpu_service.py      # Port 8010
+/opt/aitbc/scripts/services/gpu_multimodal_service.py      # Port 8011
+/opt/aitbc/scripts/services/modality_optimization_service.py # Port 8012
+/opt/aitbc/scripts/services/adaptive_learning_service.py   # Port 8013
+/opt/aitbc/scripts/services/web_ui_service.py               # Port 8016
 ```
 
 **🔧 Systemd Services Updated:**

docs/infrastructure/multimodal-services-deployment.md

@@ -78,12 +78,12 @@ If you need to manually configure services:
 
 ```bash
 # For AT1 (localhost)
-sudo systemctl disable aitbc-multimodal.service
-sudo systemctl enable aitbc-multimodal-gpu.service
+systemctl disable aitbc-multimodal.service
+systemctl enable aitbc-multimodal-gpu.service
 
 # For Production Servers
-sudo systemctl enable aitbc-multimodal.service
-sudo systemctl disable aitbc-multimodal-gpu.service
+systemctl enable aitbc-multimodal.service
+systemctl disable aitbc-multimodal-gpu.service
 ```
 
 ## Verification
@@ -104,8 +104,8 @@ systemctl status aitbc-multimodal.service
 ### Service Not Found
 ```bash
 # Ensure service files are copied to system directory
-sudo cp /home/oib/windsurf/aitbc/systemd/aitbc-*-multimodal.service /etc/systemd/system/
-sudo systemctl daemon-reload
+cp /home/oib/windsurf/aitbc/systemd/aitbc-*-multimodal.service /etc/systemd/system/
+systemctl daemon-reload
 ```
 
 ### Port Conflicts

docs/summaries/CLI_TRANSLATION_SECURITY_IMPLEMENTATION_SUMMARY.md

@@ -194,7 +194,7 @@ assert medium_security_commands_degrade_gracefully()
 - **`CLI_TRANSLATION_SECURITY_IMPLEMENTATION_SUMMARY.md`** - This summary
 
 ### **Testing**
-- **`tests/test_cli_translation_security.py`** - Comprehensive test suite (23 tests)
+- **`tests/security/test_cli_translation_security.py`** - Comprehensive test suite (23 tests)
 
 ## 🚀 Usage Examples
 

docs/summaries/EVENT_DRIVEN_CACHE_IMPLEMENTATION_SUMMARY.md

@@ -86,7 +86,7 @@ class EventDrivenCacheSettings:
     enable_health_checks: bool
 ```
 
-### 4. Comprehensive Test Suite (`tests/test_event_driven_cache.py`)
+### 4. Comprehensive Test Suite (`tests/integration/test_event_driven_cache.py`)
 
 **Test Coverage:**
 - **Core cache operations** (set, get, invalidate)

docs/summaries/PROJECT_ORGANIZATION_COMPLETED.md

@@ -95,7 +95,7 @@ aitbc/
 ├── README.md                      # Project documentation
 ├── poetry.lock                    # Dependency lock file
 ├── pyproject.toml                 # Python project configuration
-└── run_all_tests.sh               # Test runner (convenience)
+└── scripts/testing/run_all_tests.sh   # Test runner (convenience)
 ```
 
 ### **Main Directories (Organized by Purpose)**
@@ -207,7 +207,7 @@ aitbc/
 - ✅ **Essential project files** (.gitignore, README, LICENSE)
 - ✅ **Configuration templates** (.env.example, .editorconfig)
 - ✅ **Build files** (pyproject.toml, poetry.lock)
-- ✅ **Convenience scripts** (run_all_tests.sh)
+- ✅ **Convenience scripts** (scripts/testing/run_all_tests.sh)
 - ✅ **Core documentation** (README.md, PLUGIN_SPEC.md)
 
 ### **Documentation Organization**

docs/summaries/WEBSOCKET_STREAM_BACKPRESSURE_IMPLEMENTATION.md

@@ -213,7 +213,7 @@ async def _sender_loop(self):
 - **`apps/coordinator-api/src/app/services/multi_modal_websocket_fusion.py`** - Multi-modal fusion with backpressure
 
 ### **Testing**
-- **`tests/test_websocket_backpressure_core.py`** - Comprehensive test suite
+- **`tests/websocket/test_websocket_backpressure_core.py`** - Comprehensive test suite
 - **Mock implementations** for testing without dependencies
 
 ### **Documentation**

docs/trail/GIFT_TRANSACTION_SUMMARY.md

@@ -103,13 +103,13 @@ aitbc ai-surveillance status
 #### **Verification Commands:**
 ```bash
 # Check user wallet on aitbc server
-ssh aitbc-cascade "cat /opt/aitbc/.aitbc/wallets/newuser.json | jq '.balance'"
+ssh aitbc "cat /opt/aitbc/.aitbc/wallets/newuser.json | jq '.balance'"
 
 # View transaction details
-ssh aitbc-cascade "cat /opt/aitbc/.aitbc/wallets/newuser.json | jq '.transactions[-1]'"
+ssh aitbc "cat /opt/aitbc/.aitbc/wallets/newuser.json | jq '.transactions[-1]'"
 
 # View gift certificate
-ssh aitbc-cascade "cat /opt/aitbc/GIFT_CERTIFICATE_newuser.md"
+ssh aitbc "cat /opt/aitbc/GIFT_CERTIFICATE_newuser.md"
 ```
 
 ### 🎉 **Success Metrics:**

docs/trail/SYSTEMD_SERVICE_MANAGEMENT_GUIDE.md

@@ -8,19 +8,19 @@
 systemctl status aitbc-coordinator --no-pager
 
 # Start service
-sudo systemctl start aitbc-coordinator
+systemctl start aitbc-coordinator
 
 # Stop service
-sudo systemctl stop aitbc-coordinator
+systemctl stop aitbc-coordinator
 
 # Restart service
-sudo systemctl restart aitbc-coordinator
+systemctl restart aitbc-coordinator
 
 # Enable service (start on boot)
-sudo systemctl enable aitbc-coordinator
+systemctl enable aitbc-coordinator
 
 # Disable service
-sudo systemctl disable aitbc-coordinator
+systemctl disable aitbc-coordinator
 ```
 
 ### **Log Management with journalctl**
@@ -142,7 +142,7 @@ systemctl status aitbc-coordinator --no-pager
 sudo journalctl -u aitbc-coordinator --since "1 hour ago" --no-pager | tail -10
 
 # Service restart (if needed)
-sudo systemctl restart aitbc-coordinator
+systemctl restart aitbc-coordinator
 sleep 5
 systemctl status aitbc-coordinator --no-pager
 
@@ -162,7 +162,7 @@ sudo journalctl -u aitbc-coordinator --since "10 minutes ago" --no-pager
 sudo journalctl -u aitbc-coordinator -p err --since "1 hour ago" --no-pager
 
 # 4. Restart service if needed
-sudo systemctl restart aitbc-coordinator
+systemctl restart aitbc-coordinator
 
 # 5. Verify functionality
 curl -s http://localhost:8000/health

fix_gossip.patch

@@ -1,9 +0,0 @@
---- /opt/aitbc/apps/blockchain-node/src/aitbc_chain/gossip/broker.py	2026-03-23 12:40:00.000000000 +0100
-+++ /opt/aitbc/apps/blockchain-node/src/aitbc_chain/gossip/broker.py.new	2026-03-23 12:40:00.000000000 +0100
-@@ -6,7 +6,7 @@
- import warnings
- from collections import defaultdict
--from contextlib import suppress
-+from contextlib import suppress, asynccontextmanager
- from dataclasses import dataclass
- from typing import Any, Callable, Dict, List, Optional, Set

scripts/manage-services.sh

@@ -4,30 +4,30 @@
 case "${1:-help}" in
     "start")
         echo "Starting AITBC services..."
-        sudo systemctl start aitbc-coordinator-api.service
-        sudo systemctl start aitbc-blockchain-node.service
-        sudo systemctl start aitbc-blockchain-rpc.service
+        systemctl start aitbc-coordinator-api.service
+        systemctl start aitbc-blockchain-node.service
+        systemctl start aitbc-blockchain-rpc.service
         echo "Services started"
         ;;
     "stop")
         echo "Stopping AITBC services..."
-        sudo systemctl stop aitbc-coordinator-api.service
-        sudo systemctl stop aitbc-blockchain-node.service
-        sudo systemctl stop aitbc-blockchain-rpc.service
+        systemctl stop aitbc-coordinator-api.service
+        systemctl stop aitbc-blockchain-node.service
+        systemctl stop aitbc-blockchain-rpc.service
         echo "Services stopped"
         ;;
     "restart")
         echo "Restarting AITBC services..."
-        sudo systemctl restart aitbc-coordinator-api.service
-        sudo systemctl restart aitbc-blockchain-node.service
-        sudo systemctl restart aitbc-blockchain-rpc.service
+        systemctl restart aitbc-coordinator-api.service
+        systemctl restart aitbc-blockchain-node.service
+        systemctl restart aitbc-blockchain-rpc.service
         echo "Services restarted"
         ;;
     "status")
         echo "=== AITBC Services Status ==="
-        sudo systemctl status aitbc-coordinator-api.service --no-pager
-        sudo systemctl status aitbc-blockchain-node.service --no-pager
-        sudo systemctl status aitbc-blockchain-rpc.service --no-pager
+        systemctl status aitbc-coordinator-api.service --no-pager
+        systemctl status aitbc-blockchain-node.service --no-pager
+        systemctl status aitbc-blockchain-rpc.service --no-pager
         ;;
     "logs")
         echo "=== AITBC Service Logs ==="