Changed Hero Cards to Cards

@dm-istomin Lots of changes in this push. Review when you have time, and merge if you're OK with what I did.