Switched to TextureAtlas
Refactoring