Reorganize model layout