Some reorganization and progress on the search client