Removed inner puppet dir, changed installation scripts