PLINK-130 restructure credential packaging to make it more developer friendly