improve search and directory highlights, fold support, mini reorg