Move library methods inside HWRP