Rearranged stuff. Removed old card storage objects. Added ObjectPicker from Plus-Seven project.