Use single generic function, remove autoload files
Fix visual mode
Fix <C-w> mapping