package namespace refactor