重构builder script
fix builder and rebuild