reorganize model