reorganize siteSearch into more coherent modules