logging system reorganized