Renames variable folder to have more informative names, partially addresses #5