am b8c0e009: Restructure wifiservice for clarity

* commit 'b8c0e009a74ac2eaee8946fbe0bb3b3fe2749c9a':
  Restructure wifiservice for clarity