Config changes (part 1) -Moved most secondary configs into a default subfolder, to allow user to override them

Syncing versions to test report that currently pushed code is not working