Broke the CardHolder inheriting objects out to their own files.