Reorganize Log Management, fixes #54