CDN changed

CDN change along with code re-arrangement