[TH] move more functions into aws-toolbox