HpcUserSupport / spack deploy / refactor