Readjusted folder structure