FIX: Restructure SoapImitation