Split the migration
Add the archive directory
Merge branch 'develop'