Refactor the architecture of policies.