Removing duplicate folder structure