Modify dirout names and old dirs cleanup