Re-ordered variables

Config vars are first now