card directive updates
Merge pull request #3 from maseh87/restructure

card directive updates