Orchestration rework

Support for puppet modules