Refactored where traits are placed for models package.