Restructure vimrc
Update configs