Moving search to a separate app