Revert "Revert "renamed pkg""

This reverts commit 5203be10df7a3fb279f4ff3985b017797aae730d.