Change hiera structure to use calling_module