Merge layer into StageSprite

No need to have an extra indirection. Store what used to be in
layer directly into sprite.