Removed Query.Common.Web, rearranged dependencies.