Move extra classes to classes::extra in hiera