Re-organizing puppet modules as a subproject