New directory/hiera structure

As proposed in GH-21