reorganised hiera data dirs