Updated .vimrc to make use of new file structure