[WebClient] re organizing angular code part 6