moving card things into a folder
making names more explicit