Move package import to package.go