refactor wdp package