An Equivalence of Shape and Deck Groups; Further Classification of Sharkovskii Groups