This reverts commit 51a960df1f.
51a960df1f
Extras have none of the vars used in dir names, so they cant be saved into dirs. +grid code cleanup