Moved search stuff to subfolder.