Refactor [struct]: reorganized card infrastructure