Reorganise Configs a little