move Ability class to the top
Change class features to new format