master
build: update logging statements to make json log work - fixes #6038
config: split up main file more and move tests into correct packages