Better build process

@shaohua Review?