Fold tap and drain into Sink/Source