Restructure logger