fixing dir structure...again