re-organize vim scripts and some minor updates