Clean and reordering
separete puppet manifest from the vagrant repo