done refactoring namespace Policy