Restructuring puppet manifest files