Moves sprite and shape into separate classes