Update to conform to the new pingpong/Modules package