Distinguish HSPA from UMTS and fix folder path