Adding new default config to the PR and moving files

hi @mklauser,

Please merge - discussion on the main PR. 

cheers