Reorganise integration