Redesign the puppet class scheme to fix autloading

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
Merge branch 'fix_autoload_issues'