Modularized the puppet manifests