Further development on CardDefs (definitions, naming, organization)