Revert r36413 -- renaming of search files into 'search' subdirectory