Move around for pkg.
fix packaging