Adjust package structure, breakout inner async tasks