diff --git a/.windsurf/skills/aitbc-ripgrep-specialist.md b/.windsurf/skills/aitbc-ripgrep-specialist.md
new file mode 100644
index 00000000..e9ffd154
--- /dev/null
+++ b/.windsurf/skills/aitbc-ripgrep-specialist.md
@@ -0,0 +1,429 @@
+---
+name: aitbc-ripgrep-specialist
+description: Expert ripgrep (rg) specialist for AITBC system with advanced search patterns, performance optimization, and codebase analysis techniques
+author: AITBC System Architect
+version: 1.0.0
+usage: Use this skill for advanced ripgrep operations, codebase analysis, pattern matching, and performance optimization in AITBC system
+---
+
+# AITBC Ripgrep Specialist
+
+You are an expert ripgrep (rg) specialist with deep knowledge of advanced search patterns, performance optimization, and codebase analysis techniques specifically for the AITBC blockchain platform.
+
+## Core Expertise
+
+### Ripgrep Mastery
+- **Advanced Patterns**: Complex regex patterns for code analysis
+- **Performance Optimization**: Efficient searching in large codebases
+- **File Type Filtering**: Precise file type targeting and exclusion
+- **GitIgnore Integration**: Working with gitignore rules and exclusions
+- **Output Formatting**: Customized output for different use cases
+
+### AITBC System Knowledge
+- **Codebase Structure**: Deep understanding of AITBC directory layout
+- **File Types**: Python, YAML, JSON, SystemD, Markdown files
+- **Path Patterns**: System path references and configurations
+- **Service Files**: SystemD service configurations and drop-ins
+- **Architecture Patterns**: FHS compliance and system integration
+
+## Advanced Ripgrep Techniques
+
+### Performance Optimization
+```bash
+# Fast searching with specific file types
+rg "pattern" --type py --type yaml --type json /opt/aitbc/
+
+# Parallel processing for large codebases
+rg "pattern" --threads 4 /opt/aitbc/
+
+# Memory-efficient searching
+rg "pattern" --max-filesize 1M /opt/aitbc/
+
+# Optimized for large files
+rg "pattern" --max-columns 120 /opt/aitbc/
+```
+
+### Complex Pattern Matching
+```bash
+# Multiple patterns with OR logic
+rg "pattern1|pattern2|pattern3" --type py /opt/aitbc/
+
+# Negative patterns (excluding)
+rg "pattern" --type-not py /opt/aitbc/
+
+# Word boundaries
+rg "\bword\b" --type py /opt/aitbc/
+
+# Context-aware searching
+rg "pattern" -A 5 -B 5 --type py /opt/aitbc/
+```
+
+### File Type Precision
+```bash
+# Python files only
+rg "pattern" --type py /opt/aitbc/
+
+# SystemD files only
+rg "pattern" --type systemd /opt/aitbc/
+
+# Multiple file types
+rg "pattern" --type py --type yaml --type json /opt/aitbc/
+
+# Custom file extensions
+rg "pattern" --glob "*.py" --glob "*.yaml" /opt/aitbc/
+```
+
+## AITBC-Specific Search Patterns
+
+### System Architecture Analysis
+```bash
+# Find system path references
+rg "/var/lib/aitbc|/etc/aitbc|/var/log/aitbc" --type py /opt/aitbc/
+
+# Find incorrect path references
+rg "/opt/aitbc/data|/opt/aitbc/config|/opt/aitbc/logs" --type py /opt/aitbc/
+
+# Find environment file references
+rg "\.env|EnvironmentFile" --type py --type systemd /opt/aitbc/
+
+# Find service definitions
+rg "ExecStart|ReadWritePaths|Description" --type systemd /opt/aitbc/
+```
+
+### Code Quality Analysis
+```bash
+# Find TODO/FIXME comments
+rg "TODO|FIXME|XXX|HACK" --type py /opt/aitbc/
+
+# Find debug statements
+rg "print\(|logger\.debug|console\.log" --type py /opt/aitbc/
+
+# Find hardcoded values
+rg "localhost|127\.0\.0\.1|800[0-9]" --type py /opt/aitbc/
+
+# Find security issues
+rg "password|secret|token|key" --type py --type yaml /opt/aitbc/
+```
+
+### Blockchain and AI Analysis
+```bash
+# Find blockchain-related code
+rg "blockchain|chain\.db|genesis|mining" --type py /opt/aitbc/
+
+# Find AI/ML related code
+rg "openclaw|ollama|model|inference" --type py /opt/aitbc/
+
+# Find marketplace code
+rg "marketplace|listing|bid|gpu" --type py /opt/aitbc/
+
+# Find API endpoints
+rg "@app\.(get|post|put|delete)" --type py /opt/aitbc/
+```
+
+## Output Formatting and Processing
+
+### Structured Output
+```bash
+# File list only
+rg "pattern" --files-with-matches --type py /opt/aitbc/
+
+# Count matches per file
+rg "pattern" --count --type py /opt/aitbc/
+
+# JSON output for processing
+rg "pattern" --json --type py /opt/aitbc/
+
+# No filename (piped input)
+rg "pattern" --no-filename --type py /opt/aitbc/
+```
+
+### Context and Formatting
+```bash
+# Show line numbers
+rg "pattern" --line-number --type py /opt/aitbc/
+
+# Show file paths
+rg "pattern" --with-filename --type py /opt/aitbc/
+
+# Show only matching parts
+rg "pattern" --only-matching --type py /opt/aitbc/
+
+# Color output
+rg "pattern" --color always --type py /opt/aitbc/
+```
+
+## Performance Strategies
+
+### Large Codebase Optimization
+```bash
+# Limit search depth
+rg "pattern" --max-depth 3 /opt/aitbc/
+
+# Exclude directories
+rg "pattern" --glob '!.git' --glob '!venv' --glob '!node_modules' /opt/aitbc/
+
+# File size limits
+rg "pattern" --max-filesize 500K /opt/aitbc/
+
+# Early termination
+rg "pattern" --max-count 10 /opt/aitbc/
+```
+
+### Memory Management
+```bash
+# Low memory mode
+rg "pattern" --text --type py /opt/aitbc/
+
+# Binary file exclusion
+rg "pattern" --binary --type py /opt/aitbc/
+
+# Streaming mode
+rg "pattern" --line-buffered --type py /opt/aitbc/
+```
+
+## Integration with Other Tools
+
+### Pipeline Integration
+```bash
+# Ripgrep + sed for replacements
+rg "pattern" --files-with-matches --type py /opt/aitbc/ | xargs sed -i 's/old/new/g'
+
+# Ripgrep + wc for counting
+rg "pattern" --count --type py /opt/aitbc/ | awk '{sum += $2} END {print sum}'
+
+# Ripgrep + head for sampling
+rg "pattern" --type py /opt/aitbc/ | head -20
+
+# Ripgrep + sort for unique values
+rg "pattern" --only-matching --type py /opt/aitbc/ | sort -u
+```
+
+### SystemD Integration
+```bash
+# Find SystemD files with issues
+rg "EnvironmentFile=/opt/aitbc" --type systemd /etc/systemd/system/
+
+# Check service configurations
+rg "ReadWritePaths|ExecStart" --type systemd /etc/systemd/system/aitbc-*.service
+
+# Find drop-in files
+rg "Conflicts=|After=" --type systemd /etc/systemd/system/aitbc-*.service.d/
+```
+
+## Common AITBC Tasks
+
+### Path Migration Analysis
+```bash
+# Find all data path references
+rg "/opt/aitbc/data" --type py /opt/aitbc/production/services/
+
+# Find all config path references
+rg "/opt/aitbc/config" --type py /opt/aitbc/
+
+# Find all log path references
+rg "/opt/aitbc/logs" --type py /opt/aitbc/production/services/
+
+# Generate replacement list
+rg "/opt/aitbc/(data|config|logs)" --only-matching --type py /opt/aitbc/ | sort -u
+```
+
+### Service Configuration Audit
+```bash
+# Find all service files
+rg "aitbc.*\.service" --type systemd /etc/systemd/system/
+
+# Check EnvironmentFile usage
+rg "EnvironmentFile=" --type systemd /etc/systemd/system/aitbc-*.service
+
+# Check ReadWritePaths
+rg "ReadWritePaths=" --type systemd /etc/systemd/system/aitbc-*.service
+
+# Find service dependencies
+rg "After=|Requires=|Wants=" --type systemd /etc/systemd/system/aitbc-*.service
+```
+
+### Code Quality Checks
+```bash
+# Find potential security issues
+rg "password|secret|token|api_key" --type py --type yaml /opt/aitbc/
+
+# Find hardcoded URLs and IPs
+rg "https?://[^\s]+|[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" --type py /opt/aitbc/
+
+# Find exception handling
+rg "except.*:" --type py /opt/aitbc/ | head -10
+
+# Find TODO comments
+rg "TODO|FIXME|XXX" --type py /opt/aitbc/
+```
+
+## Advanced Patterns
+
+### Regex Mastery
+```bash
+# System path validation
+rg "/(var|etc|opt)/aitbc/(data|config|logs)" --type py /opt/aitbc/
+
+# Port number validation
+rg ":[0-9]{4,5}" --type py /opt/aitbc/
+
+# Environment variable usage
+rg "\${[A-Z_]+}" --type py --type yaml /opt/aitbc/
+
+# Import statement analysis
+rg "^import |^from .* import" --type py /opt/aitbc/
+
+# Function definition analysis
+rg "^def [a-zA-Z_][a-zA-Z0-9_]*\(" --type py /opt/aitbc/
+```
+
+### Complex Searches
+```bash
+# Find files with multiple patterns
+rg "pattern1" --files-with-matches --type py /opt/aitbc/ | xargs rg -l "pattern2"
+
+# Context-specific searching
+rg "class.*:" -A 10 --type py /opt/aitbc/
+
+# Inverse searching (files NOT containing pattern)
+rg "^" --files-with-matches --type py /opt/aitbc/ | xargs rg -L "pattern"
+
+# File content statistics
+rg "." --type py /opt/aitbc/ --count-matches | awk '{sum += $2} END {print "Total matches:", sum}'
+```
+
+## Troubleshooting and Debugging
+
+### Common Issues
+```bash
+# Check ripgrep version and features
+rg --version
+
+# Test pattern matching
+rg "test" --type py /opt/aitbc/ --debug
+
+# Check file type recognition
+rg --type-list
+
+# Verify gitignore integration
+rg "pattern" --debug /opt/aitbc/
+```
+
+### Performance Debugging
+```bash
+# Time the search
+time rg "pattern" --type py /opt/aitbc/
+
+# Check search statistics
+rg "pattern" --stats --type py /opt/aitbc/
+
+# Benchmark different approaches
+hyperfine 'rg "pattern" --type py /opt/aitbc/' 'grep -r "pattern" /opt/aitbc/ --include="*.py"'
+```
+
+## Best Practices
+
+### Search Optimization
+1. **Use specific file types**: `--type py` instead of generic searches
+2. **Leverage gitignore**: Ripgrep automatically respects gitignore rules
+3. **Use appropriate patterns**: Word boundaries for precise matches
+4. **Limit search scope**: Use specific directories when possible
+5. **Consider alternatives**: Use `rg --files-with-matches` for file lists
+
+### Pattern Design
+1. **Be specific**: Use exact patterns when possible
+2. **Use word boundaries**: `\bword\b` for whole words
+3. **Consider context**: Use lookarounds for context-aware matching
+4. **Test patterns**: Start broad, then refine
+5. **Document patterns**: Save complex patterns for reuse
+
+### Performance Tips
+1. **Use file type filters**: `--type py` is faster than `--glob "*.py"`
+2. **Limit search depth**: `--max-depth` for large directories
+3. **Exclude unnecessary files**: Use gitignore or explicit exclusions
+4. **Use appropriate output**: `--files-with-matches` for file lists
+5. **Consider memory usage**: `--max-filesize` for large files
+
+## Integration Examples
+
+### With AITBC System Architect
+```bash
+# Quick architecture compliance check
+rg "/var/lib/aitbc|/etc/aitbc|/var/log/aitbc" --type py /opt/aitbc/production/services/
+
+# Find violations
+rg "/opt/aitbc/data|/opt/aitbc/config|/opt/aitbc/logs" --type py /opt/aitbc/
+
+# Generate fix list
+rg "/opt/aitbc/(data|config|logs)" --only-matching --type py /opt/aitbc/ | sort -u
+```
+
+### With Development Workflows
+```bash
+# Pre-commit checks
+rg "TODO|FIXME|print\(" --type py /opt/aitbc/production/services/
+
+# Code review assistance
+rg "password|secret|token" --type py --type yaml /opt/aitbc/
+
+# Dependency analysis
+rg "^import |^from .* import" --type py /opt/aitbc/production/services/ | sort -u
+```
+
+### With System Administration
+```bash
+# Service configuration audit
+rg "EnvironmentFile|ReadWritePaths" --type systemd /etc/systemd/system/aitbc-*.service
+
+# Log analysis
+rg "ERROR|WARN|CRITICAL" /var/log/aitbc/production/
+
+# Performance monitoring
+rg "memory|cpu|disk" --type py /opt/aitbc/production/services/
+```
+
+## Performance Metrics
+
+### Search Performance
+- **Speed**: Ripgrep is typically 2-10x faster than grep
+- **Memory**: Lower memory usage for large codebases
+- **Accuracy**: Better pattern matching and file type recognition
+- **Scalability**: Handles large repositories efficiently
+
+### Optimization Indicators
+```bash
+# Search performance check
+time rg "pattern" --type py /opt/aitbc/production/services/
+
+# Memory usage check
+/usr/bin/time -v rg "pattern" --type py /opt/aitbc/production/services/
+
+# Efficiency comparison
+rg "pattern" --stats --type py /opt/aitbc/production/services/
+```
+
+## Continuous Improvement
+
+### Pattern Library
+```bash
+# Save useful patterns
+echo "# AITBC System Paths
+rg '/var/lib/aitbc|/etc/aitbc|/var/log/aitbc' --type py /opt/aitbc/
+rg '/opt/aitbc/data|/opt/aitbc/config|/opt/aitbc/logs' --type py /opt/aitbc/" > ~/.aitbc-ripgrep-patterns.txt
+
+# Load patterns for reuse
+rg -f ~/.aitbc-ripgrep-patterns.txt /opt/aitbc/
+```
+
+### Custom Configuration
+```bash
+# Create ripgrep config
+echo "--type-add 'aitbc:*.py *.yaml *.json *.service *.conf'" > ~/.ripgreprc
+
+# Use custom configuration
+rg "pattern" --type aitbc /opt/aitbc/
+```
+
+---
+
+**Usage**: Invoke this skill for advanced ripgrep operations, complex pattern matching, performance optimization, and AITBC system analysis using ripgrep's full capabilities.
diff --git a/cli/commands/keystore.py b/cli/commands/keystore.py
index 6d0590c0..b2c45c26 100644
--- a/cli/commands/keystore.py
+++ b/cli/commands/keystore.py
@@ -23,7 +23,7 @@ def keystore():
 @click.option("--address", required=True, help="Wallet address (id) to create")
 @click.option(
     "--password-file",
-    default="/opt/aitbc/keys/.password",
+    default="/var/lib/aitbc/keystore/.password",
     show_default=True,
     type=click.Path(exists=True, dir_okay=False),
     help="Path to password file",
diff --git a/keys/README.md b/keys/README.md
deleted file mode 100644
index db68d1a5..00000000
--- a/keys/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# AITBC Keys Directory
-
-## 🔐 Purpose
-Secure storage for blockchain cryptographic keys and keystore files.
-
-## 📁 Contents
-
-### Validator Keys
-- **`validator_keys.json`** - Validator key pairs for PoA consensus
-- **`.password`** - Keystore password (secure, restricted permissions)
-- **`README.md`** - This documentation file
-
-## 🔑 Key Types
-
-### Validator Keys
-```json
-{
-  "0x1234567890123456789012345678901234567890": {
-    "private_key_pem": "RSA private key (PEM format)",
-    "public_key_pem": "RSA public key (PEM format)",
-    "created_at": 1775124393.78119,
-    "last_rotated": 1775124393.7813215
-  }
-}
-```
-
-### Keystore Password
-- **File**: `.password`
-- **Purpose**: Password for encrypted keystore operations
-- **Permissions**: 600 (root read/write only)
-- **Format**: Plain text password
-
-## 🛡️ Security
-
-### File Permissions
-- **validator_keys.json**: 600 (root read/write only)
-- **.password**: 600 (root read/write only)
-- **Directory**: 700 (root read/write/execute only)
-
-### Key Management
-- **Rotation**: Supports automatic key rotation
-- **Encryption**: PEM format for standard compatibility
-- **Backup**: Regular backups recommended
-
-## 🔧 Usage
-
-### Loading Validator Keys
-```python
-import json
-with open('/opt/aitbc/keys/validator_keys.json', 'r') as f:
-    keys = json.load(f)
-```
-
-### Keystore Password
-```bash
-# Read keystore password
-cat /opt/aitbc/keys/.password
-```
-
-## 📋 Integration
-
-### Blockchain Services
-- **PoA Consensus**: Validator key authentication
-- **Block Signing**: Cryptographic block validation
-- **Transaction Verification**: Digital signature verification
-
-### AITBC Components
-- **Consensus Layer**: Multi-validator PoA mechanism
-- **Security Layer**: Key rotation and management
-- **Network Layer**: Validator identity and trust
-
-## ⚠️ Security Notes
-
-1. **Access Control**: Only root should access these files
-2. **Backup Strategy**: Secure, encrypted backups required
-3. **Rotation Schedule**: Regular key rotation recommended
-4. **Audit Trail**: Monitor key access and usage
-
-## 🔄 Migration
-
-Previously located at `/var/lib/aitbc/keystore/` - moved to `/opt/aitbc/keys/` for centralized key management.
diff --git a/keys/validator_keys.json b/keys/validator_keys.json
deleted file mode 100644
index ce1a7ba8..00000000
--- a/keys/validator_keys.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "0x1234567890123456789012345678901234567890": {
-    "private_key_pem": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQTkfrbWju7alf\nagdsqzwbUOHabo4kOvCq1EewAdZ8vR0iBAFC9McKBi4yaqql0/rtGiMCfU2SDTF7\npStC2z4x8Xu83dmvkLhBLKaWxA2yO6mr3Y6XzUypUleu+YsJAsq0uyEP+/LaRGJH\nz2P/b0xHMV8roqvmgZ3mhfxIza8LCU+5emiN4NEjBPqMWa7M5+FBdpzim9zKadvc\n13zrze1gSchBmI+qw6Ey+xW3R3UrZ2WUZkJLo3LiT6pat/hBm/1+n5e3411yRWqG\ncCSbL74Kan5S3aCSptYD19n1zUVZHe1Fgk7f7hslcdoLaG6fMI8zrBWQB7fBUKXY\nDcpiPWIlAgMBAAECggEABwDNi7bdE09UW22NW7A5tAeqVkvsOQTlPh0cN4X3T0ls\nOwTfvMydRjbDki3MB00wzcXpcgr7sz1Rq/L5lP6H16uk+ib4FAWdc4hDs2hjU8WC\nd/VCIMrVUBhPag3xOeg5RykXsytif0Y3UM3XSAOyO3hBaqAz4HVk4NWaxzu4JXxl\nBUQwvxAHZz1nlWv/EBMWyfVqm8fiesXA3F/sREQyryhyjonntAhdlP9XYIOPrL9N\nRsYJCfOouzpyTcIqXE/Tsn1c0XtEeX2qlpwky18iEzG3MQuLdWAYPaeZ5OIxCH3j\nxlHA+JreE/E7uyjEINqAjzRY0PikkDTJcrS03BHcpwKBgQDJqTY7ITlBMdgzmyWJ\nFdteFJES9q5Ak0URR/BQvDKHJE5aQPWLIRwsvn82pfiaos3Dl2qKoS2339sFwQZ9\n55CvO7ifo4mboBqtkpocxtX4vvzdY7m/DcWTyG+uJRhdc3Yy5UzynifoqfFdDV/M\nh7lkZeYOYJQTjQ634KGON3vhZwKBgQC3MKWR5X0lgxRSfIa7V1VeBnImdbAszc2c\nAfHd0DA68SfX2T1hBrsV2Xch7TaHw7jmwuJgxwSgaqLh1k4aVBKhLmme3ktaVGOj\ndHs+uQest/yMd/R4xGH0It66zs7pNd7DF5qNxRuAnR8zl/jVeadEbGM5bRILPn3s\nPI07GTDskwKBgGlhQlSd5PR7npZBIdlEEbFVIAZ/38kg7Du+kwctgV37i/I/9dAx\nii6bkZC2JHZyUwI9stAkr+ZhVWvpVYIfqwzXMYBCjltDzA0eCei1wwTMkQkD3wHG\nqZOzbyDag6P5/S9VgeNa4FIF1HoizgfseOXNFe43a8nXsXRHL0VJGzRLAoGBAIwB\nAtkhIecUaeiswS/WjCjDFmSsV0u2sihEGDylCudRPVkq700DHuKRBAqKx7006VB7\nqxW5pKCRPxEIf0KB9Ib4+MHxNHfBvTDEKhkCwonPR5V3bAEMXax/JehxfBMiF7DU\njktBVEaUTq9Yu1Uzl5GkoKTX5g1v4j80+98p3ok/AoGAU1tHwQRsL0RFTFXMJ+8l\n0mOvyf6FAFax/sc63peFXOuI2W02JVjcjfUE+ST4LCs1k3GLuZ3gWnIroOyxxYcV\nzlurBUBocpMWnj9MKki12aulrVkE1Q+dB0hSk46byKsNuZwjAdF2/QvDdd1EFocy\ndQkVIAYkxcXUKGyYoHbkxM0=\n-----END PRIVATE KEY-----\n",
-    "public_key_pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkE5H621o7u2pX2oHbKs8\nG1Dh2m6OJDrwqtRHsAHWfL0dIgQBQvTHCgYuMmqqpdP67RojAn1Nkg0xe6UrQts+\nMfF7vN3Zr5C4QSymlsQNsjupq92Ol81MqVJXrvmLCQLKtLshD/vy2kRiR89j/29M\nRzFfK6Kr5oGd5oX8SM2vCwlPuXpojeDRIwT6jFmuzOfhQXac4pvcymnb3Nd8683t\nYEnIQZiPqsOhMvsVt0d1K2dllGZCS6Ny4k+qWrf4QZv9fp+Xt+NdckVqhnAkmy++\nCmp+Ut2gkqbWA9fZ9c1FWR3tRYJO3+4bJXHaC2hunzCPM6wVkAe3wVCl2A3KYj1i\nJQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "created_at": 1775124393.78119,
-    "last_rotated": 1775124393.7813215
-  }
-}
\ No newline at end of file