Merge of logger into app-restructure