Update pbing modules to new format we will be using in pbing