Move client config into its own file
Remove duplicate config loading code