restructered dirs