changed folder and dir structure