and fixing dir names