Restructure for package build script