Refactoring of Class/Trait structure