sout: merge SAP and announce code in a single file