Made changes so that the folder structure stays intact