fix dirs structure