Redo Wifi structure logic

Change-Id: I754a35cb3894316840b303b70fa8336ff733a8e8