Add the new files from Diva distro and migrations. Not yet finished the conversions.