repackaged (and renamed some) P11 related classes in module security-api