Renamed files+dirs, replaced deprecated IP-getting code