Moved payload.h to a more central location