improve the light scene architecture