Merge: Clean up folder rename/move conflict from previous merge

Since the migrator folder was renamed in master but they had been moved in beta, there was a conflict. Manually take the renamed folders from master and move them back into the Player/Tools folder.