Files added to search results after folders

I think it is time we release version 2