Finished rework of folders