Fixed 034cd4bb214a30de3739c756eab428d5fbe617cc.

Preserve directory structure for pkg.