moved more classes to Hero_Charm
Removed health dependency