Refactor namespace + dependencies for reporters