Reorganize schemas
Update searcher and faceter to use new schemas