Merge in site.pp refactor

To handle import deprecation.