Re-organized disease model