changed CardName to Card::Name
moved more libs under card