[streaming] Package refactor & cleanup