Change dir structure according to conventions