Revert "merge all module version 1"

This reverts commit 24f240d4377ace200e90da5dfec1b81691e6d00d.