gspm_payload Makefile add, refactorings