[cloud-sync] - Seperate settings into pub/private & refactor code.