Switching back to role based simple vars + cleanin

JSON style variables in a master dictionary can not be changed on the fly from the command line.

Switching these variables back to their role\var directory formats...

And removing old files that are unused.