bug fix, style fix,  rearrange project