Revert "package refactoring"

This reverts commit 55b8b66095242d7ce4a657e3daca34b0c5f3dbe8.