Reorganise some config