reorganized and fixed puppet scripts