Refactoring of authz package location.