remove duplication by using one service instead of two, move search service out of organization namespace