Moved classes to use hiera compatible variables for everything.