Reorganize and add iOS