Add Backups folder and add coherency to variable names