resturcture, logger update