Clean up config files (and use new .config dir)

Clean up config files (and use new .config dir) #2610