Rename Wifi class to wifi part2
Clean Up