vimrc reorganization and added collapsable blocks