reorganise for new collections