Refactored migrations
Lil origins fixes and refactoring
Fixed origins export-import and added specs