Restructured the puppet manifest.