changed dir strcture