reorg DocumentFinder classes/tests