Revert "divided into sub packages"

This reverts commit ef484753e38b933faa47f0c5600b06150a207c0a.