Topic/refactor migrator