Changed to original structure, updated vimrc