Light resource refactor - zones, cloudflare, watch