Moved VillagersTradeHandlerWrapper to core.