rework logger
some restruct
correct package