Added classes for holding the raw deck structure