Restructure switching models