Move to Python dict for configs
22 files changed