rearrange directory structure to make it compatible with vundle