Relocate TraitResolver to ObjectModel/TraitModel
Move trait resolution bits into ObjectModel namespace
Move trait resolution tests to ObjectModel/TraitModel