reorganized ORM models