moved more classes to Hero_Charm