logger restructuring

logger restructuring