more reorg and adding to sync_device_phone.py