Make XT1080 GSM and move CDMA stuff to XT1080C