Refactor Config keys & key_paths