updating with puppet configs and new structure