change Class Name, add iOS files
fixing conflicts