SOAP Restructured