Refactor
Revert "Refactor"

This reverts commit 2b3c1279ea78534e87df4f2925848f5b64105fcb.
Data can be migrated by using a custom migrator.
Clean up
Merge branch 'feature/custom-migrator' into develop