Move SiteInfoService to new package