reorganize model concerns