Autocommand reorganization