Better structure for shapes

Seems like the player has stopped rotating though... Look into that!