small change in naming
Delete some old json cfgs
Clean-up of config base/function scripts
Some cleanup of the code