Change logger structure

don't use LoggerWrapper any more