Move BaseEntity => Entity and BaseAbility => Ability, also queue back to single function