faster search for single term queries and general reorg of file structure