Revert "refactoring for package structures"

This reverts commit 50caa54d5e20bcd326f26edc1e8b7748ec157f90.