changed saving folder structure