Cleaned up dirs and .vimrc