Reorganize config a bit