Begin to fix packaging for rpb