Made sprite, re-organized framework