Restructured models (first part)