changed dir structure and name