XD-804 Split integration.support package into source and sink