Merge "Split logging classes to individual files"