Revert "enhancement: refactor to divide into sub-packages without changing interface"

This reverts commit f1c1415cbcda4dacd64faab813e2e7cceb295ab4.