changed dir stucture