Completely separated AIM and SIM classes. Updated AIM to use the new XML API.