refactor namespace
refactor discovery page