Refactored vimrc to use folds, and group command types together