Design: Refactor Executor and MigrationTool