updated puppet file and main manifest
moved somethings around