Fix #8059 - being splitting of Roo.php into Traits