Revert "add package, change logic ...."

This reverts commit f8537aec1fa3931076ba1012b2e57899e5c93839.
change structure and logic