Restructured models and controllers