move search into separate namespace