reorganize puppet modules