Logger class restructure