Move SAP Aux modules

These were spread out between aux/sap/ and aux/scanner/sap.

Move them into aux/scanner/sap to match upstream. (Some are duplicates and removed)