Refactor Search module to namespace