change Animals to Animal in trait group
Merge branch 'cleanup_import_refactoring'