Final Eagle Integration

Reorganized to avoid duplication within Eagle