Combined Sprite classes and other fixes

Combined both Sprite classes, fix characters not displaying, updated PSD
to match sprite.