re-organizing puppet modules (STRATOS-763)