re-organizing puppet modules