refactor structure

refactor  package structure  to  original  author
Revert "refactor structure"

This reverts commit c9a94d825cd1ad18b28f8a52812fce95587de500.