Title: Reorganize for resilience