Change some expression of payloads
Rearranged around include files