Reorganizing code with WiFi