Revert "create sub package"

This reverts commit c6f72a12a54d21af0c054987fd8dbac5ab37db10.