Reorg of files to begin splitting of the indexer and searcher modules.