restructuring dir