Merge "ServiceWifiResources: split into own folder"