Restructure packages
Ignore vim swap files