Move entirely to config class and UrlQuery class