Backup packages to packages/
No swap and correct vim references