use package structer
Revert "use package structer"

This reverts commit 6675c45988366ff49268c28a1a3fe561d41f3974.