Feature/puppet modules to original git