Reinstate inheritance and clean class structure

Include classes in not abiding to the best practices of Puppet modules.
Changed back to inheritance model.