Entities/Sprites separation added