Restructured and started work on the payload_spec