Merged Server/Client scanning and moved it out of Activities and into its own Service.