moved the fill and packing types into their respective shape class