Fixes to SpriteSheet and Sprite
More organization