reorganize leap stream utils