Revert "changing package structure"

This reverts commit 8f030a3087ae60436861e26c6ec5316bda592f54.