Added manual run mode for puppet
Split classes, 1st try