Move netlogger code around