change expansion dir strcutre and names