Migrate originals import to new tables

All tests pass at this stage. Code needs to be refactored, but tests pass :-)