Reorganised vimrc