rename class Logger -> logger
--
code reorder