changed dir structure mostlYu